Merge branch 'master' of https://git.oslog.id/ordo/adw-backend into Dev-Farhan

app/Helpers/MasterFunctionsHelper.php

@@ -6,6 +6,7 @@ use App\Models\Activity;
 use App\Models\Project;
 use App\Models\VersionGantt;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class MasterFunctionsHelper {
 
@@ -34,10 +35,16 @@ class MasterFunctionsHelper {
 
 	public function getLatestGantt($id){
 		$maxGanttId = VersionGantt::where("proyek_id", $id)->max("id");
+    if(!$maxGanttId){
+       $data = array(
+            "proyek_id" => $id
+        );
+    } else {
         $data = array(
             "last_gantt_id" => $maxGanttId,
             "proyek_id" => $id
         );
+    }
         return $data;
 	}
 
@@ -102,7 +109,8 @@ class MasterFunctionsHelper {
 		$begin = new \DateTime($minDate.' Monday');
 		if(isset($dataPayload['end_date'])){
 			$maxDate = $dataPayload['end_date'];
-			$end = new \DateTime($maxDate);
+			$end = new \DateTime($maxDate. ' Friday');
+      $end->modify('next Friday');
 			/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged
 				$interval = new \DateInterval('P7D');
 		} else {
@@ -112,6 +120,7 @@ class MasterFunctionsHelper {
 				->where('a.version_gantt_id', '=', $keyGantt['id'])
 				->max("plan_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's
 			$end = new \DateTime($maxDate. ' Friday');
+      $end->modify('next Friday');
 			$interval = new \DateInterval('P7D');
 		}
 		$period = new \DatePeriod($begin, $interval, $end);

app/Http/Controllers/ActivityController.php

@@ -396,14 +396,13 @@ class ActivityController extends Controller
     }
 		foreach ($data['activities'] as $i => $activity_row) {
 			$startDate = \DateTime::createFromFormat('d-m-y', $activity_row['start_date']);
-			$endDate = \DateTime::createFromFormat('d-m-y', $activity_row['end_date']);
+			$endDate = \DateTime::createFromFormat('d-m-y H:i:sO', $activity_row['end_date']);
-
 			$input['name'] = $activity_row['name'];
 			$input['proyek_id'] = $projectId;
 			$input['version_gantt_id'] = $data['ganttId'];
 			$input['parent_id'] = null;
 			$input['start_date'] = $startDate->format('Y-m-d');
-			$input['end_date'] = $endDate->format('Y-m-d');
+			$input['end_date'] = $endDate->format('Y-m-d H:i:sO');
 			$input['duration'] = $activity_row['duration'];
 			$input['bobot_planning'] = $activity_row['weight'];
 			$input['persentase_progress'] = 0;

app/Http/Controllers/DashboardBoDController.php

@@ -319,8 +319,12 @@ class DashboardBoDController extends Controller
 
 			$project->pm = User::find($project->pm_id);
 			/* $project->header = Activity::where('proyek_id', $project->id)->where('version_gantt_id', $lastGantt['last_gantt_id'])->whereNull('parent_id')->first(); */
-			$project->scurve = MasterFunctionsHelper::getSCurve($project->id);
+      if(!isset($lastGantt['last_gantt_id'])){
+        $project->manPowers = 0;
+      } else {
         $project->manPowers = UserToVersionGantt::where('version_gantt_id', $lastGantt['last_gantt_id'])->count();
+        $project->scurve = MasterFunctionsHelper::getSCurve($project->id);
+      }
 			$project->lastGanttId = MasterFunctionsHelper::getLatestGantt($project->id);
 		}