From c0238cd82d0119c0db408c2e731f0d5cc5e750a4 Mon Sep 17 00:00:00 2001
From: Muhammad Sulaiman Yusuf <ms.yusuf@outlook.co.id>
Date: Wed, 24 Aug 2022 05:12:44 +0700
Subject: [PATCH] fix s-curve

---
 app/Http/Controllers/ActivityController.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index b3805ef..c9d2a7f 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace App\Http\Controllers;
 
 use App\Models\Activity;
@@ -136,7 +136,7 @@ class ActivityController extends Controller
 			->whereNull('parent_id')
 			->orderByRaw('id ASC')
 			->get();
-			
+
 		foreach($resultTypeProject as $objRow){
 			$childActivities = TemplateGantt::where("parent_id", $objRow->id)->count();
 			$resultNew = Activity::create([
@@ -438,7 +438,7 @@ class ActivityController extends Controller
 			$end = new \DateTime($maxDate);
 			$end2 = new \DateTime($maxDate);
 			$interval = \DateInterval::createFromDateString('1 day');
-			$period = new \DatePeriod($begin, $interval, $end);
+			$period = new \DatePeriod($begin->modify('-1 days'), $interval, $end);
 			$arr_ActualM = [];
 			$tempDate = [];
 			$tempPercentage = [];
@@ -461,11 +461,9 @@ class ActivityController extends Controller
 					->join('m_activity as a', 'a.id', '=', 'ram.activity_id')
 					->where('a.version_gantt_id', '=', $keyGantt['last_gantt_id'])
 					->where('a.proyek_id', '=', $keyGantt['proyek_id'])
-					/* ->whereDate('ram.report_date', $dt->format("Y-m-d")) */
-					->whereDate('ram.report_date', '2021-11-08')
+					->whereDate('ram.report_date', $dt->format("Y-m-d"))
+					/* ->whereDate('ram.report_date', '2021-11-08') */
 					->get();
-				/* dd($dt->format('Y-m-d')); */
-				dd($dataActualM);
 				$dataTempPlan = [];
 				$x = 0;
 				$sumPercentagePlan=0;