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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-01-18 10:01:12 +08:00
parent 9019fbbc04 d6e060a114
commit e9f8ec68f6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+1 -1
View File
@@ -208,7 +208,7 @@ $lang->productplan->menu = $lang->product->menu;
/* System menu. */
$lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->company = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday,custom');
$lang->system->menu->scrum = array('link' => '敏捷模型|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|');
module/productplan/view/linkstory.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
<th class='text-left'><?php echo $lang->story->title;?></th>
<th class='c-user'><?php echo $lang->openedByAB;?></th>
<th class='c-user'><?php echo $lang->assignedToAB;?></th>
<th class='w-50px'><?php echo $lang->story->estimateAB;?></th>
<th class='w-80px'><?php echo $lang->story->estimateAB;?></th>
<th class='w-80px'><?php echo $lang->statusAB;?></th>
<th class='w-80px'><?php echo $lang->story->stageAB;?></th>
</tr>
@@ -56,7 +56,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/productplan/view/view.html.php
+1 -1
View File
@@ -154,7 +154,7 @@
</td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo zget($users, $story->assignedTo);?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
<td>
<span class='status-story status-<?php echo $story->status?>'>
<?php echo $this->processStatus('story', $story);?>
module/task/model.php
+3 -3
View File
@@ -2963,13 +2963,13 @@ class taskModel extends model
$storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");
break;
case 'estimate':
echo round($task->estimate, 1);
echo round($task->estimate, 1) . ' ' . $this->lang->hourCommon;
break;
case 'consumed':
echo round($task->consumed, 1);
echo round($task->consumed, 1) . ' ' . $this->lang->hourCommon;
break;
case 'left':
echo round($task->left, 1);
echo round($task->left, 1) . ' ' . $this->lang->hourCommon;
break;
case 'progress':
echo "{$task->progress}%";