Merge pull request 'staging upload 23-04-12' (#32) from staging into master

Reviewed-on: ordo/adw-backend#32

app/Http/Controllers/HierarchyFtthController.php

@@ -140,8 +140,21 @@ class HierarchyFtthController extends Controller
         $data = HierarchyFtth::where('project_id', $project_id)->whereNull('parent_id')->orderByRaw('id ASC')->get();
         $finalData = [];
         foreach($data as $objRow){
-            $objRow->children = $this->getChildren($project_id, $objRow->id);
             $objRow->key = rand(1, 1000);
+            if (VersionGantt::where('hierarchy_ftth_id', $objRow->id)->exists()) {
+                $dataGantt = VersionGantt::where('hierarchy_ftth_id', $objRow->id)->get();
+                $progress = $this->ganttProgress('hierarchy_ftth_id', $objRow->id);
+                foreach ($dataGantt as $gantt) {
+                  $gantt->key = $objRow->key;
+                  foreach ($progress as $p) {
+                    if ($p->id == $gantt->id) {
+                      $gantt->progress = $p->persentase_progress;
+                    }
+                  }
+                }
+                $objRow->dataGantt = $dataGantt;
+            }
+            $objRow->children = $this->getChildren($project_id, $objRow->id);
             $finalData[] = $objRow;
         }
 

app/Http/Controllers/VersionGanttController.php

@@ -94,7 +94,7 @@ class VersionGanttController extends Controller
       $progress = VersionGantt::select('m_version_gantt.id','m_activity.persentase_progress')
         ->join('m_activity', 'm_version_gantt.id', '=', 'm_activity.version_gantt_id')
         ->where("m_version_gantt.".$column, $value)
-        ->where('m_activity.type_activity', "project")
+        // ->where('m_activity.type_activity', "project")
         ->where('m_activity.parent_id', null)
         ->get();
       foreach($progress as $item) {