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

* Finish task#8874.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-04 09:50:44 +08:00
parent db4901cb35
commit d5f35eb927
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/execution.html.php
+3 -3
View File
@@ -41,8 +41,8 @@
<th class='c-user'><?php echo $lang->team->role;?></th>
<th class='c-date'><?php echo $lang->team->join;?></th>
<th class='w-110px'><?php echo $lang->my->hours;?></th>
<th class='w-60px'><?php echo $lang->project->assignedToMe;?></th>
<th class='c-progress'><?php echo $lang->project->progress;?></th>
<th class='w-90px'><?php echo $lang->project->assignedToMe;?></th>
<th class='w-60px'><?php echo $lang->project->progress;?></th>
</tr>
</thead>
<tbody>
@@ -71,7 +71,7 @@
<td><?php echo $execution->join;?></td>
<td><?php echo $execution->hours;?></td>
<td><?php echo $execution->assignedToMeTasks;?></td>
<td><?php echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$execution->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$execution->progress}%</div></div>"; "<span class='pie-icon'";?></td>
<td><?php echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$execution->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$execution->progress}%</div></div>";?></td>
</tr>
<?php endforeach;?>
</tbody>
module/program/model.php
+1 -1
View File
@@ -1677,7 +1677,7 @@ class programModel extends model
echo $project->hours->totalLeft;
break;
case 'PRJProgress':
echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
break;
case 'actions':
if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);
module/user/model.php
+1 -1
View File
@@ -1034,7 +1034,7 @@ class userModel extends model
$hour->totalConsumed = round($hour->totalConsumed, 1);
$hour->totalLeft = round($hour->totalLeft, 1);
$hour->totalReal = $hour->totalConsumed + $hour->totalLeft;
$hour->progress = $hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 3) * 100 : 0;
$hour->progress = $hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 2) * 100 : 0;
}
$projectIdList = array_keys($myProjectsList);