* task #7660, improve UI for cmmigantt block.

2020-08-26 13:52:25 +08:00
parent 6f4f9a061e
commit e0cd53d4cf
5 changed files with 56 additions and 47 deletions
@@ -106,10 +106,11 @@ class programplanModel extends model
     * @param  int    $productID
     * @param  int    $baselineID
     * @param  string $selectCustom
+     * @param  bool   $returnJson
     * @access public
     * @return string
     */
-    public function getDataForGantt($programID, $productID, $baselineID = 0, $selectCustom = '')
+    public function getDataForGantt($programID, $productID, $baselineID = 0, $selectCustom = '', $returnJson = true)
    {
        $this->loadModel('stage');

@@ -240,7 +241,7 @@ class programplanModel extends model
            $datas['data'][$index]->taskProgress = $progress;
        }

-        return json_encode($datas);
+        return $returnJson ? json_encode($datas) : $datas;
    }

    public function getTotalPercent($plan)