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

* Finish task #43909.

Browse Source
This commit is contained in:
liumengyi
2021-11-11 11:25:53 +08:00
parent 802ff05157
commit c4c2356bf3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/report/view/workload.html.php
View File

@@ -70,7 +70,9 @@
<thead>
<tr class='colhead text-center'>
<th class="c-user"><?php echo $lang->report->user;?></th>
<?php if($this->config->systemMode == 'new'):?>
<th class="c-project"><?php echo $lang->report->project ;?>
<?php endif;?>
<th><?php echo $lang->report->execution;?></th>
<th class="c-count"><?php echo $lang->report->task;?></th>
<th class="c-hours"><?php echo $lang->report->remain;?></th>
@@ -92,7 +94,7 @@
<?php foreach($info['execution'] as $executionName => $executionInfo) $projectCount ++ ;?>
<?php foreach($info['execution'] as $executionName => $executionInfo):?>
<?php if($projectTimes != 1 || $userTimes != 1) echo "<tr>";?>
<?php if($projectTimes == 1):?>
<?php if($projectTimes == 1 && $this->config->systemMode == 'new'):?>
<td class="text-center" rowspan="<?php echo $projectCount;?>" title="<?php echo $projectName;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $projectName);?></td>
<?php endif;?>
<td class="text-center" title="<?php echo $executionName;?>"><?php echo html::a($this->createLink('execution', 'view', "executionID={$executionInfo['executionID']}"), $executionName);?></td>