From 6def730e2221ffdac0af9142e487e3de2496aac6 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 3 Dec 2020 14:07:38 +0800
Subject: [PATCH] * Fix waterfallgantt block.

---
 module/block/control.php                        | 6 +++---
 module/block/view/waterfallganttblock.html.php  | 4 ++--
 module/program/view/ajaxgetprjdropmenu.html.php | 4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 922824c124..0083cfe756 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1182,9 +1182,9 @@ class block extends control
      */
     public function printWaterfallGanttBlock()
     {
-        $products  = $this->loadModel('product')->getPairs('', $this->session->PRJ);
-        $productID = isset($this->session->product) ? 0 : $this->session->product;
-        if(!$productID) $productID = key($products);
+        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $productID = $this->session->product ? $this->session->product : 0;
+        $productID = isset($products[$productID]) ? $productID : key($products);
 
         $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->PRJ, $productID, 0, 'task', false);
         $this->view->products  = $products;
diff --git a/module/block/view/waterfallganttblock.html.php b/module/block/view/waterfallganttblock.html.php
index bbb9570ac4..a721131942 100644
--- a/module/block/view/waterfallganttblock.html.php
+++ b/module/block/view/waterfallganttblock.html.php
@@ -70,7 +70,7 @@
       $.each(ganttData, function(index, item)
       {
           plansMap[item.id] = item;
-          if(item.type === 'plan' && item.parent === '0')
+          if(item.type == 'plan' && item.parent == '0')
           {
               item.startDatetime = createDatetime(item.start_date);
               item.endDatetime   = createDatetime(item.deadline);
@@ -92,7 +92,7 @@
       $.each(tasks, function(index, task)
       {
           var plan = plansMap[task.parent];
-          while(plan.parent !== '0') plan = plansMap[plan.parent];
+          while(plan.parent > 0) plan = plansMap[plan.parent];
           plan.progress += task.progress;
           if(task.progress === 100) plan.completeTasks.push(task);
           plan.tasks.push(task);
diff --git a/module/program/view/ajaxgetprjdropmenu.html.php b/module/program/view/ajaxgetprjdropmenu.html.php
index 4fc2028d23..4993a40aab 100644
--- a/module/program/view/ajaxgetprjdropmenu.html.php
+++ b/module/program/view/ajaxgetprjdropmenu.html.php
@@ -4,9 +4,7 @@
 <div class="table-row">
   <div class="table-col col-left">
     <div class='list-group'>
-    <?php
-    echo $normalProjectsHtml;
-    ?>
+    <?php echo $normalProjectsHtml;?>
     </div>
     <div class="col-footer">
       <?php echo html::a(helper::createLink('program', 'PRJBrowse', 'programID=0&status=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>