Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #44366.

Browse Source
This commit is contained in:
liyuchun
2021-11-17 09:35:56 +08:00
parent 06d7434989
commit a5767ccc13
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/lang/en.php
+2
View File
@@ -129,6 +129,8 @@ $lang->story->reviewedBy = 'ReviewedBy';
$lang->story->reviewers = 'Reviewers';
$lang->story->reviewedDate = 'ReviewedDate';
$lang->story->version = 'Version';
$lang->story->feedbackBy = 'Feedback By';
$lang->story->notifyEmail = 'Notify Email';
$lang->story->plan = 'Linked Plan';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Comment';
module/story/lang/zh-cn.php
+2
View File
@@ -129,6 +129,8 @@ $lang->story->reviewedBy = '由谁评审';
$lang->story->reviewers = '评审人员';
$lang->story->reviewedDate = '评审时间';
$lang->story->version = '版本号';
$lang->story->feedbackBy = '反馈者';
$lang->story->notifyEmail = '通知邮箱';
$lang->story->plan = "所属计划";
$lang->story->planAB = '计划';
$lang->story->comment = '备注';
module/story/model.php
+6 -1
View File
@@ -233,7 +233,11 @@ class storyModel extends model
$requiredFields = trim($requiredFields, ',');
$this->dao->insert(TABLE_STORY)->data($story, 'spec,verify')->autoCheck()->batchCheck($requiredFields, 'notempty')->exec();
$this->dao->insert(TABLE_STORY)->data($story, 'spec,verify')
->autoCheck()
->checkIF($story->notifyEmail, 'notifyEmail', 'email')
->batchCheck($requiredFields, 'notempty')
->exec();
if(!dao::isError())
{
$storyID = $this->dao->lastInsertID();
@@ -820,6 +824,7 @@ class storyModel extends model
->checkIF(isset($story->closedBy), 'closedReason', 'notempty')
->checkIF(isset($story->closedReason) and $story->closedReason == 'done', 'stage', 'notempty')
->checkIF(isset($story->closedReason) and $story->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->checkIF($story->notifyEmail, 'notifyEmail', 'email')
->where('id')->eq((int)$storyID)->exec();
if(!dao::isError())
module/story/view/create.html.php
+22 -12
View File
@@ -100,8 +100,7 @@
<?php endif;?>
<tr>
<th><?php echo $lang->story->reviewedBy;?></th>
<?php $colspan = $type == 'story' ? "colspan='4'" : "colspan='2'";?>
<td <?php echo $colspan;?> id='reviewerBox'>
<td colspan='2' id='reviewerBox'>
<div class="table-row">
<div class="table-col">
<?php echo html::select('reviewer[]', $users, empty($needReview) ? $product->PO : '', "class='form-control chosen' multiple");?>
@@ -119,18 +118,29 @@
</div>
</td>
<?php if($type == 'requirement'):?>
<?php if(strpos(",$showFields,", ',source,') !== false):?>
<td colspan="2" class='sourceTd'>
<?php if(strpos(",$showFields,", ',source,') !== false):?>
<td colspan="2" class='sourceTd'>
<div class="input-group">
<div class="input-group">
<div class="input-group">
<div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
<?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
<span class='input-group-addon' id="sourceNoteBox"><?php echo $lang->story->sourceNote;?></span>
<?php echo html::input('sourceNote', $sourceNote, "class='form-control' style='width:140px;'");?>
</div>
<div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->source;?></div>
<?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
<span class='input-group-addon' id="sourceNoteBox"><?php echo $lang->story->sourceNote;?></span>
<?php echo html::input('sourceNote', $sourceNote, "class='form-control' style='width:140px;'");?>
</div>
</td>
<?php endif;?>
</div>
</td>
<?php endif;?>
<?php else:?>
<td colspan="2">
<div class="input-group">
<div class="input-group">
<div class="input-group-addon" style="min-width: 77px;"><?php echo $lang->story->feedbackBy;?></div>
<?php echo html::input('feedbackBy', '', "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->story->notifyEmail;?></span>
<?php echo html::input('notifyEmail', '', "class='form-control'");?>
</div>
</div>
</td>
<?php endif;?>
</tr>
<?php if($type == 'story' and $this->config->URAndSR):?>
module/story/view/edit.html.php
+8
View File
@@ -182,6 +182,14 @@
<th><?php echo $lang->story->estimate;?></th>
<td><?php echo $story->parent >= 0 ? html::input('estimate', $story->estimate, "class='form-control'") : $story->estimate;?></td>
</tr>
<tr>
<th><?php echo $lang->story->feedbackBy;?></th>
<td><?php echo html::input('feedbackBy', $story->feedbackBy, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->story->notifyEmail;?></th>
<td><?php echo html::input('notifyEmail', $story->notifyEmail, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->story->keywords;?></th>
<td><?php echo html::input('keywords', $story->keywords, "class='form-control'");?></td>
module/story/view/view.html.php
+8
View File
@@ -348,6 +348,14 @@
<th><?php echo $lang->story->estimate;?></th>
<td title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
</tr>
<tr>
<th><?php echo $lang->story->feedbackBy;?></th>
<td><?php echo $story->feedbackBy;?></td>
</tr>
<tr>
<th><?php echo $lang->story->notifyEmail;?></th>
<td><?php echo $story->notifyEmail;?></td>
</tr>
<tr>
<th><?php echo $lang->story->keywords;?></th>
<td><?php echo $story->keywords;?></td>