diff --git a/module/my/view/blockprojects.html.php b/module/my/view/blockprojects.html.php index b821914645..51497e150f 100644 --- a/module/my/view/blockprojects.html.php +++ b/module/my/view/blockprojects.html.php @@ -25,7 +25,7 @@ hours->totalConsumed;?> hours->totalLeft;?> - hours->progress;?> height='13' text-align: /> + hours->progress;?> height='13' text-align: /> hours->progress;?>% burns);?>'> diff --git a/module/project/model.php b/module/project/model.php index 4cd8a39a7e..b410c9ad3d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -282,6 +282,7 @@ class projectModel extends model $hours = $this->dao->select('project, SUM(estimate) AS totalEstimate, SUM(consumed) AS totalConsumed, SUM(`left`) AS totalLeft') ->from(TABLE_TASK) ->where('project')->in(array_keys($projects)) + ->andWhere('closedReason')->ne('cancel') ->andWhere('status')->ne('cancel') ->andWhere('deleted')->eq(0) ->groupBy('project')