From d5f35eb927e9ee9a569753798216d8deb6da8ff8 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 4 Jan 2021 09:50:27 +0800
Subject: [PATCH] * Finish task#8874.

---
 module/my/view/execution.html.php | 6 +++---
 module/program/model.php          | 2 +-
 module/user/model.php             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 6d709e49cc..a9fc59d1ca 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -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>
diff --git a/module/program/model.php b/module/program/model.php
index b9a7441f3d..860ade78a3 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -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);
diff --git a/module/user/model.php b/module/user/model.php
index bedd50ddbc..822eb0061c 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -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);