From 24aef867c6adff74ea05d0726520ee692f41c1c8 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Tue, 12 May 2020 13:39:21 +0800
Subject: [PATCH] * fix members count and working hours algorithm.

---
 module/program/control.php         | 2 +-
 module/program/view/index.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index 56af6ba54c..23b28cc606 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -39,7 +39,7 @@ class program extends control
             $projectList = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, 0, 0, 30, $orderBy, $pager);
             foreach($projectList as $projectID => $project)
             {
-                $project->teamCount  = count($this->project->getTeamMembers($projectID));
+                $project->teamCount  = count($this->project->getTeamMembers($project->id));
             }
         }
         else
diff --git a/module/program/view/index.html.php b/module/program/view/index.html.php
index 331a435d8a..2dba4f098b 100644
--- a/module/program/view/index.html.php
+++ b/module/program/view/index.html.php
@@ -74,7 +74,7 @@
           <div class='panel-body'>
             <div class='project-infos'>
               <span><i class='icon icon-group'></i> <?php printf($lang->program->membersUnit, $project->teamCount); ?></span>
-              <span><i class='icon icon-clock'></i> <?php printf($lang->program->hoursUnit, $project->hours->totalEstimate); ?></span>
+              <span><i class='icon icon-clock'></i> <?php printf($lang->program->hoursUnit, $project->hours->totalConsumed); ?></span>
               <span><i class='icon icon-cost'></i> <?php echo $project->budget . '' . zget($lang->program->unitList, $project->budgetUnit);?></span>
             </div>
             <?php if($project->type === 'cmmi'): ?>
@@ -86,7 +86,7 @@
             <div class='project-detail project-iteration'>
               <p class='text-muted'><?php echo $lang->program->lastIteration; ?></p>
               <div class='row'>
-                <div class='col-xs-6 tset11'><?php echo $project->name; ?></div>
+                <div class='col-xs-6 text-ellipsis'><?php echo $project->name; ?></div>
                 <div class='col-xs-6'>
                 <div class="progress progress-text-left">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">