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

* The waterfall model displays hierarchies and associated products.

Browse Source
This commit is contained in:
leiyong
2020-11-11 14:11:38 +08:00
parent c298d66d86
commit f814b46198
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1 -1
View File
@@ -2317,7 +2317,7 @@ class project extends control
public function ajaxGetDropMenu($projectID, $module, $method, $extra)
{
$project = $this->project->getByID($projectID);
$program = $this->project->getByID($project->parent);
$program = $this->project->getByID($project->project);
$this->view->link = $this->project->getProjectLink($module, $method, $extra);
$this->view->projectID = $projectID;
module/project/model.php
+12 -9
View File
@@ -869,25 +869,28 @@ class projectModel extends model
*/
public function getProjectsByProgram($program)
{
$projects = $this->dao->select('t1.*, t3.name as productName')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t2.product = t3.id')
->where('t1.parent')->eq((int)$program->id)
$projects = $this->dao->select('t1.*,t2.product as productID')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id=t2.project')
->where('t1.project')->eq((int)$program->id)
->andWhere('t1.deleted')->eq('0')
->orderBy('t1.order desc')
->orderBy('t1.id_desc')
->fetchAll('id');
/* The waterfall model displays hierarchies and associated products. */
if($program->model == 'waterfall')
{
foreach($projects as $projectID => $project)
{
if($project->parent and isset($projects[$project->id]) and isset($projects[$project->parent])) $projects[$project->id]->name = $projects[$project->parent]->name . '/' . $project->name;
if($project->parent and isset($projects[$project->parent])) $projects[$project->id]->name = $projects[$project->parent]->name . '/' . $project->name;
}
if($program->product == 'multiple')
$products = $this->loadModel('product')->getProductsByProject($program->id);
foreach($projects as $projectID => $project)
{
foreach($projects as $projectID => $project) $projects[$projectID]->name = $project->productName . '/' . $project->name;
if(isset($products[$project->productID])) $projects[$projectID]->name = $products[$project->productID] . '/' . $project->name;
}
foreach($projects as $projectID => $project) unset($projects[$project->parent]);
foreach($projects as $project) if($project->grade == 2) unset($projects[$project->parent]);
}
return $projects;