Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Rename project to execution.

Browse Source
This commit is contained in:
holan20180123
2020-11-19 14:27:29 +08:00
parent 72a2b18c20
commit d071fcae02
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+8 -7
View File
@@ -1520,6 +1520,7 @@ class block extends control
*/
public function printOverviewBlock($module = 'product')
{
if($module == 'project') $module = 'execution';
$func = 'print' . ucfirst($module) . 'OverviewBlock';
$this->view->module = $module;
$this->$func();
@@ -1554,21 +1555,21 @@ class block extends control
}
/**
* Print project overview block.
* Print execution overview block.
*
* @access public
* @return void
*/
public function printProjectOverviewBlock()
public function printExecutionOverviewBlock()
{
$programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
$projects = $this->loadModel('project')->getList('all', 0, 0, 0, $programID);
$projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
$executions = $this->loadModel('project')->getExecutionList($projectID);
$total = 0;
foreach($projects as $project)
foreach($executions as $execution)
{
if(!isset($overview[$project->status])) $overview[$project->status] = 0;
$overview[$project->status]++;
if(!isset($overview[$execution->status])) $overview[$execution->status] = 0;
$overview[$execution->status]++;
$total++;
}
module/project/control.php
+1 -1
View File
@@ -23,7 +23,7 @@ class project extends control
parent::__construct($moduleName, $methodName);
if($this->methodName != 'computeburn')
{
$this->projects = $this->project->getPairs('nocode', $this->session->PRJ);
$this->projects = $this->project->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create'));
}
}