* Fix bug #26002,25249

This commit is contained in:
liuyongkai
2022-08-04 10:26:46 +00:00
parent 4d80ebf283
commit 7ca2f66a28
3 changed files with 21 additions and 4 deletions
+10 -2
View File
@@ -4385,8 +4385,16 @@ class executionModel extends model
echo '<td>' . zget($users, $execution->PM) . '</td>';
echo "<td class='status-{$execution->status}'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo '<td>' . html::ring($execution->hours->progress) . '</td>';
echo '<td>' . $execution->begin . '</td>';
echo '<td>' . $execution->end . '</td>';
echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td>' . $execution->begin . '</td>';
if(!helper::isZeroDate($execution->end))
{
$today = helper::today();
echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
}
else
{
echo '<td></td>';
}
echo "<td class='hours' title='{$execution->hours->totalEstimate}{$this->lang->execution->workHour}'>" . $execution->hours->totalEstimate . $this->lang->execution->workHourUnit . '</td>';
echo "<td class='hours' title='{$execution->hours->totalConsumed}{$this->lang->execution->workHour}'>" . $execution->hours->totalConsumed . $this->lang->execution->workHourUnit . '</td>';
echo "<td class='hours' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';