From f2c36fb4aec9f2053e2979dc027c0a6c665c3e4a Mon Sep 17 00:00:00 2001 From: z Date: Mon, 6 Jul 2020 15:04:45 +0800 Subject: [PATCH] * finish task #7308. --- module/project/model.php | 8 ++++---- module/project/view/view.html.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index 7a9f647e42..330612e384 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1050,15 +1050,15 @@ class projectModel extends model } $total = $this->dao->select(' - ROUND(SUM(estimate), 1) AS totalEstimate, - ROUND(SUM(consumed), 1) AS totalConsumed, - ROUND(SUM(`left`), 1) AS totalLeft') + ROUND(SUM(estimate), 2) AS totalEstimate, + ROUND(SUM(consumed), 2) AS totalConsumed, + ROUND(SUM(`left`), 2) AS totalLeft') ->from(TABLE_TASK) ->where('project')->eq((int)$projectID) ->andWhere('deleted')->eq(0) ->andWhere('parent')->lt(1) ->fetch(); - $closedTotalLeft = $this->dao->select('ROUND(SUM(`left`), 1) AS totalLeft')->from(TABLE_TASK) + $closedTotalLeft = $this->dao->select('ROUND(SUM(`left`), 2) AS totalLeft')->from(TABLE_TASK) ->where('project')->eq((int)$projectID) ->andWhere('deleted')->eq(0) ->andWhere('parent')->lt(1) diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 30b72efdd8..daa6b50217 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -242,23 +242,23 @@ project->begin;?> begin;?> project->totalEstimate;?> - totalEstimate . $lang->project->workHour;?> + totalEstimate . $lang->project->workHour;?> project->end;?> end;?> project->totalConsumed;?> - totalConsumed . $lang->project->workHour;?> + totalConsumed . $lang->project->workHour;?> project->totalDays;?> days;?> project->totalLeft;?> - totalLeft . $lang->project->workHour;?> + totalLeft . $lang->project->workHour;?> project->totalHours;?> - totalHours . $lang->project->workHour;?> + totalHours . $lang->project->workHour;?>