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 @@
team->role;?> |
team->join;?> |
my->hours;?> |
- project->assignedToMe;?> |
- project->progress;?> |
+ project->assignedToMe;?> |
+ project->progress;?> |
@@ -71,7 +71,7 @@
join;?> |
hours;?> |
assignedToMeTasks;?> |
- progress}' data-width='24' data-height='24' data-back-color='#e8edf3'> {$execution->progress}% "; " |
+ progress}' data-width='24' data-height='24' data-back-color='#e8edf3'> {$execution->progress}% ";?> |
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 "{$project->hours->progress}%
";
+ echo "{$project->hours->progress}%
";
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);