From 1ecc8c46448ee17c1be197a5c0d8e20b88494ace Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Sat, 22 Aug 2020 23:42:46 +0800 Subject: [PATCH] * Fix code style. --- module/block/control.php | 14 ++-- module/block/model.php | 64 ------------------- module/block/view/recentprogramblock.html.php | 27 ++++---- module/milestone/model.php | 9 ++- module/program/control.php | 10 +-- module/program/css/browse.css | 20 +++--- module/program/model.php | 46 +++++++++++++ module/program/view/browse.html.php | 2 +- module/program/view/browsebygrid.html.php | 57 +++++++++-------- module/program/view/browsebylist.html.php | 42 ++++++------ module/project/model.php | 11 ++-- 11 files changed, 143 insertions(+), 159 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index 5e4761d6aa..ba18c80ff6 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1088,7 +1088,7 @@ class block extends control $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac); $this->view->current = $current; - $this->view->progress = ($task->totalConsumed || $task->totalLeft) ? round($task->totalConsumed / ($task->totalConsumed + $task->totalLeft), 2) * 100 : 0; + $this->view->progress = ($task->totalConsumed + $task->totalLeft) ? round($task->totalConsumed / ($task->totalConsumed + $task->totalLeft), 2) * 100 : 0; } /** @@ -1164,7 +1164,8 @@ class block extends control $program = $this->loadModel('project')->getByID($this->session->program); $begin = $program->begin; - $end = helper::today(); + $today = helper::today(); + $end = date('Y-m-d', strtotime("$today + 7 days")); $projects = $this->project->getProjectsByProgram($program); $projectIdList = array_keys($projects); @@ -1185,10 +1186,9 @@ class block extends control $i ++; } - $charts['labels'][] = $this->lang->milestone->chart->time . $i . $this->lang->milestone->chart->week; - $charts['PV'] .= $this->milestone->getPV($projectIdList, $begin, $end) . ']'; - $charts['EV'] .= $this->milestone->getEV($projectIdList, $begin, $end) . ']'; - $charts['AC'] .= $this->milestone->getAC($projectIdList, $begin, $end) . ']'; + $charts['PV'] .= ']'; + $charts['EV'] .= ']'; + $charts['AC'] .= ']'; $this->view->charts = $charts; } @@ -1468,7 +1468,7 @@ class block extends control */ public function printRecentprogramBlock() { - $this->view->programs = $this->block->getRecentPrograms(); + $this->view->programs = $this->loadModel('program')->getProgramStats('all', 3, 'order_desc'); } public function printProgramteamBlock() diff --git a/module/block/model.php b/module/block/model.php index 73d9f95db9..351eccabed 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -660,70 +660,6 @@ class blockModel extends model return $data; } - public function getRecentPrograms() - { - $this->loadModel('project'); - $programs = $this->loadModel('program')->getUserPrograms('all', 'id_desc', 3); - if(empty($programs)) return array(); - - $programIdList = array_keys($programs); - - $projects = $this->dao->select('*')->from(TABLE_PROJECT) - ->where('program')->in($programIdList) - ->andWhere('deleted')->eq(0) - ->andWhere('template')->eq('') - ->orderBy('id_asc') - ->fetchAll('program'); - - $projectIdList = array(); - foreach($projects as $project) $projectIdList[] = $project->id; - - $teams = $this->dao->select('root, count(*) as count')->from(TABLE_TEAM) - ->where('root')->in($programIdList) - ->groupBy('root') - ->fetchAll('root'); - - $consumes = $this->dao->select('program, sum(consumed) as consumed')->from(TABLE_TASK) - ->where('program')->in($programIdList) - ->andWhere('deleted')->eq(0) - ->andWhere('parent')->lt(1) - ->groupBy('program') - ->fetchAll('program'); - - $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason') - ->from(TABLE_TASK) - ->where('project')->in($projectIdList) - ->andWhere('parent')->lt(1) - ->andWhere('deleted')->eq(0) - ->fetchAll('id'); - - foreach($programs as $programID => $program) - { - $program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0; - $program->consumed = isset($consumes[$programID]) ? $consumes[$programID]->consumed : 0; - $program->project = isset($projects[$programID]) ? $projects[$programID] : new stdclass(); - - if(!empty($program->project)) - { - $totalEstimate = $totalConsumed = $totalLeft = 0; - foreach($tasks as $id => $task) - { - if($task->project != $program->project->id) continue; - if($task->status != 'cancel') - { - $totalEstimate += $task->estimate; - $totalConsumed += $task->consumed; - } - if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left; - } - - $program->project->progress = ($totalLeft + $totalConsumed) == 0 ? 0 : round($totalConsumed / ($totalLeft + $totalConsumed), 3) * 100; - } - } - - return $programs; - } - /** * Build number params. * diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php index 49ec33fe7b..8ff4831f67 100644 --- a/module/block/view/recentprogramblock.html.php +++ b/module/block/view/recentprogramblock.html.php @@ -21,16 +21,16 @@ #cards .program-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
- $project):?> -
-
+ $program):?> +
+
id");?>'>
- template === 'cmmi'): ?> - block->cmmi; ?> - - block->scrum; ?> - name;?> + template === 'cmmi'): ?> + program->cmmi; ?> + + program->scrum; ?> +
- +

