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

Merge branch 'master_liuhong_35865' into 'master'

Browse Source 
Master liuhong 35865

See merge request easycorp/zentaopms!4857
This commit is contained in:
王怡栋
2022-08-09 05:34:18 +00:00
parent 2d5d7cf419 a2adce2bb6
commit 6ba5f3bd67
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -4369,7 +4369,7 @@ class executionModel extends model
}
echo empty($execution->children) ? html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name) : $execution->name;
echo '<td>' . zget($users, $execution->PM) . '</td>';
echo "<td class='status-{$execution->status}'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo '<td>' . html::ring($execution->hours->progress) . '</td>';
echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td>' . $execution->begin . '</td>';
if(!helper::isZeroDate($execution->end))
module/my/css/execution.css
+2 -1
View File
@@ -1 +1,2 @@
.c-hours, .c-progress {width: 80px !important;}
.c-hours, .c-progress {width: 80px !important;}
th.c-status {padding-right: 8px !important;}
module/my/view/execution.html.php
+4 -4
View File
@@ -39,7 +39,7 @@
<?php endif;?>
<th class='c-date'><?php echo $lang->execution->begin;?></th>
<th class='c-date'><?php echo $lang->execution->end;?></th>
<th class='c-status'><?php echo $lang->statusAB;?></th>
<th class='c-status text-center'><?php echo $lang->statusAB;?></th>
<th class='c-user'><?php echo $lang->team->role;?></th>
<th class='c-date'><?php echo $lang->team->join;?></th>
<th class='c-hours'><?php echo $lang->my->hours;?></th>
@@ -53,13 +53,13 @@
<tr class='text-left'>
<td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
<td class='c-name text-left'>
<?php if($config->systemMode == 'new'):?>
<?php if($config->systemMode == 'new'):?>
<?php
if($execution->type === 'stage') echo "<span class='project-type-label label label-outline label-warning'>{$lang->project->stage}</span> ";
if($execution->type === 'sprint') echo "<span class='project-type-label label label-outline label-info'>{$lang->executionCommon}</span> ";
if($execution->type === 'kanban') echo "<span class='project-type-label label label-outline label-info'>{$lang->execution->kanban}</span> ";
?>
<?php endif;?>
<?php endif;?>
<?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
</td>
<?php if($config->systemMode == 'new'):?>
@@ -69,7 +69,7 @@
<?php endif;?>
<td><?php echo $execution->begin;?></td>
<td><?php echo $execution->end;?></td>
<td class="c-status">
<td class="c-status text-center">
<?php if(isset($execution->delay)):?>
<span class="status-project status-delayed" title='<?php echo $lang->execution->delayed;?>'><?php echo $lang->execution->delayed;?></span>
<?php else:?>
module/project/model.php
+1 -1
View File
@@ -2029,7 +2029,7 @@ class projectModel extends model
echo $project->end;
break;
case 'status':
echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->project->statusList, $project->status) . "</span>";
echo "<span class='status-task text-center status-{$project->status}'> " . zget($this->lang->project->statusList, $project->status) . "</span>";
break;
case 'budget':
echo $budgetTitle;
module/project/view/execution.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<?php echo $lang->nameAB;?>
</th>
<th class='c-user'><?php echo $lang->execution->owner;?></th>
<th class='c-status'><?php echo $lang->project->status;?></th>
<th class='c-status text-center'><?php echo $lang->project->status;?></th>
<th class='c-hours'><?php echo $lang->project->progress;?></th>
<th class='c-date'><?php echo $lang->programplan->begin;?></th>
<th class='c-date'><?php echo $lang->programplan->end;?></th>