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

* Finish task#9094.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-26 11:48:51 +08:00
parent fe5178670e
commit 1cb9c73bce
9 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/task.html.php
+3 -3
View File
@@ -99,9 +99,9 @@
<?php if($type != 'finishedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<?php endif;?>
<td class='c-hours'><?php echo round($task->estimate, 1);?></td>
<td class='c-hours'><?php echo round($task->consumed, 1);?></td>
<td class='c-hours'><?php echo round($task->left, 1);?></td>
<td class='c-hours' title="<?php echo round($task->estimate, 1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->estimate, 1) . ' ' . $lang->project->workHourUnit;?></td>
<td class='c-hours' title="<?php echo round($task->consumed, 1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->consumed, 1) . ' ' . $lang->project->workHourUnit;?></td>
<td class='c-hours' title="<?php echo round($task->left, 1) . ' ' . $lang->project->workHour;?>"><?php echo round($task->left, 1) . ' ' . $lang->project->workHourUnit;?></td>
<td class='c-status'>
<?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
<?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
module/product/control.php
+1 -1
View File
@@ -123,7 +123,7 @@ class product extends control
public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Lower browse type. */
$browseType = strtolower($browseType);
$browseType = strtolower($browseType);
/* Load datatable. */
$this->loadModel('datatable');
module/project/lang/de.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = 'An';
$lang->project->days = 'Manntage';
$lang->project->day = 'Tag';
$lang->project->workHour = 'Stunden';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = 'Arbeitsstunden';
$lang->project->totalDays = 'Arbeitstage';
$lang->project->status = 'Status';
module/project/lang/en.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = 'To';
$lang->project->days = 'Available Days';
$lang->project->day = ' Days';
$lang->project->workHour = ' Hours';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = 'Available Hours';
$lang->project->totalDays = 'Available Days';
$lang->project->status = 'Status';
module/project/lang/fr.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = 'à';
$lang->project->days = 'Budget Jours';
$lang->project->day = ' Jours';
$lang->project->workHour = ' Heures';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = 'Budget (Heure)';
$lang->project->totalDays = 'Budget (Jour)';
$lang->project->status = 'Statut';
module/project/lang/vi.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = 'Tới';
$lang->project->days = 'Ngày khả dụng';
$lang->project->day = ' ngày';
$lang->project->workHour = 'giờ';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = 'Giờ khả dụng';
$lang->project->totalDays = 'Ngày khả dụng';
$lang->project->status = 'Tình trạng';
module/project/lang/zh-cn.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = '至';
$lang->project->days = '可用工作日';
$lang->project->day = '天';
$lang->project->workHour = '工时';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = '可用工时';
$lang->project->totalDays = '可用工日';
$lang->project->status = $lang->executionCommon . '状态';
module/project/lang/zh-tw.php
+1
View File
@@ -31,6 +31,7 @@ $lang->project->to = '至';
$lang->project->days = '可用工作日';
$lang->project->day = '天';
$lang->project->workHour = '工時';
$lang->project->workHourUnit = 'H';
$lang->project->totalHours = '可用工時';
$lang->project->totalDays = '可用工日';
$lang->project->status = $lang->executionCommon . '狀態';
module/task/model.php
+8 -3
View File
@@ -2926,6 +2926,11 @@ class taskModel extends model
if(!empty($task->children)) $class .= ' has-child';
}
if($id == 'story') $title = " title='{$task->storyTitle}'";
if($id == 'estimate' || $id == 'consumed' || $id == 'left')
{
$value = round($task->$id, 1);
$title = " title='{$value} {$this->lang->project->workHour}'";
}
echo "<td class='" . $class . "'" . $title . ">";
if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('task', $task, $id);
@@ -2963,13 +2968,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->project->workHourUnit;
break;
case 'consumed':
echo round($task->consumed, 1);
echo round($task->consumed, 1) . ' ' . $this->lang->project->workHourUnit;
break;
case 'left':
echo round($task->left, 1);
echo round($task->left, 1) . ' ' . $this->lang->project->workHourUnit;
break;
case 'progress':
echo "{$task->progress}%";