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

* Finish task#36331.

Browse Source
This commit is contained in:
qiyu-xie
2021-03-02 17:28:38 +08:00
parent 5e9755057b
commit 269ea163ba
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -908,7 +908,7 @@ class product extends control
$this->view->extra = $extra;
$this->view->products = $products;
$this->view->projectID = $moduleGroup == 'project' ? $this->session->PRJ : 0;
$this->view->programs = $this->loadModel('program')->getPGMOption();
$this->view->programs = $this->loadModel('program')->getPGMPairs(true);
$this->view->openGroup = $moduleGroup;
$this->display();
}
module/program/model.php
+3 -29
View File
@@ -39,29 +39,19 @@ class programModel extends model
/**
* Get program pairs.
*
* @param bool $isQueryAll
* @access public
* @return array
*/
public function getPGMPairs()
public function getPGMPairs($isQueryAll = false)
{
return $this->dao->select('id, name')->from(TABLE_PROGRAM)
->where('type')->eq('program')
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
->beginIF(!$this->app->user->admin and !$isQueryAll)->andWhere('id')->in($this->app->user->view->programs)->fi()
->fetchPairs();
}
/**
* Get program option.
*
* @access public
* @return array
*/
public function getPGMOption()
{
return $this->dao->select('id,name')->from(TABLE_PROGRAM)->where('type')->eq('program')->andWhere('deleted')->eq(0)->fetchPairs();
}
/**
* Get the product associated with the program.
*
@@ -1874,19 +1864,6 @@ class programModel extends model
$title = "title='{$project->name}'";
}
$PRJProgram = '';
if($id == 'PRJProgram' and $project->parent != 0)
{
$programList = $this->getPGMOption();
$programIndex = $programID ? strpos($project->path, (string)$programID) : 0;
$projectIndex = strpos($project->path, $project->id);
$programPath = explode(',' , substr($project->path, $programIndex, $projectIndex - $programIndex));
foreach($programPath as $program)
{
if($program) $PRJProgram .= '/' . zget($programList, $program);
}
$title = "title='{$PRJProgram}'";
}
if($id == 'PRJBudget')
{
$programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);
@@ -1917,9 +1894,6 @@ class programModel extends model
if($project->model === 'waterfall') echo "<span class='project-type-label label label-outline label-warning'>{$this->lang->program->waterfall}</span>";
if($project->model === 'scrum') echo "<span class='project-type-label label label-outline label-info'>{$this->lang->program->scrum}</span>";
break;
case 'PRJProgram':
echo $PRJProgram;
break;
case 'PM':
$user = $this->loadModel('user')->getByID($project->PM, 'account');
$userID = !empty($user) ? $user->id : '';