program->noProgram;?> " . $lang->program->create, '', "class='btn btn-info' data-toggle=modal");?>

diff --git a/module/program/view/browsebygrid.html.php b/module/program/view/browsebygrid.html.php index 7f979a660d..0e82d8ce78 100644 --- a/module/program/view/browsebygrid.html.php +++ b/module/program/view/browsebygrid.html.php @@ -1,45 +1,47 @@
- $project):?> -
-
id");?>'> + $program):?> +
+
id");?>'>
- name;?> - template === 'cmmi'): ?> - program->cmmi; ?> + name;?> + template === 'cmmi'): ?> + program->cmmi; ?> - program->scrum; ?> + program->scrum; ?>
-
- program->membersUnit, $project->teamCount); ?> - program->hoursUnit, $project->hours->totalEstimate); ?> - budget . '' . zget($lang->program->unitList, $project->budgetUnit);?> +
+ program->membersUnit, $program->teamCount); ?> + program->hoursUnit, $program->estimate); ?> + budget . '' . zget($lang->program->unitList, $program->budgetUnit);?>
- template === 'cmmi'): ?> -
- -
project->statusList, $project->status);?>
+ template === 'cmmi'): ?> +
+

program->ongoingStage; ?>

+
project->statusList, $program->status);?>
- - - + +
+
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 69885f710a..7d7c5a6e40 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -1,4 +1,4 @@ - +
recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -21,30 +21,30 @@ - - + + - - + - - - - - + + + + + diff --git a/module/project/model.php b/module/project/model.php index 8465d934ec..a94c320846 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -756,8 +756,9 @@ class projectModel extends model * @access public * @return array */ - public function getList($status = 'all', $limit = 0, $productID = 0, $branch = 0) + public function getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $programID = 0) { + $programID = $programID ? $programID : $this->session->programID; if($status == 'involved') return $this->getInvolvedList($status, $limit, $productID, $branch); if($productID != 0) @@ -767,7 +768,7 @@ class projectModel extends model ->where('t1.product')->eq($productID) ->andWhere('t2.deleted')->eq(0) ->andWhere('t2.iscat')->eq(0) - ->beginIF($this->session->program)->andWhere('t2.program')->eq($this->session->program)->fi() + ->beginIF($programID)->andWhere('t2.program')->eq($programID)->fi() ->andWhere('t2.template')->eq('') ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi() ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() @@ -784,7 +785,7 @@ class projectModel extends model ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() ->andWhere('deleted')->eq(0) - ->beginIF($this->session->program)->andWhere('program')->eq($this->session->program)->fi() + ->beginIF($programID)->andWhere('program')->eq($programID)->fi() ->andWhere('template')->eq('') ->orderBy('order_desc') ->beginIF($limit)->limit($limit)->fi() @@ -916,10 +917,10 @@ class projectModel extends model * @access public * @return void */ - public function getProjectStats($status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $pager = null) + public function getProjectStats($status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'order_desc', $pager = null, $programID = 0) { /* Init vars. */ - $projects = $this->getList($status, 0, $productID, $branch); + $projects = $this->getList($status, 0, $productID, $branch, $programID); $projects = $this->dao->select('*')->from(TABLE_PROJECT) ->where('id')->in(array_keys($projects)) ->orderBy($orderBy)
- id);?> + id);?> code;?> - id"), $project->name);?> + code;?> + id"), $program->name);?> project->statusList, $project->status, '');?>begin;?>end;?>budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?>PM);?>project->statusList, $program->status, '');?>begin;?>end;?>budget . ' ' . zget($lang->program->unitList, $program->budgetUnit);?>PM);?> - id", $project, 'list', 'group');?> - id", $project, 'list', 'persons');?> - id", $project, 'list', '', '', 'iframe', true);?> - id", $project, 'list', '', '', 'iframe', true);?> - id", $project, 'list', '', '', 'iframe', true);?> - id", $project, 'list', '', '', 'iframe', true);?> - createLink("program", "edit", "projectID=$project->id"), "", '', "class='btn' title='{$lang->edit}'");?> - id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->children);?> - createLink("program", "delete", "projectID=$project->id"), "", 'hiddenwin', "class='btn' title='{$lang->delete}'");?> + id", $program, 'list', 'group');?> + id", $program, 'list', 'persons');?> + id", $program, 'list', '', '', 'iframe', true);?> + id", $program, 'list', '', '', 'iframe', true);?> + id", $program, 'list', '', '', 'iframe', true);?> + id", $program, 'list', '', '', 'iframe', true);?> + createLink("program", "edit", "programID=$program->id"), "", '', "class='btn' title='{$lang->edit}'");?> + id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->children);?> + createLink("program", "delete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$lang->delete}'");?>