From e7c113f9353aa5c70e5276154a23fdddd0efed7a Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 23 Jul 2021 14:11:22 +0800 Subject: [PATCH] * Finish task#40513. --- module/program/control.php | 19 ++++----- module/program/model.php | 49 ++++++++++++++++++++--- module/program/view/browsebylist.html.php | 4 +- 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index 3d69cd47b1..9daaaf03d7 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -52,16 +52,17 @@ class program extends control } $PMList = $this->loadModel('user')->getListByAccounts($accounts, 'account'); - $this->view->title = $this->lang->program->browse; - $this->view->position[] = $this->lang->program->browse; + $this->view->title = $this->lang->program->browse; + $this->view->position[] = $this->lang->program->browse; - $this->view->programs = $programs; - $this->view->status = $status; - $this->view->orderBy = $orderBy; - $this->view->users = $this->user->getPairs('noletter'); - $this->view->usersAvatar = $this->user->getAvatarPairs(); - $this->view->programType = $programType; - $this->view->PMList = $PMList; + $this->view->programs = $programs; + $this->view->status = $status; + $this->view->orderBy = $orderBy; + $this->view->users = $this->user->getPairs('noletter'); + $this->view->usersAvatar = $this->user->getAvatarPairs(); + $this->view->programType = $programType; + $this->view->PMList = $PMList; + $this->view->progressList = $this->program->getProgressList(); $this->display(); } diff --git a/module/program/model.php b/module/program/model.php index 76dd4fc8d8..0a49e902c3 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -153,10 +153,11 @@ class programModel extends model * @param object $pager * @param int $programTitle * @param int $involved + * @param bool $queryAll * @access public * @return object */ - public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0) + public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0, $queryAll = false) { $path = ''; if($programID) @@ -170,8 +171,8 @@ class programModel extends model ->beginIF($this->config->systemMode == 'new')->andWhere('type')->eq('project')->fi() ->beginIF($browseType != 'all')->andWhere('status')->eq($browseType)->fi() ->beginIF($path)->andWhere('path')->like($path . '%')->fi() - ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('id')->in($this->app->user->view->projects)->fi() - ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('id')->in($this->app->user->view->sprints)->fi() + ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('id')->in($this->app->user->view->projects)->fi() + ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('id')->in($this->app->user->view->sprints)->fi() ->beginIF($this->cookie->involved or $involved) ->andWhere('openedBy', true)->eq($this->app->user->account) ->orWhere('PM')->eq($this->app->user->account) @@ -236,6 +237,43 @@ class programModel extends model ->fetchAll(); } + /** + * Get program and project progress list. + * + * @access public + * @return array + */ + public function getProgressList() + { + $TotalProgress = array(); + $projectCount = array(); + $progressList = array(); + $programPairs = $this->getPairs(); + $projectStats = $this->getProjectStats(0, 'all', 0, 'id_desc', null, 0, 0, true); + + /* Add program progress. */ + foreach(array_keys($programPairs) as $programID) + { + $TotalProgress[$programID] = 0; + $projectCount[$programID] = 0; + + foreach($projectStats as $project) + { + if(strpos($project->path, ',' . $programID . ',') === false) continue; + $TotalProgress[$programID] += $project->hours->progress; + $projectCount[$programID]++; + } + + if(empty($projectCount[$programID])) continue; + $progressList[$programID] = $TotalProgress[$programID] / $projectCount[$programID]; + } + + /* Add project progress. */ + foreach($projectStats as $project) $progressList[$project->id] = $project->hours->progress; + + return $progressList; + } + /** * Create a program. * @@ -823,13 +861,14 @@ class programModel extends model * @param object $pager * @param string $programTitle * @param int $involved + * @param bool $queryAll * @access public * @return array */ - public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0) + public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0, $queryAll = false) { /* Init vars. */ - $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved); + $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved, $queryAll); if(empty($projects)) return array(); $projectKeys = array_keys($projects); diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 8d4e6f34dd..b310fae7e0 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -75,8 +75,8 @@ begin;?> end == LONG_TIME ? $lang->program->longTime : $program->end;?> -
-
+
+
id];?>