Merge pull request 'staging' (#246) from staging into general

Reviewed-on: ordo/adw-backend#246

app/Http/Controllers/ProjectController.php

@@ -519,8 +519,14 @@ class ProjectController extends Controller
         if (isset($s_curve)) {
             $result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->first();
             $actualStartExist = Activity::where('proyek_id', $id)->whereNotNull('actual_start')->exists();
-            $actualEndExist = Activity::where('proyek_id', $id)->exists();
-            $query = Activity::where('proyek_id', $id);
+            if($result['type_proyek_id'] === 9)
+            {
+                $actualEndExist = Activity::where('proyek_id', $id)->exists();
+                $query = Activity::where('proyek_id', $id);
+            }else{
+                $actualEndExist = Activity::where('version_gantt_id', $ganttId)->exists();
+                $query = Activity::where('version_gantt_id', $ganttId);
+            }
         } else {
             $result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->where("version_gantt_id", $ganttId)->first();
             $actualStartExist = Activity::where('version_gantt_id', $ganttId)->whereNotNull('actual_start')->exists();