diff --git a/module/product/model.php b/module/product/model.php index 4f72ec9cf8..a935fed6ac 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -951,6 +951,8 @@ class productModel extends model $this->loadModel('bug'); $products = $this->getList($programID, $status, $limit = 0, $line); + if(empty($products)) return array(); + $products = $this->dao->select('*')->from(TABLE_PRODUCT) ->where('id')->in(array_keys($products)) ->orderBy($orderBy) diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 29d7878971..de45e1c88d 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -39,7 +39,7 @@ - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + @@ -67,6 +68,7 @@ js::set('browseType', $browseType); + diff --git a/module/program/view/prjbrowse.html.php b/module/program/view/prjbrowse.html.php index a9fd9aa205..67fc522826 100644 --- a/module/program/view/prjbrowse.html.php +++ b/module/program/view/prjbrowse.html.php @@ -55,13 +55,19 @@ js::set('browseType', $browseType); - + - + + + - + + + + + @@ -76,11 +82,23 @@ js::set('browseType', $browseType); - + + - - + + + + + + +
diff --git a/module/program/control.php b/module/program/control.php index 2c08f8ddb8..4bfbfffb47 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -803,7 +803,7 @@ class program extends control $queryID = ($browseType == 'bysearch') ? (int)$param : 0; $programTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=program&key=PRJProgramTitle'); - $projectStats = $this->program->getPRJList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle); + $projectStats = $this->program->getPRJStats($programID, $browseType, $queryID, $orderBy, $pager, $programTitle); $this->view->title = $this->lang->program->PRJBrowse; $this->view->position[] = $this->lang->program->PRJBrowse; diff --git a/module/program/view/pgmproject.html.php b/module/program/view/pgmproject.html.php index 1ff9546054..4055980b32 100644 --- a/module/program/view/pgmproject.html.php +++ b/module/program/view/pgmproject.html.php @@ -45,6 +45,7 @@ js::set('browseType', $browseType); program->begin;?> program->end;?> program->PRJStatus);?>program->PRJBudget;?> program->teamCount;?> program->PRJEstimate;?> program->PRJConsume;?>begin;?> end;?> program->statusList, $project->status);?>budget . zget($lang->program->unitList, $project->budgetUnit);?> teamCount;?> hours->totalEstimate;?> hours->totalConsumed;?>
idAB);?>program->PRJCode);?>program->PRJCode);?> program->PRJName);?>program->PRJStatus);?>program->PRJModel;?>program->PRJPM;?> program->begin;?> program->end;?>program->PRJStatus);?> program->PRJBudget;?>program->PRJPM;?>program->teamCount;?>program->PRJEstimate;?>program->PRJConsume;?>program->PRJSurplus;?>program->PRJProgress;?> actions;?> program->PRJUpdateOrder);?> createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> program->statusList, $project->status);?>program->templateList, $project->model);?>PM);?> begin;?> end;?>budget;?>PM);?>program->statusList, $project->status);?>budget . zget($lang->program->unitList, $project->budgetUnit);?>teamCount;?>hours->totalEstimate;?>hours->totalConsumed;?>hours->totalLeft;?> +
+
+ hours->progress;?>% +
+
+
id&programID=$programID", $project, 'list', 'group');?> id", $project, 'list', 'persons');?>