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

* Finish task#36498.

Browse Source
This commit is contained in:
qiyu-xie
2021-03-11 09:43:22 +08:00
parent 60f8cadc08
commit 777e609aa3
5 changed files with 70 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+9 -19
View File
@@ -2569,7 +2569,7 @@ class execution extends control
* All execution.
*
* @param string $status
* @param int $executionID
* @param int $projectID
* @param string $orderBy
* @param int $productID
* @param int $recTotal
@@ -2578,26 +2578,14 @@ class execution extends control
* @access public
* @return void
*/
public function all($status = 'all', $executionID = 0, $from = 'execution', $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
public function all($status = 'all', $projectID = 0, $from = 'execution', $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
$this->app->loadLang('my');
$this->app->loadLang('product');
$this->app->loadLang('programplan');
if($from == 'execution')
{
if($this->executions)
{
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
}
$this->session->set('executionList', $this->app->getURI(true));
$projectID = 0;
}
elseif($from == 'project')
{
$this->lang->navGroup->execution = 'project';
$projectID = $this->session->PRJ;
}
if($from == 'execution') $this->session->set('executionList', $this->app->getURI(true));
if($from == 'project') $this->lang->navGroup->execution = 'project';
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
@@ -2607,13 +2595,15 @@ class execution extends control
$this->view->position[] = $this->lang->execution->allExecutions;
$this->view->executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager);
$this->view->products = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
$this->view->productID = $productID;
$this->view->executionID = $executionID;
$this->view->projectID = $projectID;
$this->view->projects = $this->project->getPairsByModel();
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->status = $status;
$this->view->from = $from;
$this->view->projectTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
$this->display();
}