From 884b075291929f00ce3906da1050ce40f1b9ac95 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Thu, 23 Nov 2023 15:26:39 +0700
Subject: [PATCH 01/14] update conflict

---
 app/Http/Controllers/ProjectController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 42bcb6d..80296af 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -344,6 +344,12 @@ class ProjectController extends Controller
 		return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
   }
 
+//   testing
+  public function calculateSCurvetest(Request $request){
+	$data = MasterFunctionsHelper::calculateSCurve($request->project_id);
+	return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
+}
+
   public function calculateSCurve(Request $request){
     $sCurve = Project::select('scurve')->where('id', $request->project_id)->first();
 		return response()->json(['status'=>'success','code'=>200, 'data' => json_decode($sCurve->scurve)], 200);

From 3ea5783ea6c530a155c9f7512609ffe04afe9a55 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Thu, 23 Nov 2023 15:29:22 +0700
Subject: [PATCH 02/14] update curva calculation

---
 app/Helpers/MasterFunctionsHelper.php | 419 +++++++++++++++++++++++---
 rest-client.http                      | 109 +++++--
 routes/web.php                        |   1 +
 3 files changed, 458 insertions(+), 71 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index 78f3326..bf2ee73 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -162,7 +162,7 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
-	public function calculateProgressBasedOnReportMaterial($keyGantt)
+	public function calculateProgressBasedOnReportMaterialOld($keyGantt)
 	{
 		DB::enableQueryLog();
 
@@ -488,6 +488,325 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
+	public function calculateProgressBasedOnReportMaterial($keyGantt)
+	{
+		DB::enableQueryLog();
+
+		$dataFinal = [];
+		$dataPayload = [];
+		$dataPayload['period'] = 'week';
+		$totalACWP = 0;
+		$totalBCWP = 0;
+		$tempPercentage = [];
+
+		$dataProject = Project::find($keyGantt['proyek_id']);
+		$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->first();
+		if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) {
+			$dataPayload['end_date'] = $dataProject->akhir_proyek;
+		}
+
+		if ($dataHeader) {
+			$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
+		} else {
+			$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
+		}
+
+		if (!Activity::where("version_gantt_id", $keyGantt['id'])->first())
+			return $dataFinal;
+
+		// $alreadyHasReport = DB::table('report_activity_material as a')
+		// 	->select('a.id')
+		// 	->join('m_activity as b', 'b.id', '=', 'a.activity_id')
+		// 	->where('b.version_gantt_id', '=', $keyGantt['id'])
+		// 	->exists();
+		// note : delete this
+		// if(!$alreadyHasReport)
+		// 	return $dataFinal;
+
+		$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first();
+
+		$begin = new \DateTime($minDate);
+		$begin->modify('last Monday');
+		if (isset($dataPayload['end_date'])) {
+			$maxDate = $dataPayload['end_date'];
+			$end = new \DateTime($maxDate . ' Friday');
+			$end->modify('next Friday');
+			$end->modify('next Friday');
+			/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged
+			$interval = new \DateInterval('P7D');
+		} else {
+			$actualMaxDate = DB::table('assign_material_to_activity as ama')
+				->where("ama.proyek_id", $keyGantt['proyek_id'])
+				->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
+				->where('a.version_gantt_id', '=', $keyGantt['id'])
+				->max("a.end_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's
+			$plannedMaxDate = DB::table('assign_material_to_activity as ama')
+				->where("ama.proyek_id", $keyGantt['proyek_id'])
+				->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
+				->where('a.version_gantt_id', '=', $keyGantt['id'])
+				->max("a.planned_end"); // plan date overlapped with assign_material_to_activity's, it should be m_activity'
+			$maxDate = max(new \DateTime($plannedMaxDate), new \DateTime($actualMaxDate));
+			$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday');
+			$end->modify('next Friday');
+			$end->modify('next Friday');
+			$interval = new \DateInterval('P7D');
+		}
+		$period = new \DatePeriod($begin, $interval, $end);
+
+		$arr_ActualM = [];
+		$tempDate = [];
+		$tempPercentagePlan = [];
+		$tempPercentagePlanWhr = [];
+		$tempPercentageReal = [];
+		$tempTtlPercentPlan = 0;
+		$tempTtlPercentActual = 0;
+
+		$currentACWP = 0;
+		$currentBCWP = 0;
+
+		foreach ($period as $dt) {
+			$minSevenDays = new \Datetime($dt->format("Y-m-d"));
+			$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
+			$tempDate[] = array($dt->format("Y-m-d"));
+			// $dataPlanM = DB::table('assign_material_to_activity as ama')
+			// 	->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
+			// 	->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
+			// 	->where('ama.proyek_id', '=', $keyGantt['proyek_id'])
+			// 	->where('a.version_gantt_id', '=', $keyGantt['id'])
+			// 	->whereDate('ama.plan_date', '<=',$dt->format("Y-m-d"))
+			// 	->whereDate('ama.plan_date', '>', $minSevenDays)
+			// 	->get();
+
+			$activities = DB::table('m_activity AS a')
+				->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id')
+				->where('a.type_activity', 'task')
+				->where('a.bobot_planning', '>', 0)
+				->where('a.version_gantt_id', $keyGantt['id'])
+				->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d"))
+				->whereDate('amta.plan_date', '>', $minSevenDays)
+				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id');
+
+			$dataPlanM = DB::table('m_activity AS a')
+				->join('assign_hr_to_activity AS ahta', 'ahta.activity_id', '=', 'a.id')
+				->where('a.type_activity', 'task')
+				->where('a.bobot_planning', '>', 0)
+				->where('a.version_gantt_id', $keyGantt['id'])
+				->whereDate('a.start_date', '<=', $dt->format("Y-m-d"))
+				->whereDate('a.start_date', '>', $minSevenDays)
+				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id')
+				->union($activities)
+				->get();
+
+			$dataActualM = DB::table('report_activity_material as ram')
+				->select('ram.activity_id', 'ram.qty', 'ram.report_date', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
+				->join('m_activity as a', 'a.id', '=', 'ram.activity_id')
+				->where('a.version_gantt_id', '=', $keyGantt['id'])
+				->where('a.proyek_id', '=', $keyGantt['proyek_id'])
+				->whereDate('ram.report_date', '<=', $dt->format("Y-m-d"))
+				->whereDate('ram.report_date', '>', $minSevenDays)
+				->get();
+			$dataTempPlan = [];
+			$x = 0;
+			$sumPercentagePlan = 0;
+			$totalACWP = isset($totalACWP) ? $totalACWP : 0;
+			$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
+
+			foreach ($dataPlanM as $keyPlanM) {
+				// $sumVolPlan = DB::table(function ($query) use ($keyGantt) {
+				// 	$query->select('a.*')
+				// 		->from('m_activity AS a')
+				// 		->join('assign_material_to_activity as amta', 'amta.activity_id', '=', 'a.id')
+				// 		->where('a.type_activity', 'task')
+				// 		->where('a.bobot_planning', '>', 0)
+				// 		->where('a.version_gantt_id', $keyGantt['id'])
+				// 		->unionAll(function ($query) use ($keyGantt) {
+				// 			$query->select('a.*')
+				// 				->from('m_activity AS a')
+				// 				->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'a.id')
+				// 				->where('a.type_activity', 'task')
+				// 				->where('a.bobot_planning', '>', 0)
+				// 				->where('a.version_gantt_id', $keyGantt['id']);
+				// 		})
+				// 		->orderBy('id', 'asc');
+				// }, 'subquery')
+				// 	->sum('bobot_planning');
+				$sumVolPlan = DB::table('assign_material_to_activity')
+					->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
+					->where('activity_id', '=', $keyPlanM->id)
+					->groupBy('activity_id')
+					->first();
+				if($keyPlanM->duration){
+					$weekCount = $keyPlanM->duration / 7;
+				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					// $bobotHari = $keyPlanM->bobot_planning / $keyPlanM->duration;
+				}else{
+				    $weeklyProgress = 0;
+				
+				}
+				
+				// $weeklyPlan = $weekCount > 0 ? $keyPlanM->bobot_planning / $weekCount : 0;
+				// $weeklyProgress = $weeklyPlan * $keyPlanM->bobot_planning;
+				$dataTempPlan[$x]['activity_id'] = $keyPlanM->id;
+				$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning;
+				$dataTempPlan[$x]['ttl_plan'] = $sumVolPlan;
+				$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual;
+				$dataTempPlan[$x]['duration'] = $keyPlanM->duration;
+				$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress;
+				try {
+					$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning;
+					$sumPercentagePlan += $weeklyProgress;
+					if (isset($keyPlanM->duration) && $keyPlanM->duration > 0)
+						$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100;
+					else
+						$totalBCWP = 0;
+					$dataTempPlan[$x]['totalBCWP'] = $totalBCWP;
+				} catch (\DivisionByZeroError $e) {
+					return response()->json(['message' => $e->getMessage()]);
+				}
+				$x++;
+			}
+
+			$w = 0;
+			$dataTempReport = [];
+			$sumPercentageActual = 0;
+			foreach ($dataActualM as $keyActualM) {
+				$sumVolActual = DB::table('assign_material_to_activity')
+					->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
+					->where('activity_id', '=', $keyActualM->activity_id)
+					->groupBy('activity_id')
+					->first();
+				$sumReportActual = DB::table('report_activity_material')
+					->where('activity_id', $keyActualM->activity_id)
+					->sum('qty');
+				$reportCount = DB::table('report_activity_material')->where('activity_id', '=', $keyActualM->activity_id)->count();
+				$dataTempReport[$w]['activity_id'] = $keyActualM->activity_id;
+				$dataTempReport[$w]['qty'] = $keyActualM->qty;
+				$dataTempReport[$w]['report_date'] = $keyActualM->report_date;
+				$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning;
+				$dataTempReport[$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan;
+				$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual;
+				$dataTempReport[$w]['duration'] = $keyActualM->duration;
+				$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress;
+				try {
+					// assign_material_to_activity
+					$checkStatusActivity = DB::table('assign_material_to_activity')
+						->select('activity_id', 'status_activity')
+						->where('activity_id', '=', $keyActualM->activity_id)
+						->orderBy('status_activity', 'ASC')
+						->first();
+					$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+					// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
+					// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
+					if ($checkStatusActivity->status_activity == 'done') {
+						$sumPercentageActual += $keyActualM->bobot_planning / $reportCount;
+						// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
+					} else {
+						if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
+							$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100);
+							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
+						} else {
+							$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
+						}
+					}
+					// }else {
+					// 	if($checkStatusActivity->status_activity == 'done'){
+					// 		$sumPercentageActual+=($keyActualM->qty/$keyActualM->qty)*$keyActualM->bobot_planning;
+					// 	}else{
+					// 		$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
+					// 	}
+					// }
+
+
+					$totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
+				} catch (\DivisionByZeroError $e) {
+					return response()->json(['message' => $e->getMessage()]);
+				}
+				$dataTempReport[$w]['totalacwp'] = $totalACWP;
+				$w++;
+			}
+
+			$arr_ActualM[] = array(
+				'date' => $dt->format("Y-m-d"),
+				'percentPlan' => $sumPercentagePlan,
+				'percentActual' => $sumPercentageActual,
+				'plan' => $dataTempPlan,
+				'actual' => $dataTempReport,
+			);
+			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
+				$tempTtlPercentPlan += $sumPercentagePlan;
+				$tempTtlPercentActual += $sumPercentageActual;
+
+				$currentACWP += $totalACWP;
+				$currentBCWP += $totalBCWP;
+
+				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
+				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
+				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
+				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
+					break;
+				}
+			} else {
+				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
+				$tempPercentagePlan[] = round($sumPercentagePlan, 2);
+				$tempPercentageReal[] = round($sumPercentageActual, 2);
+			}
+		}
+
+		try {
+			if (round($totalACWP, 0) > $totalRencanaBudget) {
+				$estimatedCost = round($totalACWP, 0) + 0;
+			} else {
+				$estimatedCost = ($totalRencanaBudget + 0);
+			}
+		} catch (\DivisionByZeroError $e) {
+			return response()->json([
+				'message' => $e->getMessage(),
+				"line" => 566,
+				'gantt' => $keyGantt,
+			]);
+		}
+		$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
+
+		$costDeviation = $totalRencanaBudget - $estimatedCost;
+		if ($costDeviation > 0) {
+			$potential = "SAVING";
+		} else {
+			$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
+		}
+
+        $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
+        $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
+		$dataResponse = array(
+			"date" => $tempDate,
+			"percentage" => $tempPercentage,
+			"percentagePlan" => $tempPercentagePlan,
+			"percentageReal" => $tempPercentageReal,
+			"data_details" => $arr_ActualM,
+			"budget_control" => array(
+				"current_budget" => $totalRencanaBudget,
+				"acwp" => round($totalACWP, 0),
+				"bcwp" => round($totalBCWP, 0),
+				"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)),
+				"add_cost_to_complete" => 0,
+				"estimated_at_completion" => $estimatedCost,
+				"cost_deviation" => $costDeviation,
+				"potential" => $potential,
+			)
+		);
+
+		$dataFinal[] = array(
+			"proyek_name" => $dataProject->nama,
+			"data" => $dataResponse,
+			"gantt" => $keyGantt
+		);
+
+		return $dataFinal;
+	}
+
 	public function calculateSCurveVWahyu($projectId)
 	{
 		DB::enableQueryLog();
@@ -807,8 +1126,8 @@ class MasterFunctionsHelper
 		$dataFinal = [];
 		$dataPayload = [];
 		$dataPayload['period'] = 'week';
-		$totalACWP = 0;
-		$totalBCWP = 0;
+		// $totalACWP = 0;
+		// $totalBCWP = 0;
 		$tempPercentage = [];
 
 		$dataProject = Project::find($projectId);
@@ -830,13 +1149,13 @@ class MasterFunctionsHelper
 
 		$minDate = $dataProject->mulai_proyek;
 
-		$begin = new \DateTime($minDate . ' Monday');
+		$begin = new \DateTime($minDate);
 		$begin->modify('last Monday');
 		if (isset($dataPayload['end_date'])) {
 			$maxDate = $dataPayload['end_date'];
 			$end = new \DateTime($maxDate . ' Friday');
 			$end->modify('next Friday');
-			$end->modify('next Friday');
+			// $end->modify('next Friday');
 			/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged
 			$interval = new \DateInterval('P7D');
 		} else {
@@ -860,8 +1179,8 @@ class MasterFunctionsHelper
 		$tempTtlPercentPlan = 0;
 		$tempTtlPercentActual = 0;
 
-		$currentACWP = 0;
-		$currentBCWP = 0;
+		// $currentACWP = 0;
+		// $currentBCWP = 0;
 
 		foreach ($period as $dt) {
 			$minSevenDays = new \Datetime($dt->format("Y-m-d"));
@@ -905,8 +1224,8 @@ class MasterFunctionsHelper
 			$dataTempPlan = [];
 			$x = 0;
 			$sumPercentagePlan = 0;
-			$totalACWP = isset($totalACWP) ? $totalACWP : 0;
-			$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
+			// $totalACWP = isset($totalACWP) ? $totalACWP : 0;
+			// $totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
 
 			foreach ($dataPlanM as $keyPlanM) {
 				// $sumVolPlan = DB::table(function ($query) use ($projectId) {
@@ -932,9 +1251,14 @@ class MasterFunctionsHelper
 					->groupBy('activity_id')
 					->first();
 
-				$weekCount = 1; // jadiin perhari (1)
-				$weeklyPlan = $sumVolPlan->ttl_qty_plan / $weekCount;
-				$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					if($keyPlanM->duration){
+						$weekCount = $keyPlanM->duration / 7;
+						// $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+						$weeklyPlan = $weekCount > 0 ? $sumVolPlan->ttl_qty_plan / $weekCount : 0;
+						$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					}else{
+						$weeklyProgress = 0;
+					}
 
 				// $weeklyPlan = $sumVolPlan->ttl_qty_plan / $weekCount;
 				// $weeklyProgress = 80;
@@ -947,11 +1271,11 @@ class MasterFunctionsHelper
 				try {
 					$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning;
 					$sumPercentagePlan += $weeklyProgress;
-					if (isset($keyPlanM->duration) && $keyPlanM->duration > 0)
-						$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100;
-					else
-						$totalBCWP = 0;
-					$dataTempPlan[$x]['totalBCWP'] = $totalBCWP;
+					// if (isset($keyPlanM->duration) && $keyPlanM->duration > 0)
+					// 	$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100;
+					// else
+					// 	$totalBCWP = 0;
+					// $dataTempPlan[$x]['totalBCWP'] = $totalBCWP;
 				} catch (\DivisionByZeroError $e) {
 					return response()->json(['message' => $e->getMessage()]);
 				}
@@ -1027,11 +1351,11 @@ class MasterFunctionsHelper
 					// }
 
 
-					$totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
+					// $totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
 				} catch (\DivisionByZeroError $e) {
 					return response()->json(['message' => $e->getMessage()]);
 				}
-				$dataTempReport[$w]['totalacwp'] = $totalACWP;
+				// $dataTempReport[$w]['totalacwp'] = $totalACWP;
 				$w++;
 			}
 
@@ -1049,8 +1373,8 @@ class MasterFunctionsHelper
 				// if ($tempTtlPercentPlan >= 100)
 				// 	$tempTtlPercentPlan = 100;
 
-				$currentACWP += $totalACWP;
-				$currentBCWP += $totalBCWP;
+				// $currentACWP += $totalACWP;
+				// $currentBCWP += $totalBCWP;
 
 				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
@@ -1067,37 +1391,40 @@ class MasterFunctionsHelper
 			$tempDate[] = array($dt->format("Y-m-d"));
 		}
 
-		try {
-			if (round($totalACWP, 0) > $totalRencanaBudget) {
-				$estimatedCost = round($totalACWP, 0) + 0;
-			} else {
-				$estimatedCost = ($totalRencanaBudget + 0);
-			}
-		} catch (\DivisionByZeroError $e) {
-			return response()->json([
-				'message' => $e->getMessage(),
-				"line" => 566,
-			]);
-		}
-		$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
-
-		$costDeviation = $totalRencanaBudget - $estimatedCost;
-		if ($costDeviation > 0) {
-			$potential = "SAVING";
-		} else {
-			$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
-		}
-
-		$lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
-        $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
+		// try {
+		// 	if (round($totalACWP, 0) > $totalRencanaBudget) {
+		// 		$estimatedCost = round($totalACWP, 0) + 0;
+		// 	} else {
+		// 		$estimatedCost = ($totalRencanaBudget + 0);
+		// 	}
+		// } catch (\DivisionByZeroError $e) {
+		// 	return response()->json([
+		// 		'message' => $e->getMessage(),
+		// 		"line" => 566,
+		// 	]);
+		// }
+		// $estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
+
+		// $costDeviation = $totalRencanaBudget - $estimatedCost;
+		// if ($costDeviation > 0) {
+		// 	$potential = "SAVING";
+		// } else {
+		// 	$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
+		// }
+
+		// $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
+		// $lastReal = $tempPercentageReal[count($tempPercentageReal) < 1 ? count($tempPercentageReal) : count($tempPercentageReal) - 1];
+        // $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
 		$dataResponse = array(
 			"date" => $tempDate,
-			"start" => $begin,
+			"start" => $minDate,
+			"begin" => $begin,
+			// "periode" => $period,
 			"end"   => $end,
 			"percentage" => $tempPercentage,
 			"percentagePlan" => $tempPercentagePlan,
 			"percentageReal" => $tempPercentageReal,
-			"data_details" => $arr_ActualM,
+			// "data_details" => $arr_ActualM,
 			// "budget_control" => array(
 			// 	"current_budget" => $totalRencanaBudget,
 			// 	"acwp" => round($totalACWP, 0),
diff --git a/rest-client.http b/rest-client.http
index 772aee0..6abe9ab 100644
--- a/rest-client.http
+++ b/rest-client.http
@@ -1,4 +1,5 @@
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY5MTc2MDYyNCwiZXhwIjoxNjkyMzY1NDI0LCJuYmYiOjE2OTE3NjA2MjQsImp0aSI6Ikd2bEFPTE4yZ2FuRFdVbjEiLCJzdWIiOjEsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.XNGbsmcgQ-CkV8vLlvnItGKM0R1am5X5b6qUFOR1DRo
+@token =  eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9iYWNrZW5kLnRlc3RcL2FwaVwvbG9naW4iLCJpYXQiOjE3MDA0NTA1ODYsImV4cCI6MTcwMTA1NTM4NiwibmJmIjoxNzAwNDUwNTg2LCJqdGkiOiJack9MMU04UGdKWGkwTUU1Iiwic3ViIjoxLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.fyg6CyiCAcX3GD4iSy8urkHpZEJ4mnXSXQc4NKC8U9A
+
 @tokenS = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hZHctYXBpLm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjkxNTcyMTIwLCJleHAiOjE2OTIxNzY5MjAsIm5iZiI6MTY5MTU3MjEyMCwianRpIjoiVUdqbnhLRVdlZzYyTTBnayIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.5QqK0dLW5jzbVOkSCSW0mFo0K7ycGOBW9NCG_2Zldm4
 
 
@@ -6,7 +7,7 @@
 # @hostname = https://ospro-api.ospro.id/api
 # @hostname = https://api-iu.ospro.id/api
 # @hostname = https://api-staging-adw.ospro.id/api
-@hostname = http://localhost:8444/api
+@hostname = http://backend.test/api
 # @hostname = http://103.73.125.81:8444/api
 # @hostname = http://localhost:8444/adw-backend/api
 
@@ -418,7 +419,7 @@ content-type: application/json
       "operator": "AND"
     }
   ],
-  "select": ["kode_sortname", "nama", "mulai_proyek"],
+  "select": ["id", "nama", "rencana_biaya", "type_proyek_id", "currency_symbol", "mulai_proyek", "akhir_proyek"],
   "joins": [
     {
       "name": "m_users",
@@ -455,7 +456,43 @@ Authorization: Bearer  {{tokenS}}
 content-type: application/json
 
 {
-    "columns":[{"name":"nama","logic_operator":"ilike","value":"","operator":"AND"}],"joins":[{"name":"m_users","column_join":"pm_id","column_results":["name","username"]},{"name":"m_type_proyek","column_join":"type_proyek_id","column_results":["name","description"]}],"orders":{"columns":["id"],"ascending":false},"paging":{"start":0,"length":10}
+  "columns": [
+    {
+      "name": "nama",
+      "logic_operator": "ilike",
+      "value": "",
+      "operator": "AND"
+    }
+  ],
+  "select": ["id", "nama", "rencana_biaya", "color_progress", "currency_symbol", "mulai_proyek", "akhir_proyek"],
+  "joins": [
+    {
+      "name": "m_users",
+      "column_join": "pm_id",
+      "column_results": [
+        "name",
+        "username"
+      ]
+    },
+    {
+      "name": "m_type_proyek",
+      "column_join": "type_proyek_id",
+      "column_results": [
+        "name",
+        "description"
+      ]
+    }
+  ],
+  "orders": {
+    "columns": [
+      "id"
+    ],
+    "ascending": false
+  },
+  "paging": {
+    "start": 0,
+    "length": 10
+  }
 }
 
 ### add
@@ -529,7 +566,7 @@ content-type: application/json
 
 ###### Activity
 ### get data by id version
-GET {{hostname}}/activity/33/29/get
+GET {{hostname}}/activity/550/137/get
 Authorization: Bearer {{token}}
 content-type: application/json
 
@@ -785,24 +822,37 @@ content-type: application/json
 
 
 ###
-POST {{hostname}}/activity/get-curva-s
+POST {{hostname}}/dashboard/curva-s
 Authorization: Bearer {{token}}
 content-type: application/json
 
 { 
-    "project_id": [47], 
-    "period": "week"
+    "project_id": [15]
 }
 
+###
+POST {{hostname}}/project/s-curve-command-test
+Authorization: Bearer {{token}}
+content-type: application/json
+
+ {"period":"week","project_id":"129","gantt_id":"862"}
+### {"period":"week","project_id":"129","gantt_id":"862"}
 
 ###
-POST {{hostname}}/dashboard/curva-s
+POST {{hostname}}/project/calculate-s-curve
 Authorization: Bearer {{token}}
 content-type: application/json
 
-{ 
-    "project_id": [15]
-}
+{"period":"week","project_id":"129","gantt_id":"862"}
+### {"period":"week","project_id":"135","gantt_id":"891"}
+
+#######
+POST {{hostname}}/project/get-s-curve
+Authorization: Bearer {{token}}
+content-type: application/json
+
+{"period":"week","project_id":"129","gantt_id":"800"}
+### {"period":"week","project_id":"135","gantt_id":"891"}
 
 ###
 GET https://adw-api.ospro.id/api/request-material/get-material-integration?name=c
@@ -957,6 +1007,27 @@ content-type: application/json
     "user_id": 1247
 }
 
+
+# -6.226761,106.809311 jkarta
+# -6.465806,106.760559
+# -6.356175,108.336182 indramayu
+# -6.266805,106.468048, tigaraksa
+# -6.205115,106.918373 jatinegara
+######
+POST {{hostname}}/presence/test
+Authorization: Bearer {{token}}
+content-type: application/json
+
+{
+    "clock_in_out": {
+        "clock_out_lat": -6.356175,
+        "clock_out_lng": 108.336182,
+        "type" : "out"
+    },
+    "time": "2023-08-15T14:48:17+07:00",  
+    "user_id": 1566
+}
+
 ######
 POST {{hostname}}/presence/add
 Authorization: Bearer {{token}}
@@ -1016,9 +1087,7 @@ POST {{hostname}}/map-monitoring/search
 Authorization: Bearer {{token}}
 content-type: application/json
 
-{
-	"project_id" : [75, 76, 78]
-}
+{"project_id":[140,138,132,130]}
 
 ######
 POST {{hostname}}/waypoint/add-bulk
@@ -1159,13 +1228,3 @@ content-type: application/json
     }
 }
 
-#######
-POST {{hostname}}/project/get-s-curve
-Authorization: Bearer {{token}}
-content-type: application/json
-
-{
-    "period":"week",
-    "project_id":"118",
-    "gantt_id":"287"
-}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index f9e79b4..5d9bcfa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -69,6 +69,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->post('/project/get-s-curve', 'ProjectController@getSCurve');
 		$router->post('/project/calculate-s-curve', 'ProjectController@calculateSCurve');
 		$router->post('/project/s-curve-command', 'ProjectController@sCurveCommand');
+		$router->post('/project/s-curve-command-test', 'ProjectController@calculateSCurvetest');
 		$router->post('/project/get-linear-s-curve', 'ProjectController@getLinearSCurve');
 		$router->post('/project/get-overdue-activities', 'ProjectController@getOverdueActivities');
 		$router->post('/project/get-integration-invoice', 'ProjectController@getInvoiceIntegration');

From fa54ad6227ac49fa5993bc4ae8993451573d2c8d Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Mon, 27 Nov 2023 16:04:21 +0700
Subject: [PATCH 03/14] update scurve

---
 app/Helpers/MasterFunctionsHelper.php       |  23 +++-
 app/Http/Controllers/ActivityController.php | 125 ++++++++++++++++++++
 routes/web.php                              |   3 +
 3 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index bf2ee73..9baaa80 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -642,7 +642,11 @@ class MasterFunctionsHelper
 					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
 					// $bobotHari = $keyPlanM->bobot_planning / $keyPlanM->duration;
 				}else{
-				    $weeklyProgress = 0;
+				    // $weeklyProgress = 0;
+					$weekCount = 1 / 7;
+				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
 				
 				}
 				
@@ -776,10 +780,11 @@ class MasterFunctionsHelper
 			$potential = "SAVING";
 		} else {
 			$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
-		}
-
+		} 
         $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
         $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
+		array_pop($tempPercentageReal);
+		array_pop($tempPercentageReal);
 		$dataResponse = array(
 			"date" => $tempDate,
 			"percentage" => $tempPercentage,
@@ -1253,11 +1258,17 @@ class MasterFunctionsHelper
 
 					if($keyPlanM->duration){
 						$weekCount = $keyPlanM->duration / 7;
-						// $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
-						$weeklyPlan = $weekCount > 0 ? $sumVolPlan->ttl_qty_plan / $weekCount : 0;
+						$weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+						// $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
 						$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+						// $bobotHari = $keyPlanM->bobot_planning / $keyPlanM->duration;
 					}else{
-						$weeklyProgress = 0;
+						// $weeklyProgress = 0;
+						$weekCount = 1 / 7;
+						$weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+						// $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+						$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					
 					}
 
 				// $weeklyPlan = $sumVolPlan->ttl_qty_plan / $weekCount;
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 21dc80c..eabfcc6 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -37,6 +37,94 @@ class ActivityController extends Controller
 		return response()->json(['status' => 'success', 'data' => $dataGantt, 'code' => 200], 200);
 	}
 
+	public function activitySCurve($proyek_id, $gantt_id){
+		
+			// "data": [
+			// 	  {
+			// 		"id": 1,
+			// 		"text": "Office itinerancy",
+			// 		"type": "project",
+			// 		"order": "10",
+			// 		"progress": 0.4,
+			// 		"open": true,
+			// 		"user":"0",
+			// 		"start_date": "02-04-2024 00:00",
+			// 		"duration": 17,
+			// 		"end_date": "19-04-2024 00:00",
+			// 		"parent": 0
+			// 	  }
+			// 	],
+			// 	"links": [
+			// 	  {
+			// 		"id": "1",
+			// 		"source": "1",
+			// 		"target": "2",
+			// 		"type": "1"
+			// 	  }
+			// 	]
+			// }
+
+		$checkHeader = Activity::where('version_gantt_id', $gantt_id)->where('type_activity', 'header')->count();
+		$finalData = [];
+		if ($checkHeader > 0) {
+			$dataHeader = Activity::select('id', 'name as text', 'type_activity as type', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order')->where('version_gantt_id', $gantt_id)->where('type_activity', 'header')->first();
+			 
+			// $dataHeader->start_date1 = isset($dataHeader->start) ? date_format(date_create($dataHeader->start), "d-m-Y H:i") : NULL;
+			// $dataHeader->end_date1 = isset($dataHeader->end) ? date_format(date_create($dataHeader->end), "d-m-Y H:i") : NULL;
+			
+			$dataHeader->progress = $dataHeader->progress / 100;
+			
+			$dataHeader->type = "project";
+			$dataHeader->text = $dataHeader->name;
+			$finalData[] = $dataHeader;
+			$data = Activity::select('id', 'name as text', 'type_activity as type', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order')->where('version_gantt_id', $gantt_id)->where('parent_id', $dataHeader->id)->orderBy('sortorder', 'asc')->get();
+		} else {
+			$data = Activity::select('id', 'name as text', 'type_activity as type', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order')->where('version_gantt_id', $gantt_id)->whereNull('parent_id')->orderBy('sortorder', 'asc')->get();
+		}
+
+		foreach ($data as $objRow) {
+			$type = "project";
+			$dataChildren = $this->getChildrenSCurve($gantt_id, $objRow->id); 
+
+			if ($objRow->type_activity == "milestone")
+				$type = $objRow->type_activity;
+			if (empty($dataChildren))
+				$type = "task";
+ 
+			$objRow->parent = $objRow->parent_id ? $objRow->parent_id : null; 
+			// $objRow->start_date = isset($objRow->start) ? date_format(date_create($objRow->start), "d-m-Y H:i") : NULL;
+			// $objRow->end_date1 = isset($objRow->end) ? date_format(date_create($objRow->end), "d-m-Y H:i") : NULL;
+			
+			$objRow->progress = $objRow->persentase_progress / 100;
+			$objRow->type = $type;
+			$finalData[] = $objRow;
+			$finalData = array_merge($finalData, $dataChildren);
+		}
+
+		$dataLink = Link::where('version_gantt_id', $gantt_id)->get();
+		$finalLink = [];
+		foreach ($dataLink as $objRow) {
+			$dataRow = array(
+				'id' => $objRow->id,
+				'source' => $objRow->s_activity_id,
+				'target' => $objRow->t_activity_id,
+				'type' => $objRow->type_link,
+				'code' => $objRow->code_link
+			);
+			if ($objRow->lag)
+				$dataRow['lag'] = $objRow->lag;
+			$finalLink[] = $dataRow;
+		}
+
+		$resultData = array(
+			"data" => $finalData,
+			"links" => $finalLink
+		);
+ 
+		return response()->json(['status' => 'success', 'data' => $resultData, 'code' => 200], 200);
+
+	}
+
 	private function getDataActivity($id)
 	{
 		$checkHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count();
@@ -116,6 +204,43 @@ class ActivityController extends Controller
 		return $resultData;
 	}
 
+	private function getChildrenSCurve($gantt_id, $parent_id)
+	{
+		$finalData = [];
+		
+		$data = Activity::select('id', 'name as text', 'type_activity as type', 'bobot_planning', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order')
+						->where('version_gantt_id', $gantt_id)->where('parent_id', $parent_id)->orderBy('sortorder', 'asc')->get();
+		foreach ($data as $objRow) {
+			$objRow->parent = $parent_id; 
+			$objRow->progress = (float) $objRow->bobot_planning /100; 
+			// $objRow->start_date1 = isset($objRow->start) ? date_format(date_create($objRow->start), "d-m-Y H:i") : NULL;
+			// $objRow->end_date1 = isset($objRow->end) ? date_format(date_create($objRow->end), "d-m-Y H:i") : NULL;
+			
+			$dataChildren = $this->getChildrenSCurve($gantt_id, $objRow->id);
+			if ($objRow->type_activity == "milestone") {
+				$objRow->type = $objRow->type_activity;
+				// $objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "d-m-Y") : NULL;
+			} elseif (empty($dataChildren)) {
+				$objRow->type = "task";
+				// $objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "d-m-Y") : NULL;
+				// $objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "d-m-Y") : NULL;
+				// if(isset($objRow->actual_start)){
+				// 	$objRow->auto_scheduling = false;
+				// }
+			} else {
+				$objRow->type = "project";
+				// $actualStart = $this->getFirstLastDateActivity($objRow->id, "start");
+				// $objRow->actual_start = isset($actualStart) ? date_format(date_create($actualStart), "d-m-Y") : NULL;
+
+				// $actualEnd = $this->getFirstLastDateActivity($objRow->id, "end");
+				// $objRow->actual_end = isset($actualEnd) ? date_format(date_create($actualEnd), "d-m-Y") : NULL;
+			} 
+			$finalData[] = $objRow;
+			$finalData = array_merge($finalData, $dataChildren);
+		}
+		return $finalData;
+	}
+
 	private function getChildren($gantt_id, $parent_id)
 	{
 		$finalData = [];
diff --git a/routes/web.php b/routes/web.php
index 5d9bcfa..14e1d08 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -75,6 +75,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->post('/project/get-integration-invoice', 'ProjectController@getInvoiceIntegration');
 		$router->post('/project/get-report-distribution', 'ProjectController@getReportDistribution');
 
+
 		/* $router->get('/project/get-expenditure/{id}/{date?}', 'ProjectController@getExpenditure'); */
 		/* $router->get('/project/get-total-expenditure/{id}', 'ProjectController@getTotalExpenditure'); */
 		/* $router->get('/project/get-status-health-schedule/{id}', 'ProjectController@getStatusSchedule'); */
@@ -214,6 +215,8 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
     	$router->post('/activity/import-old', 'ActivityController@importOld');
     	$router->post('/activity/batch-update/{ganttId}', 'ActivityController@batchUpdate');
     	$router->get('/activity/update-schedule/{ganttId}', 'ActivityController@updateSchedule');
+		$router->get('/activity/s-curve/{proyek_id}/{gantt_id}', 'ActivityController@activitySCurve');
+
 		$router->post('/task', 'ActivityController@add');
 		$router->get('/task/edit/{id}', 'ActivityController@edit');
 		$router->put('/task/{id}', 'ActivityController@update');

From 1cfc01dad20be6cfdf8b0a989efdd5e9db4d6bff Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Mon, 27 Nov 2023 19:14:24 +0700
Subject: [PATCH 04/14] limit actual progress till today

---
 app/Helpers/MasterFunctionsHelper.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index 9baaa80..c45954e 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -739,6 +739,8 @@ class MasterFunctionsHelper
 				'plan' => $dataTempPlan,
 				'actual' => $dataTempReport,
 			);
+			$today = new DateTime();
+			$date = new DateTime($dt->format("Y-m-d"));
 			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
 				$tempTtlPercentPlan += $sumPercentagePlan;
 				$tempTtlPercentActual += $sumPercentageActual;
@@ -749,14 +751,18 @@ class MasterFunctionsHelper
 				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
 				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
+				if ($date < $today) {
 				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				}
 				if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
 					break;
 				}
 			} else {
 				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
 				$tempPercentagePlan[] = round($sumPercentagePlan, 2);
+				if ($date < $today) {
 				$tempPercentageReal[] = round($sumPercentageActual, 2);
+				}
 			}
 		}
 
@@ -783,8 +789,6 @@ class MasterFunctionsHelper
 		} 
         $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
         $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
-		array_pop($tempPercentageReal);
-		array_pop($tempPercentageReal);
 		$dataResponse = array(
 			"date" => $tempDate,
 			"percentage" => $tempPercentage,

From ba5447c3ff4c0529d7a7d48399f1db48716a181c Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Mon, 27 Nov 2023 20:49:18 +0700
Subject: [PATCH 05/14] update fix curva

---
 app/Helpers/MasterFunctionsHelper.php | 28 +++++++++------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index c45954e..f1e9058 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -514,15 +514,6 @@ class MasterFunctionsHelper
 		if (!Activity::where("version_gantt_id", $keyGantt['id'])->first())
 			return $dataFinal;
 
-		// $alreadyHasReport = DB::table('report_activity_material as a')
-		// 	->select('a.id')
-		// 	->join('m_activity as b', 'b.id', '=', 'a.activity_id')
-		// 	->where('b.version_gantt_id', '=', $keyGantt['id'])
-		// 	->exists();
-		// note : delete this
-		// if(!$alreadyHasReport)
-		// 	return $dataFinal;
-
 		$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first();
 
 		$begin = new \DateTime($minDate);
@@ -568,14 +559,6 @@ class MasterFunctionsHelper
 			$minSevenDays = new \Datetime($dt->format("Y-m-d"));
 			$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
 			$tempDate[] = array($dt->format("Y-m-d"));
-			// $dataPlanM = DB::table('assign_material_to_activity as ama')
-			// 	->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
-			// 	->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-			// 	->where('ama.proyek_id', '=', $keyGantt['proyek_id'])
-			// 	->where('a.version_gantt_id', '=', $keyGantt['id'])
-			// 	->whereDate('ama.plan_date', '<=',$dt->format("Y-m-d"))
-			// 	->whereDate('ama.plan_date', '>', $minSevenDays)
-			// 	->get();
 
 			$activities = DB::table('m_activity AS a')
 				->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id')
@@ -1381,6 +1364,9 @@ class MasterFunctionsHelper
 				'plan' => $dataTempPlan,
 				'actual' => $dataTempReport,
 			);
+
+			$today = new DateTime();
+			$date = new DateTime($dt->format("Y-m-d"));
 			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
 				$tempTtlPercentPlan += $sumPercentagePlan;
 				$tempTtlPercentActual += $sumPercentageActual;
@@ -1394,14 +1380,18 @@ class MasterFunctionsHelper
 				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
 				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
-				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				if ($date < $today) {
+					$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				}
 				// if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
 				// 	break;
 				// }
 			} else {
 				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
 				$tempPercentagePlan[] = round($sumPercentagePlan, 2);
-				$tempPercentageReal[] = round($sumPercentageActual, 2);
+				if ($date < $today) {
+					$tempPercentageReal[] = round($sumPercentageActual, 2);
+				}
 			}
 			$tempDate[] = array($dt->format("Y-m-d"));
 		}

From de9b52592d323fa9019768727b54b231b92f62ab Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Sun, 3 Dec 2023 03:47:26 +0700
Subject: [PATCH 06/14] update calculate curva with day

---
 app/Helpers/MasterFunctionsHelper.php       | 404 ++++++--------------
 app/Http/Controllers/ActivityController.php |   1 +
 rest-client.http                            |  21 +-
 3 files changed, 132 insertions(+), 294 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index f1e9058..c43d887 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -165,41 +165,26 @@ class MasterFunctionsHelper
 	public function calculateProgressBasedOnReportMaterialOld($keyGantt)
 	{
 		DB::enableQueryLog();
-
 		$dataFinal = [];
 		$dataPayload = [];
 		$dataPayload['period'] = 'week';
 		$totalACWP = 0;
 		$totalBCWP = 0;
 		$tempPercentage = [];
-
 		$dataProject = Project::find($keyGantt['proyek_id']);
 		$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->first();
 		if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) {
 			$dataPayload['end_date'] = $dataProject->akhir_proyek;
 		}
-
 		if ($dataHeader) {
 			$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
 		} else {
 			$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
 		}
-
 		if (!Activity::where("version_gantt_id", $keyGantt['id'])->first())
 			return $dataFinal;
-
-		$alreadyHasReport = DB::table('report_activity_material as a')
-			->select('a.id')
-			->join('m_activity as b', 'b.id', '=', 'a.activity_id')
-			->where('b.version_gantt_id', '=', $keyGantt['id'])
-			->exists();
-		// note : delete this
-		// if(!$alreadyHasReport)
-		// 	return $dataFinal;
-
 		$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first();
-
-		$begin = new \DateTime($minDate . ' Monday');
+		$begin = new \DateTime($minDate);
 		$begin->modify('last Monday');
 		if (isset($dataPayload['end_date'])) {
 			$maxDate = $dataPayload['end_date'];
@@ -226,7 +211,6 @@ class MasterFunctionsHelper
 			$interval = new \DateInterval('P7D');
 		}
 		$period = new \DatePeriod($begin, $interval, $end);
-
 		$arr_ActualM = [];
 		$tempDate = [];
 		$tempPercentagePlan = [];
@@ -234,23 +218,12 @@ class MasterFunctionsHelper
 		$tempPercentageReal = [];
 		$tempTtlPercentPlan = 0;
 		$tempTtlPercentActual = 0;
-
 		$currentACWP = 0;
 		$currentBCWP = 0;
-
 		foreach ($period as $dt) {
 			$minSevenDays = new \Datetime($dt->format("Y-m-d"));
 			$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
 			$tempDate[] = array($dt->format("Y-m-d"));
-			// $dataPlanM = DB::table('assign_material_to_activity as ama')
-			// 	->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
-			// 	->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-			// 	->where('ama.proyek_id', '=', $keyGantt['proyek_id'])
-			// 	->where('a.version_gantt_id', '=', $keyGantt['id'])
-			// 	->whereDate('ama.plan_date', '<=',$dt->format("Y-m-d"))
-			// 	->whereDate('ama.plan_date', '>', $minSevenDays)
-			// 	->get();
-
 			$activities = DB::table('m_activity AS a')
 				->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id')
 				->where('a.type_activity', 'task')
@@ -259,7 +232,6 @@ class MasterFunctionsHelper
 				->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d"))
 				->whereDate('amta.plan_date', '>', $minSevenDays)
 				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id');
-
 			$dataPlanM = DB::table('m_activity AS a')
 				->join('assign_hr_to_activity AS ahta', 'ahta.activity_id', '=', 'a.id')
 				->where('a.type_activity', 'task')
@@ -270,7 +242,6 @@ class MasterFunctionsHelper
 				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id')
 				->union($activities)
 				->get();
-
 			$dataActualM = DB::table('report_activity_material as ram')
 				->select('ram.activity_id', 'ram.qty', 'ram.report_date', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
 				->join('m_activity as a', 'a.id', '=', 'ram.activity_id')
@@ -284,7 +255,6 @@ class MasterFunctionsHelper
 			$sumPercentagePlan = 0;
 			$totalACWP = isset($totalACWP) ? $totalACWP : 0;
 			$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
-
 			foreach ($dataPlanM as $keyPlanM) {
 				// $sumVolPlan = DB::table(function ($query) use ($keyGantt) {
 				// 	$query->select('a.*')
@@ -309,9 +279,21 @@ class MasterFunctionsHelper
 					->where('activity_id', '=', $keyPlanM->id)
 					->groupBy('activity_id')
 					->first();
-				$weekCount = $keyPlanM->duration / $keyPlanM->duration;
-				$weeklyPlan = $weekCount > 0 ? $sumVolPlan->ttl_qty_plan / $weekCount : 0;
-				$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+				if($keyPlanM->duration){
+					$weekCount = $keyPlanM->duration / 7;
+				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					// $bobotHari = $keyPlanM->bobot_planning / $keyPlanM->duration;
+				}else{
+				    // $weeklyProgress = 0;
+					$weekCount = 1 / 7;
+				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
+				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+				
+				}
+				
 				// $weeklyPlan = $weekCount > 0 ? $keyPlanM->bobot_planning / $weekCount : 0;
 				// $weeklyProgress = $weeklyPlan * $keyPlanM->bobot_planning;
 				$dataTempPlan[$x]['activity_id'] = $keyPlanM->id;
@@ -333,7 +315,6 @@ class MasterFunctionsHelper
 				}
 				$x++;
 			}
-
 			$w = 0;
 			$dataTempReport = [];
 			$sumPercentageActual = 0;
@@ -384,8 +365,6 @@ class MasterFunctionsHelper
 					// 		$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
 					// 	}
 					// }
-
-
 					$totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
 				} catch (\DivisionByZeroError $e) {
 					return response()->json(['message' => $e->getMessage()]);
@@ -393,7 +372,6 @@ class MasterFunctionsHelper
 				$dataTempReport[$w]['totalacwp'] = $totalACWP;
 				$w++;
 			}
-
 			$arr_ActualM[] = array(
 				'date' => $dt->format("Y-m-d"),
 				'percentPlan' => $sumPercentagePlan,
@@ -401,42 +379,30 @@ class MasterFunctionsHelper
 				'plan' => $dataTempPlan,
 				'actual' => $dataTempReport,
 			);
+			$today = new DateTime();
+			$date = new DateTime($dt->format("Y-m-d"));
 			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
 				$tempTtlPercentPlan += $sumPercentagePlan;
 				$tempTtlPercentActual += $sumPercentageActual;
-
-				// if($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= $keyGantt['progress'];){
-				// if($tempTtlPercentActual >= 100)
-				// 	$tempTtlPercentActual = 100;
-				// if($tempTtlPercentPlan >= 100)
-				// 	$tempTtlPercentPlan = 100;
-
-				// if($tempTtlPercentActual >= $keyGantt['progress'])
-				// 	$tempTtlPercentActual = $keyGantt['progress'];
-                // todo
-				// if ($tempTtlPercentPlan >= 100)
-				// 	$tempTtlPercentPlan = 100;
-				// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual
-
-				// }
-
 				$currentACWP += $totalACWP;
 				$currentBCWP += $totalBCWP;
-
 				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
 				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
+				if ($date < $today) {
 				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				}
 				if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
 					break;
 				}
 			} else {
 				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
 				$tempPercentagePlan[] = round($sumPercentagePlan, 2);
+				if ($date < $today) {
 				$tempPercentageReal[] = round($sumPercentageActual, 2);
+				}
 			}
 		}
-
 		try {
 			if (round($totalACWP, 0) > $totalRencanaBudget) {
 				$estimatedCost = round($totalACWP, 0) + 0;
@@ -451,14 +417,12 @@ class MasterFunctionsHelper
 			]);
 		}
 		$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
-
 		$costDeviation = $totalRencanaBudget - $estimatedCost;
 		if ($costDeviation > 0) {
 			$potential = "SAVING";
 		} else {
 			$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
-		}
-
+		} 
         $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
         $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
 		$dataResponse = array(
@@ -478,13 +442,11 @@ class MasterFunctionsHelper
 				"potential" => $potential,
 			)
 		);
-
 		$dataFinal[] = array(
 			"proyek_name" => $dataProject->nama,
 			"data" => $dataResponse,
 			"gantt" => $keyGantt
 		);
-
 		return $dataFinal;
 	}
 
@@ -517,14 +479,14 @@ class MasterFunctionsHelper
 		$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first();
 
 		$begin = new \DateTime($minDate);
-		$begin->modify('last Monday');
+		$begin = $begin->modify('-1 day');
 		if (isset($dataPayload['end_date'])) {
 			$maxDate = $dataPayload['end_date'];
 			$end = new \DateTime($maxDate . ' Friday');
-			$end->modify('next Friday');
-			$end->modify('next Friday');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
 			/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged
-			$interval = new \DateInterval('P7D');
+			$interval = new \DateInterval('P1D');
 		} else {
 			$actualMaxDate = DB::table('assign_material_to_activity as ama')
 				->where("ama.proyek_id", $keyGantt['proyek_id'])
@@ -538,9 +500,9 @@ class MasterFunctionsHelper
 				->max("a.planned_end"); // plan date overlapped with assign_material_to_activity's, it should be m_activity'
 			$maxDate = max(new \DateTime($plannedMaxDate), new \DateTime($actualMaxDate));
 			$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday');
-			$end->modify('next Friday');
-			$end->modify('next Friday');
-			$interval = new \DateInterval('P7D');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
+			$interval = new \DateInterval('P1D');
 		}
 		$period = new \DatePeriod($begin, $interval, $end);
 
@@ -554,245 +516,113 @@ class MasterFunctionsHelper
 
 		$currentACWP = 0;
 		$currentBCWP = 0;
-
+		$dataActivityPlanDate = [];
+		$progressPlanKomulatifWeek = [];
+		$progressActualKomulatifWeek = [];
+		$dateWeek = [];
+		$tmpProgressPlanWeek = 0;
+		$tmpProgressActualWeek = 0;
 		foreach ($period as $dt) {
-			$minSevenDays = new \Datetime($dt->format("Y-m-d"));
-			$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
+			$loopDay = $dt->format("Y-m-d");
+			//new \Datetime($dt->format("Y-m-d"));
+			// $minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
 			$tempDate[] = array($dt->format("Y-m-d"));
 
-			$activities = DB::table('m_activity AS a')
-				->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id')
-				->where('a.type_activity', 'task')
-				->where('a.bobot_planning', '>', 0)
-				->where('a.version_gantt_id', $keyGantt['id'])
-				->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d"))
-				->whereDate('amta.plan_date', '>', $minSevenDays)
-				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id');
-
-			$dataPlanM = DB::table('m_activity AS a')
-				->join('assign_hr_to_activity AS ahta', 'ahta.activity_id', '=', 'a.id')
-				->where('a.type_activity', 'task')
-				->where('a.bobot_planning', '>', 0)
-				->where('a.version_gantt_id', $keyGantt['id'])
-				->whereDate('a.start_date', '<=', $dt->format("Y-m-d"))
-				->whereDate('a.start_date', '>', $minSevenDays)
-				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id')
-				->union($activities)
-				->get();
+			$dataPlanM = DB::table('m_activity') 
+				->where('type_activity', 'task')
+				->where('bobot_planning', '>', 0)
+				->where('version_gantt_id', $keyGantt['id'])
+				->whereDate('planned_start', '<=', $loopDay)
+				->whereDate('planned_end', '>=', $loopDay)
+				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id')
+				->get(); 
 
 			$dataActualM = DB::table('report_activity_material as ram')
-				->select('ram.activity_id', 'ram.qty', 'ram.report_date', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
-				->join('m_activity as a', 'a.id', '=', 'ram.activity_id')
-				->where('a.version_gantt_id', '=', $keyGantt['id'])
-				->where('a.proyek_id', '=', $keyGantt['proyek_id'])
-				->whereDate('ram.report_date', '<=', $dt->format("Y-m-d"))
-				->whereDate('ram.report_date', '>', $minSevenDays)
+				->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
+				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+						DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity')
+					)
+				->where('ram.report_date', $loopDay)
+				->where('ma.version_gantt_id', $keyGantt['id'])
 				->get();
-			$dataTempPlan = [];
-			$x = 0;
-			$sumPercentagePlan = 0;
-			$totalACWP = isset($totalACWP) ? $totalACWP : 0;
-			$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
-
-			foreach ($dataPlanM as $keyPlanM) {
-				// $sumVolPlan = DB::table(function ($query) use ($keyGantt) {
-				// 	$query->select('a.*')
-				// 		->from('m_activity AS a')
-				// 		->join('assign_material_to_activity as amta', 'amta.activity_id', '=', 'a.id')
-				// 		->where('a.type_activity', 'task')
-				// 		->where('a.bobot_planning', '>', 0)
-				// 		->where('a.version_gantt_id', $keyGantt['id'])
-				// 		->unionAll(function ($query) use ($keyGantt) {
-				// 			$query->select('a.*')
-				// 				->from('m_activity AS a')
-				// 				->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'a.id')
-				// 				->where('a.type_activity', 'task')
-				// 				->where('a.bobot_planning', '>', 0)
-				// 				->where('a.version_gantt_id', $keyGantt['id']);
-				// 		})
-				// 		->orderBy('id', 'asc');
-				// }, 'subquery')
-				// 	->sum('bobot_planning');
-				$sumVolPlan = DB::table('assign_material_to_activity')
-					->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
-					->where('activity_id', '=', $keyPlanM->id)
-					->groupBy('activity_id')
-					->first();
-				if($keyPlanM->duration){
-					$weekCount = $keyPlanM->duration / 7;
-				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
-				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
-					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
-					// $bobotHari = $keyPlanM->bobot_planning / $keyPlanM->duration;
-				}else{
-				    // $weeklyProgress = 0;
-					$weekCount = 1 / 7;
-				    $weeklyPlan = $weekCount >= 1 ? $sumVolPlan->ttl_qty_plan / $weekCount : $sumVolPlan->ttl_qty_plan / $weekCount / 7;
-				    // $weeklyProgress = $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
-					$weeklyProgress = $weeklyPlan / $sumVolPlan->ttl_qty_plan * $keyPlanM->bobot_planning;
+		
+			$dataActivityPlan = []; 
+			$dataActivityActual = [];
+			$today = new DateTime();
+			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
 				
+				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
+				if (new \DateTime($loopDay) < $today) {
+					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
+					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
 				}
-				
-				// $weeklyPlan = $weekCount > 0 ? $keyPlanM->bobot_planning / $weekCount : 0;
-				// $weeklyProgress = $weeklyPlan * $keyPlanM->bobot_planning;
-				$dataTempPlan[$x]['activity_id'] = $keyPlanM->id;
-				$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning;
-				$dataTempPlan[$x]['ttl_plan'] = $sumVolPlan;
-				$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual;
-				$dataTempPlan[$x]['duration'] = $keyPlanM->duration;
-				$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress;
-				try {
-					$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning;
-					$sumPercentagePlan += $weeklyProgress;
-					if (isset($keyPlanM->duration) && $keyPlanM->duration > 0)
-						$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100;
-					else
-						$totalBCWP = 0;
-					$dataTempPlan[$x]['totalBCWP'] = $totalBCWP;
-				} catch (\DivisionByZeroError $e) {
-					return response()->json(['message' => $e->getMessage()]);
-				}
-				$x++;
+				$dateWeek[] = [$loopDay];
+				// $tmpProgressPlanWeek = 0;
+				// $tmpProgressActualWeek = 0;
 			}
-
-			$w = 0;
-			$dataTempReport = [];
-			$sumPercentageActual = 0;
-			foreach ($dataActualM as $keyActualM) {
-				$sumVolActual = DB::table('assign_material_to_activity')
-					->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
-					->where('activity_id', '=', $keyActualM->activity_id)
-					->groupBy('activity_id')
-					->first();
-				$sumReportActual = DB::table('report_activity_material')
-					->where('activity_id', $keyActualM->activity_id)
-					->sum('qty');
-				$reportCount = DB::table('report_activity_material')->where('activity_id', '=', $keyActualM->activity_id)->count();
-				$dataTempReport[$w]['activity_id'] = $keyActualM->activity_id;
-				$dataTempReport[$w]['qty'] = $keyActualM->qty;
-				$dataTempReport[$w]['report_date'] = $keyActualM->report_date;
-				$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning;
-				$dataTempReport[$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan;
-				$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual;
-				$dataTempReport[$w]['duration'] = $keyActualM->duration;
-				$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress;
-				try {
-					// assign_material_to_activity
-					$checkStatusActivity = DB::table('assign_material_to_activity')
-						->select('activity_id', 'status_activity')
-						->where('activity_id', '=', $keyActualM->activity_id)
-						->orderBy('status_activity', 'ASC')
-						->first();
-					$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
-					// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
-					// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
-					if ($checkStatusActivity->status_activity == 'done') {
-						$sumPercentageActual += $keyActualM->bobot_planning / $reportCount;
-						// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
-					} else {
-						if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
-							$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100);
-							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
-						} else {
-							$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
-							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
-						}
-					}
-					// }else {
-					// 	if($checkStatusActivity->status_activity == 'done'){
-					// 		$sumPercentageActual+=($keyActualM->qty/$keyActualM->qty)*$keyActualM->bobot_planning;
-					// 	}else{
-					// 		$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
-					// 	}
-					// }
-
-
-					$totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
-				} catch (\DivisionByZeroError $e) {
-					return response()->json(['message' => $e->getMessage()]);
-				}
-				$dataTempReport[$w]['totalacwp'] = $totalACWP;
-				$w++;
+			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
+			foreach ($dataPlanM as $keyPlanM) {
+				# hitung untuk persentase progress planning
+				$dataActivityPlan[] = array(
+					'progressPlanDay' 	=> $keyPlanM->bobot_planning / $keyPlanM->duration,
+					'name'				=> $keyPlanM->name,
+					'bobot_p'			=> $keyPlanM->bobot_planning,
+					'duration'			=> $keyPlanM->duration
+				);
+				$tmpProgressPlanWeek += $keyPlanM->bobot_planning / $keyPlanM->duration;
 			}
 
-			$arr_ActualM[] = array(
-				'date' => $dt->format("Y-m-d"),
-				'percentPlan' => $sumPercentagePlan,
-				'percentActual' => $sumPercentageActual,
-				'plan' => $dataTempPlan,
-				'actual' => $dataTempReport,
-			);
-			$today = new DateTime();
-			$date = new DateTime($dt->format("Y-m-d"));
-			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
-				$tempTtlPercentPlan += $sumPercentagePlan;
-				$tempTtlPercentActual += $sumPercentageActual;
-
-				$currentACWP += $totalACWP;
-				$currentBCWP += $totalBCWP;
-
-				$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
-				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
-				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
-				if ($date < $today) {
-				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+			// hitung progress actual
+			foreach ($dataActualM as $keyActualM) {
+				# hitung untuk persentase progress actual
+				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
+				}else{
+					$progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
 				}
-				if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
-					break;
+				if($keyActualM->status_activity == 'done'){
+					$progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
 				}
-			} else {
-				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
-				$tempPercentagePlan[] = round($sumPercentagePlan, 2);
-				if ($date < $today) {
-				$tempPercentageReal[] = round($sumPercentageActual, 2);
+				else{
+					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
 				}
+				$dataActivityActual[] = array(
+					'progressActualDay' 	=> $progressActualWeek,
+					'qty_act'				=> $keyActualM->qty_actual,
+					'bobot_p'				=> $keyActualM->bobot_planning,
+					'qty_plan'				=> $keyActualM->qty_plan,
+					'status_activity'		=> $keyActualM->status_activity,
+					'sum_qty_actual'		=> $keyActualM->sum_qty_actual,
+					'name'					=> $keyActualM->name
+				);
+				
+				$tmpProgressActualWeek += $progressActualWeek;
 			}
-		}
 
-		try {
-			if (round($totalACWP, 0) > $totalRencanaBudget) {
-				$estimatedCost = round($totalACWP, 0) + 0;
-			} else {
-				$estimatedCost = ($totalRencanaBudget + 0);
-			}
-		} catch (\DivisionByZeroError $e) {
-			return response()->json([
-				'message' => $e->getMessage(),
-				"line" => 566,
-				'gantt' => $keyGantt,
-			]);
+			$dataActivityPlanDate[] = array(
+				"date" => $loopDay,
+				"statusWeek" => new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday') ? true : false,
+				"activity-plan" => $dataActivityPlan,
+				"activity-actual" => $dataActivityActual,
+				"tmpProgressActualWeek"	=> $tmpProgressActualWeek,
+				"progressPlanWeek" => $tmpProgressPlanWeek
+			); 
+			
 		}
-		$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
-
-		$costDeviation = $totalRencanaBudget - $estimatedCost;
-		if ($costDeviation > 0) {
-			$potential = "SAVING";
-		} else {
-			$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
-		} 
-        $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
-        $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
-		$dataResponse = array(
-			"date" => $tempDate,
-			"percentage" => $tempPercentage,
-			"percentagePlan" => $tempPercentagePlan,
-			"percentageReal" => $tempPercentageReal,
-			"data_details" => $arr_ActualM,
-			"budget_control" => array(
-				"current_budget" => $totalRencanaBudget,
-				"acwp" => round($totalACWP, 0),
-				"bcwp" => round($totalBCWP, 0),
-				"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)),
-				"add_cost_to_complete" => 0,
-				"estimated_at_completion" => $estimatedCost,
-				"cost_deviation" => $costDeviation,
-				"potential" => $potential,
-			)
-		);
 
 		$dataFinal[] = array(
+			// "date" => $dateWeek,
 			"proyek_name" => $dataProject->nama,
-			"data" => $dataResponse,
+			"data"	=> ["date" => $dateWeek, 
+						"percentagePlan" => $progressPlanKomulatifWeek,
+						"percentageActual" => $progressActualKomulatifWeek,
+						"data_details" => $dataActivityPlanDate
+					],
+			
+			
 			"gantt" => $keyGantt
 		);
 
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index eabfcc6..c2a8223 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -604,6 +604,7 @@ class ActivityController extends Controller
 				$activityToUpdate = $activity->firstWhere('id', $entity['data']['id']);
 				$entity['data']['name'] = $entity['data']['text'];
 				$entity['data']['persentase_progress'] = $entity['data']['progress'] * 100;
+				$entity['data']['type_activity'] = $entity['data']['type'];
 				if (isset($entity['data']['rencana_biaya'])) {
 					$entity['data']['rencana_biaya'] = str_replace(",", ".", $entity['data']['rencana_biaya']);
 				}
diff --git a/rest-client.http b/rest-client.http
index 6abe9ab..932e596 100644
--- a/rest-client.http
+++ b/rest-client.http
@@ -1,4 +1,4 @@
-@token =  eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9iYWNrZW5kLnRlc3RcL2FwaVwvbG9naW4iLCJpYXQiOjE3MDA0NTA1ODYsImV4cCI6MTcwMTA1NTM4NiwibmJmIjoxNzAwNDUwNTg2LCJqdGkiOiJack9MMU04UGdKWGkwTUU1Iiwic3ViIjoxLCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.fyg6CyiCAcX3GD4iSy8urkHpZEJ4mnXSXQc4NKC8U9A
+@token =  eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9iYWNrZW5kLnRlc3RcL2FwaVwvbG9naW4iLCJpYXQiOjE3MDEzNzMzNzQsImV4cCI6MTcwMTk3ODE3NCwibmJmIjoxNzAxMzczMzc0LCJqdGkiOiJhbkJWOHIwUDZndFRXZk5KIiwic3ViIjoxNzg4LCJwcnYiOiIyM2JkNWM4OTQ5ZjYwMGFkYjM5ZTcwMWM0MDA4NzJkYjdhNTk3NmY3In0.QCiXq-62da7Sdk7sEb_J0apEij_R6IQgZVYG9iL6M8g
 
 @tokenS = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hZHctYXBpLm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjkxNTcyMTIwLCJleHAiOjE2OTIxNzY5MjAsIm5iZiI6MTY5MTU3MjEyMCwianRpIjoiVUdqbnhLRVdlZzYyTTBnayIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.5QqK0dLW5jzbVOkSCSW0mFo0K7ycGOBW9NCG_2Zldm4
 
@@ -18,8 +18,8 @@ POST {{hostname}}/login
 content-type: application/json
 
 {
-    "username": "admin",
-    "password": "1nt3gr4s14"
+    "username": "testing",
+    "password": "testing123"
 }
 
 ###### Tools Req
@@ -835,8 +835,9 @@ POST {{hostname}}/project/s-curve-command-test
 Authorization: Bearer {{token}}
 content-type: application/json
 
- {"period":"week","project_id":"129","gantt_id":"862"}
-### {"period":"week","project_id":"129","gantt_id":"862"}
+#  {"period":"week","project_id":"137","gantt_id":"916"}
+# {"period":"week","project_id":"129","gantt_id":"862"}
+{"period":"week","project_id":"140","gantt_id":"1103"}
 
 ###
 POST {{hostname}}/project/calculate-s-curve
@@ -851,8 +852,14 @@ POST {{hostname}}/project/get-s-curve
 Authorization: Bearer {{token}}
 content-type: application/json
 
-{"period":"week","project_id":"129","gantt_id":"800"}
-### {"period":"week","project_id":"135","gantt_id":"891"}
+{"project_id":"164","gantt_id":"973","period":"week"}
+### {"period":"week","project_id":"129","gantt_id":"800"}
+
+#######
+GET {{hostname}}/activity/s-curve/137/892
+Authorization: Bearer {{token}}
+content-type: application/json
+
 
 ###
 GET https://adw-api.ospro.id/api/request-material/get-material-integration?name=c

From 8f084901089d2704d205e0286272565d234f30bf Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Sun, 3 Dec 2023 07:02:51 +0700
Subject: [PATCH 07/14] update logic duration 0

---
 app/Helpers/MasterFunctionsHelper.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index c43d887..a507ec2 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -534,7 +534,7 @@ class MasterFunctionsHelper
 				->where('version_gantt_id', $keyGantt['id'])
 				->whereDate('planned_start', '<=', $loopDay)
 				->whereDate('planned_end', '>=', $loopDay)
-				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id')
+				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
 				->get(); 
 
 			$dataActualM = DB::table('report_activity_material as ram')
@@ -558,20 +558,29 @@ class MasterFunctionsHelper
 					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
 					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
 				}
-				$dateWeek[] = [$loopDay];
-				// $tmpProgressPlanWeek = 0;
-				// $tmpProgressActualWeek = 0;
+				$dateWeek[] = [$loopDay]; 
 			}
 			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
 			foreach ($dataPlanM as $keyPlanM) {
 				# hitung untuk persentase progress planning
+				if($keyPlanM->duration == 0){
+					$duration = 2;
+				}
+				// $startPlan = new DateTime($keyPlanM->planned_start);
+				// $endPlan = new DateTime($keyPlanM->planned_end);
+				// $interval = $startPlan->diff($endPlan);
+
+				// // Mengambil hasil selisih hari
+				// $duration = $interval->days;
+
+				$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
 				$dataActivityPlan[] = array(
-					'progressPlanDay' 	=> $keyPlanM->bobot_planning / $keyPlanM->duration,
+					'progressPlanDay' 	=> $progressPlanWeek,
 					'name'				=> $keyPlanM->name,
 					'bobot_p'			=> $keyPlanM->bobot_planning,
 					'duration'			=> $keyPlanM->duration
 				);
-				$tmpProgressPlanWeek += $keyPlanM->bobot_planning / $keyPlanM->duration;
+				$tmpProgressPlanWeek += $progressPlanWeek;
 			}
 
 			// hitung progress actual
@@ -618,7 +627,7 @@ class MasterFunctionsHelper
 			"proyek_name" => $dataProject->nama,
 			"data"	=> ["date" => $dateWeek, 
 						"percentagePlan" => $progressPlanKomulatifWeek,
-						"percentageActual" => $progressActualKomulatifWeek,
+						"percentageReal" => $progressActualKomulatifWeek,
 						"data_details" => $dataActivityPlanDate
 					],
 			

From 6dc3ab828a798609e216d412911adb5c1b8c1afa Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Sun, 3 Dec 2023 08:37:50 +0700
Subject: [PATCH 08/14] update for duration +1

---
 app/Helpers/MasterFunctionsHelper.php | 177 +++++++++++++++++++++++++-
 1 file changed, 176 insertions(+), 1 deletion(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index a507ec2..99196e7 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -565,6 +565,8 @@ class MasterFunctionsHelper
 				# hitung untuk persentase progress planning
 				if($keyPlanM->duration == 0){
 					$duration = 2;
+				}else{
+					$duration = $keyPlanM->duration + 1;
 				}
 				// $startPlan = new DateTime($keyPlanM->planned_start);
 				// $endPlan = new DateTime($keyPlanM->planned_end);
@@ -950,7 +952,7 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
-	public function calculateSCurve($projectId)
+	public function calculateSCurveOld($projectId)
 	{
 		DB::enableQueryLog();
 
@@ -1289,6 +1291,179 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
+	public function calculateSCurve($projectId)
+	{
+		DB::enableQueryLog();
+
+		$dataFinal = [];
+		$dataPayload = [];
+		$dataPayload['period'] = 'week';
+		$totalACWP = 0;
+		$totalBCWP = 0;
+		$tempPercentage = [];
+
+		$dataProject = Project::find($projectId);
+		$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $projectId)->first();
+		if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) {
+			$dataPayload['end_date'] = $dataProject->akhir_proyek;
+		}
+
+		if ($dataHeader) {
+			$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $projectId)->sum("rencana_biaya");
+		} else {
+			$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $projectId)->sum("rencana_biaya");
+		}
+
+		$minDate = $dataProject->mulai_proyek;
+
+		$begin = new \DateTime($minDate);
+		$begin = $begin->modify('-1 day');
+		if (isset($dataPayload['end_date'])) {
+			$maxDate = $dataPayload['end_date'];
+			$end = new \DateTime($maxDate . ' Friday');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
+			/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged
+			$interval = new \DateInterval('P1D');
+		} else {
+			$maxDate = $dataProject->akhir_proyek; 
+			$end = new \DateTime($maxDate);
+			$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
+			$interval = new \DateInterval('P1D');
+		}
+		$period = new \DatePeriod($begin, $interval, $end);
+
+		$arr_ActualM = [];
+		$tempDate = [];
+		$tempPercentagePlan = [];
+		$tempPercentagePlanWhr = [];
+		$tempPercentageReal = [];
+		$tempTtlPercentPlan = 0;
+		$tempTtlPercentActual = 0;
+
+		$currentACWP = 0;
+		$currentBCWP = 0;
+		$dataActivityPlanDate = [];
+		$progressPlanKomulatifWeek = [];
+		$progressActualKomulatifWeek = [];
+		$dateWeek = [];
+		$tmpProgressPlanWeek = 0;
+		$tmpProgressActualWeek = 0;
+		foreach ($period as $dt) {
+			$loopDay = $dt->format("Y-m-d");
+			//new \Datetime($dt->format("Y-m-d"));
+			// $minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
+			$tempDate[] = array($dt->format("Y-m-d"));
+
+			$dataPlanM = DB::table('m_activity') 
+				->where('type_activity', 'task')
+				->where('bobot_planning', '>', 0)
+				->where('proyek_id', $projectId)
+				->whereDate('planned_start', '<=', $loopDay)
+				->whereDate('planned_end', '>=', $loopDay)
+				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
+				->get(); 
+
+			$dataActualM = DB::table('report_activity_material as ram')
+				->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
+				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+						DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity')
+					)
+				->where('ram.report_date', $loopDay)
+				->where('ma.proyek_id', $projectId)
+				->get();
+		
+			$dataActivityPlan = []; 
+			$dataActivityActual = [];
+			$today = new DateTime();
+			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
+				
+				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
+				if (new \DateTime($loopDay) < $today) {
+					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
+					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
+				}
+				$dateWeek[] = [$loopDay]; 
+			}
+			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
+			foreach ($dataPlanM as $keyPlanM) {
+				# hitung untuk persentase progress planning
+				if($keyPlanM->duration == 0){
+					$duration = 2;
+				}
+				// $startPlan = new DateTime($keyPlanM->planned_start);
+				// $endPlan = new DateTime($keyPlanM->planned_end);
+				// $interval = $startPlan->diff($endPlan);
+
+				// // Mengambil hasil selisih hari
+				// $duration = $interval->days;
+
+				$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
+				$dataActivityPlan[] = array(
+					'progressPlanDay' 	=> $progressPlanWeek,
+					'name'				=> $keyPlanM->name,
+					'bobot_p'			=> $keyPlanM->bobot_planning,
+					'duration'			=> $keyPlanM->duration
+				);
+				$tmpProgressPlanWeek += $progressPlanWeek;
+			}
+
+			// hitung progress actual
+			foreach ($dataActualM as $keyActualM) {
+				# hitung untuk persentase progress actual
+				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
+				}else{
+					$progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+				}
+				if($keyActualM->status_activity == 'done'){
+					$progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+				}
+				else{
+					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
+				}
+				$dataActivityActual[] = array(
+					'progressActualDay' 	=> $progressActualWeek,
+					'qty_act'				=> $keyActualM->qty_actual,
+					'bobot_p'				=> $keyActualM->bobot_planning,
+					'qty_plan'				=> $keyActualM->qty_plan,
+					'status_activity'		=> $keyActualM->status_activity,
+					'sum_qty_actual'		=> $keyActualM->sum_qty_actual,
+					'name'					=> $keyActualM->name
+				);
+				
+				$tmpProgressActualWeek += $progressActualWeek;
+			}
+
+			$dataActivityPlanDate[] = array(
+				"date" => $loopDay,
+				"statusWeek" => new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday') ? true : false,
+				"activity-plan" => $dataActivityPlan,
+				"activity-actual" => $dataActivityActual,
+				"tmpProgressActualWeek"	=> $tmpProgressActualWeek,
+				"progressPlanWeek" => $tmpProgressPlanWeek
+			); 
+			
+		}
+
+		$dataFinal[] = array(
+			// "date" => $dateWeek,
+			"proyek_name" => $dataProject->nama,
+			"data"	=> ["date" => $dateWeek, 
+						"percentagePlan" => $progressPlanKomulatifWeek,
+						"percentageReal" => $progressActualKomulatifWeek,
+						"data_details" => $dataActivityPlanDate
+					]
+		);
+
+		return $dataFinal;
+	}
+
 	public function calculateProgressBasedOnSimple($keyGantt)
 	{
 		DB::enableQueryLog();

From 0fa788e4f2cc306d1685a6e02a9ad0f86a8b17cc Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Mon, 4 Dec 2023 03:35:39 +0700
Subject: [PATCH 09/14] update curva calculate add count_report

---
 app/Helpers/MasterFunctionsHelper.php | 117 ++++++++++++++++++++------
 1 file changed, 90 insertions(+), 27 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index 99196e7..fec14b8 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -542,7 +542,8 @@ class MasterFunctionsHelper
 				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
 						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
 						DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
-						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity')
+						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+						DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
 					)
 				->where('ram.report_date', $loopDay)
 				->where('ma.version_gantt_id', $keyGantt['id'])
@@ -563,18 +564,25 @@ class MasterFunctionsHelper
 			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
 			foreach ($dataPlanM as $keyPlanM) {
 				# hitung untuk persentase progress planning
-				if($keyPlanM->duration == 0){
-					$duration = 2;
-				}else{
-					$duration = $keyPlanM->duration + 1;
-				}
+				// if($keyPlanM->duration == 0){
+					// $duration = 2;
+					// Tanggal awal
+					$startDate = new DateTime($keyPlanM->planned_start);
+					// Tanggal akhir
+					$endDate = new DateTime($keyPlanM->planned_end);
+					// Menghitung selisih hari
+					$interval = $startDate->diff($endDate);
+					// Mengambil hasil selisih hari
+					$duration = (int) $interval->days+1;
+				// }else{
+				// 	$duration = $keyPlanM->duration + 2;
+				// }
 				// $startPlan = new DateTime($keyPlanM->planned_start);
 				// $endPlan = new DateTime($keyPlanM->planned_end);
 				// $interval = $startPlan->diff($endPlan);
 
 				// // Mengambil hasil selisih hari
 				// $duration = $interval->days;
-
 				$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
 				$dataActivityPlan[] = array(
 					'progressPlanDay' 	=> $progressPlanWeek,
@@ -589,13 +597,36 @@ class MasterFunctionsHelper
 			foreach ($dataActualM as $keyActualM) {
 				# hitung untuk persentase progress actual
 				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+				// jika total report > dari planning
 				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
 					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
 				}else{
-					$progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+					// jika total report < dari planning
+					// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+					if($keyActualM->qty_actual == 0){
+						$progressActualWeek = 0;
+					}else{
+						$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
+					}
 				}
 				if($keyActualM->status_activity == 'done'){
-					$progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+					// if($keyActualM->count_report > 1){
+					// 	$progressActualWeek = $keyActualM->bobot_planning/$keyActualM->count_report;
+					// }else{
+						$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
+					// }
+					// if($progressActualWeek > $keyActualM->bobot_planning){
+					// 	$progressActualWeek = $keyActualM->bobot_planning;
+					// }else if($keyActualM->qty_actual == 0){
+					// 	$progressActualWeek = $keyActualM->bobot_planning;
+					// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
+						// $progressActualWeek = $keyActualM->bobot_planning;
+					// }else {
+						// $progressActualWeek = $progressActualWeek;
+					// }
+					// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+					// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
+					// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
 				}
 				else{
 					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
@@ -1328,23 +1359,23 @@ class MasterFunctionsHelper
 		} else {
 			$maxDate = $dataProject->akhir_proyek; 
 			$end = new \DateTime($maxDate);
-			$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday');
+			$end = new \DateTime($end->format('Y-m-d') . ' Friday');
 			// $end->modify('next Friday');
 			// $end->modify('next Friday');
 			$interval = new \DateInterval('P1D');
 		}
 		$period = new \DatePeriod($begin, $interval, $end);
 
-		$arr_ActualM = [];
+		// $arr_ActualM = [];
 		$tempDate = [];
-		$tempPercentagePlan = [];
-		$tempPercentagePlanWhr = [];
-		$tempPercentageReal = [];
-		$tempTtlPercentPlan = 0;
-		$tempTtlPercentActual = 0;
+		// $tempPercentagePlan = [];
+		// $tempPercentagePlanWhr = [];
+		// $tempPercentageReal = [];
+		// $tempTtlPercentPlan = 0;
+		// $tempTtlPercentActual = 0;
 
-		$currentACWP = 0;
-		$currentBCWP = 0;
+		// $currentACWP = 0;
+		// $currentBCWP = 0;
 		$dataActivityPlanDate = [];
 		$progressPlanKomulatifWeek = [];
 		$progressActualKomulatifWeek = [];
@@ -1371,7 +1402,8 @@ class MasterFunctionsHelper
 				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
 						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
 						DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
-						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity')
+						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+						DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
 					)
 				->where('ram.report_date', $loopDay)
 				->where('ma.proyek_id', $projectId)
@@ -1392,16 +1424,26 @@ class MasterFunctionsHelper
 			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
 			foreach ($dataPlanM as $keyPlanM) {
 				# hitung untuk persentase progress planning
-				if($keyPlanM->duration == 0){
-					$duration = 2;
-				}
+				// if($keyPlanM->duration == 0){
+					// $duration = 2;
+					// Tanggal awal
+					$startDate = new DateTime($keyPlanM->planned_start);
+					// Tanggal akhir
+					$endDate = new DateTime($keyPlanM->planned_end);
+					// Menghitung selisih hari
+					$interval = $startDate->diff($endDate);
+					// Mengambil hasil selisih hari
+					$duration = (int) $interval->days+1;
+				// }else{
+				// 	$duration = $keyPlanM->duration + 2;
+				// }
 				// $startPlan = new DateTime($keyPlanM->planned_start);
 				// $endPlan = new DateTime($keyPlanM->planned_end);
 				// $interval = $startPlan->diff($endPlan);
 
 				// // Mengambil hasil selisih hari
 				// $duration = $interval->days;
-
+				// 2023-07-26
 				$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
 				$dataActivityPlan[] = array(
 					'progressPlanDay' 	=> $progressPlanWeek,
@@ -1416,13 +1458,34 @@ class MasterFunctionsHelper
 			foreach ($dataActualM as $keyActualM) {
 				# hitung untuk persentase progress actual
 				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+				// jika total report > dari planning
 				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
 					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
 				}else{
-					$progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+					// jika total report < dari planning
+					// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+					if($keyActualM->qty_actual == 0){
+						$progressActualWeek = 0;
+					}else{
+						$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
+					}
 				}
 				if($keyActualM->status_activity == 'done'){
-					$progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+					// if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+
+					// }
+					// if($progressActualWeek > $keyActualM->bobot_planning){
+					// 	$progressActualWeek = $keyActualM->bobot_planning;
+					// }else if($keyActualM->qty_actual == 0){
+					// 	$progressActualWeek = $keyActualM->bobot_planning;
+					// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
+						$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
+					// }else {
+						// $progressActualWeek = $progressActualWeek;
+					// }
+					// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+					// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
+					// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
 				}
 				else{
 					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
@@ -1456,8 +1519,8 @@ class MasterFunctionsHelper
 			"proyek_name" => $dataProject->nama,
 			"data"	=> ["date" => $dateWeek, 
 						"percentagePlan" => $progressPlanKomulatifWeek,
-						"percentageReal" => $progressActualKomulatifWeek,
-						"data_details" => $dataActivityPlanDate
+						"percentageReal" => $progressActualKomulatifWeek
+						// "data_details" => $dataActivityPlanDate
 					]
 		);
 

From 16e73335bb60e60f0d5d5bf30868e77a0624ff16 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Mon, 4 Dec 2023 09:29:07 +0700
Subject: [PATCH 10/14] update for calculate progress

---
 .../Commands/CalculateProgressGantt.php       | 29 +++++++++
 app/Helpers/MasterFunctionsHelper.php         | 20 +-----
 app/Http/Controllers/ActivityController.php   |  5 ++
 .../Controllers/HierarchyFtthController.php   | 65 ++++++++++---------
 4 files changed, 72 insertions(+), 47 deletions(-)
 create mode 100644 app/Console/Commands/CalculateProgressGantt.php

diff --git a/app/Console/Commands/CalculateProgressGantt.php b/app/Console/Commands/CalculateProgressGantt.php
new file mode 100644
index 0000000..8e6796f
--- /dev/null
+++ b/app/Console/Commands/CalculateProgressGantt.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Helpers\MasterFunctionsHelper;
+use App\Models\Project;
+
+class CalculateProgressGantt extends Command
+{
+  protected $signature = 'calculate:progressgantt {project_id}';
+  
+  protected $description = 'Calculate Progress Gantt';
+  
+  public function handle()
+  {
+    $project_id = $this->argument('project_id');
+    $project = Project::find($project_id);
+
+    $project->calculation_status = true;
+    $project->save();
+
+    $data = MasterFunctionsHelper::CalculateSCurve($project_id);
+
+    $project->scurve = json_encode($data);
+    $project->calculation_status = true;
+    $project->save();
+  }
+}
diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index fec14b8..2f1770e 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -609,24 +609,8 @@ class MasterFunctionsHelper
 						$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
 					}
 				}
-				if($keyActualM->status_activity == 'done'){
-					// if($keyActualM->count_report > 1){
-					// 	$progressActualWeek = $keyActualM->bobot_planning/$keyActualM->count_report;
-					// }else{
-						$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
-					// }
-					// if($progressActualWeek > $keyActualM->bobot_planning){
-					// 	$progressActualWeek = $keyActualM->bobot_planning;
-					// }else if($keyActualM->qty_actual == 0){
-					// 	$progressActualWeek = $keyActualM->bobot_planning;
-					// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
-						// $progressActualWeek = $keyActualM->bobot_planning;
-					// }else {
-						// $progressActualWeek = $progressActualWeek;
-					// }
-					// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
-					// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
-					// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
+				if($keyActualM->status_activity == 'done'){ 
+						$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report; 
 				}
 				else{
 					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index c2a8223..610c5fc 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -1156,4 +1156,9 @@ class ActivityController extends Controller
 		}
 		return response()->json(['status' => 'success', 'data' => $request, 'message' => 'Update successful!', 'code' => 200], 200);
 	}
+
+	// public function recalculateProject($by, $id){
+	// 	// query get activity
+	// 	$cekActivity = 
+	// }
 }
diff --git a/app/Http/Controllers/HierarchyFtthController.php b/app/Http/Controllers/HierarchyFtthController.php
index 3b3f64f..a31c626 100644
--- a/app/Http/Controllers/HierarchyFtthController.php
+++ b/app/Http/Controllers/HierarchyFtthController.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use App\Models\HierarchyFtth;
 use App\Models\VersionGantt;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Artisan;
 
 class HierarchyFtthController extends Controller
 {
@@ -103,35 +104,40 @@ class HierarchyFtthController extends Controller
     }
 
     public function countProgress($project_id) {
-      $ftthIds = VersionGantt::select('hierarchy_ftth_id')
-        ->where('proyek_id', $project_id)
-        ->groupBy('hierarchy_ftth_id')
-        ->get();
-      if($ftthIds){
-        foreach ($ftthIds as $ftthId) {
-          $gantts = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->sum('progress');
-          $bobot_planning = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->sum('bobot');
-          $ganttCount = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->count();
-
-          $ftth = HierarchyFtth::find($ftthId->hierarchy_ftth_id);
-          if($ftth){
-            $round = $gantts/$ganttCount;
-            $round_bobot = $bobot_planning/$ganttCount;
-            $ftth->progress = round($round, 2);
-            $ftth->bobot_planning = round($round_bobot, 2);
-            try {
-                $ftth->save();
-            } catch (\Exception $e) {
-                // Log the error or handle it in some other way
-                Log::error($e->getMessage());
-            }
-
-            if($ftth->parent_id){
-              $this->countParent($ftth); 
-            }
-          }
-        }
-      }
+      // $ftthIds = VersionGantt::select('hierarchy_ftth_id')
+      //   ->where('proyek_id', $project_id)
+      //   ->groupBy('hierarchy_ftth_id')
+      //   ->get();
+      // if($ftthIds){
+      //   foreach ($ftthIds as $ftthId) {
+      //     $gantts = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->sum('progress');
+      //     $bobot_planning = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->sum('bobot');
+      //     $ganttCount = VersionGantt::where('hierarchy_ftth_id', $ftthId->hierarchy_ftth_id)->count();
+
+      //     $ftth = HierarchyFtth::find($ftthId->hierarchy_ftth_id);
+      //     if($ftth){
+      //       $round = $gantts/$ganttCount;
+      //       $round_bobot = $bobot_planning/$ganttCount;
+      //       $ftth->progress = round($round, 2);
+      //       $ftth->bobot_planning = round($round_bobot, 2);
+      //       try {
+      //           $ftth->save();
+      //       } catch (\Exception $e) {
+      //           // Log the error or handle it in some other way
+      //           Log::error($e->getMessage());
+      //       }
+
+      //       if($ftth->parent_id){
+      //         $this->countParent($ftth); 
+      //       }
+      //     }
+      //   }
+      // }
+
+      // calculate ke curva berdasarkan site
+        Artisan::call('calculate:progressgantt', [
+          'project_id' => $project_id
+        ]);
     }
 
     public function countParent($ftth){
@@ -180,6 +186,7 @@ class HierarchyFtthController extends Controller
     public function getTreeByProject($project_id)
     {
         $this->countProgress(intval($project_id));
+        
         $data = HierarchyFtth::where('project_id', $project_id)->whereNull('parent_id')->orderByRaw('id ASC')->get();
         $finalData = [];
         foreach($data as $objRow){

From 2703a32aeb60cfbf1e3bbdaf5906e141a9f53b30 Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Mon, 4 Dec 2023 11:50:23 +0700
Subject: [PATCH 11/14] calculate s curve by hierarchy id

---
 .../Commands/CalculateProgressGantt.php       | 10 ++-
 app/Console/Kernel.php                        |  3 +-
 app/Helpers/MasterFunctionsHelper.php         | 88 ++++++++++++++-----
 app/Http/Controllers/ActivityController.php   |  2 +-
 .../Controllers/HierarchyFtthController.php   |  7 +-
 5 files changed, 76 insertions(+), 34 deletions(-)

diff --git a/app/Console/Commands/CalculateProgressGantt.php b/app/Console/Commands/CalculateProgressGantt.php
index 8e6796f..6db1d41 100644
--- a/app/Console/Commands/CalculateProgressGantt.php
+++ b/app/Console/Commands/CalculateProgressGantt.php
@@ -2,25 +2,27 @@
 
 namespace App\Console\Commands;
 
+use App\Models\HierarchyFtth;
 use Illuminate\Console\Command;
 use App\Helpers\MasterFunctionsHelper;
 use App\Models\Project;
 
 class CalculateProgressGantt extends Command
 {
-  protected $signature = 'calculate:progressgantt {project_id}';
+  protected $signature = 'calculate:progressgantt {hierarchy_id}';
   
   protected $description = 'Calculate Progress Gantt';
   
   public function handle()
   {
-    $project_id = $this->argument('project_id');
-    $project = Project::find($project_id);
+    $hierarchy_id = $this->argument('hierarchy_id');
+    $hierarchy = HierarchyFtth::findOrFail($hierarchy_id);
+    $project = Project::find($hierarchy->project_id);
 
     $project->calculation_status = true;
     $project->save();
 
-    $data = MasterFunctionsHelper::CalculateSCurve($project_id);
+    $data = MasterFunctionsHelper::CalculateSCurve(null, $hierarchy_id);
 
     $project->scurve = json_encode($data);
     $project->calculation_status = true;
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index a7fceee..726d069 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -14,7 +14,8 @@ class Kernel extends ConsoleKernel
      */
     protected $commands = [
 		Commands\syncHumanResourceIntegration::class,
-		Commands\CalculateSCurve::class
+		Commands\CalculateSCurve::class,
+		Commands\CalculateProgressGantt::class
     ];
 
     /**
diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index 2f1770e..dfc4d89 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -1306,10 +1306,19 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
-	public function calculateSCurve($projectId)
+	public function calculateSCurve($projectId, $hierarchyId = null)
 	{
 		DB::enableQueryLog();
 
+		$hierarchyGantts = [];
+		if (isset($hierarchyId)) {
+			$hierarchy = HierarchyFtth::findOrFail($hierarchyId);
+			$projectId = $hierarchy->project_id;
+			if (isset($hierarchy)) {
+				$hierarchyGantts = VersionGantt::where('hierarchy_ftth_id', $hierarchyId)->get()->toArray();
+			}
+		}
+
 		$dataFinal = [];
 		$dataPayload = [];
 		$dataPayload['period'] = 'week';
@@ -1371,17 +1380,43 @@ class MasterFunctionsHelper
 			//new \Datetime($dt->format("Y-m-d"));
 			// $minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
 			$tempDate[] = array($dt->format("Y-m-d"));
+			$dataPlanM = [];
+			$dataActualM = [];
+			if (count($hierarchyGantts) > 0) {
+				foreach ($hierarchyGantts as $key => $gantt) {
+				$dataPlanM[] = DB::table('m_activity') 
+					->where('type_activity', 'task')
+					->where('bobot_planning', '>', 0)
+					->where('version_gantt_id', $gantt['id'])
+					->whereDate('planned_start', '<=', $loopDay)
+					->whereDate('planned_end', '>=', $loopDay)
+					->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
+					->get()->toArray(); 
+
+				$dataActualM[] = DB::table('report_activity_material as ram')
+					->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
+					->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+							DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+							DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+							DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+							DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
+						)
+					->where('ram.report_date', $loopDay)
+					->where('ma.version_gantt_id', $gantt['id'])
+					->get()->toArray();
+				}
+			} else {
 
-			$dataPlanM = DB::table('m_activity') 
+			$dataPlanM[] = DB::table('m_activity') 
 				->where('type_activity', 'task')
 				->where('bobot_planning', '>', 0)
 				->where('proyek_id', $projectId)
 				->whereDate('planned_start', '<=', $loopDay)
 				->whereDate('planned_end', '>=', $loopDay)
 				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
-				->get(); 
+				->get()->toArray(); 
 
-			$dataActualM = DB::table('report_activity_material as ram')
+			$dataActualM[] = DB::table('report_activity_material as ram')
 				->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
 				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
 						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
@@ -1391,7 +1426,8 @@ class MasterFunctionsHelper
 					)
 				->where('ram.report_date', $loopDay)
 				->where('ma.proyek_id', $projectId)
-				->get();
+				->get()->toArray();
+			}
 		
 			$dataActivityPlan = []; 
 			$dataActivityActual = [];
@@ -1406,14 +1442,15 @@ class MasterFunctionsHelper
 				$dateWeek[] = [$loopDay]; 
 			}
 			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
+			if (count($dataPlanM) > 0 && count($dataPlanM[0]) > 0) {
 			foreach ($dataPlanM as $keyPlanM) {
 				# hitung untuk persentase progress planning
 				// if($keyPlanM->duration == 0){
 					// $duration = 2;
 					// Tanggal awal
-					$startDate = new DateTime($keyPlanM->planned_start);
+					$startDate = new DateTime($keyPlanM[0]->planned_start);
 					// Tanggal akhir
-					$endDate = new DateTime($keyPlanM->planned_end);
+					$endDate = new DateTime($keyPlanM[0]->planned_end);
 					// Menghitung selisih hari
 					$interval = $startDate->diff($endDate);
 					// Mengambil hasil selisih hari
@@ -1428,33 +1465,35 @@ class MasterFunctionsHelper
 				// // Mengambil hasil selisih hari
 				// $duration = $interval->days;
 				// 2023-07-26
-				$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
+				$progressPlanWeek = $keyPlanM[0]->bobot_planning / $duration;
 				$dataActivityPlan[] = array(
 					'progressPlanDay' 	=> $progressPlanWeek,
-					'name'				=> $keyPlanM->name,
-					'bobot_p'			=> $keyPlanM->bobot_planning,
-					'duration'			=> $keyPlanM->duration
+					'name'				=> $keyPlanM[0]->name,
+					'bobot_p'			=> $keyPlanM[0]->bobot_planning,
+					'duration'			=> $keyPlanM[0]->duration
 				);
 				$tmpProgressPlanWeek += $progressPlanWeek;
 			}
+			}
 
 			// hitung progress actual
+			if (count($dataActualM) > 0 && count($dataActualM[0]) > 0) {
 			foreach ($dataActualM as $keyActualM) {
 				# hitung untuk persentase progress actual
 				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
 				// jika total report > dari planning
-				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
-					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
+				if($keyActualM[0]->sum_qty_actual > $keyActualM[0]->qty_plan){
+					$progressActualWeek = (($keyActualM[0]->qty_actual / $keyActualM[0]->sum_qty_actual) * 100) *$keyActualM[0]->bobot_planning/100;
 				}else{
 					// jika total report < dari planning
 					// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
-					if($keyActualM->qty_actual == 0){
+					if($keyActualM[0]->qty_actual == 0){
 						$progressActualWeek = 0;
 					}else{
-						$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
+						$progressActualWeek = ($keyActualM[0]->qty_actual / $keyActualM[0]->qty_plan) * $keyActualM[0]->bobot_planning;
 					}
 				}
-				if($keyActualM->status_activity == 'done'){
+				if($keyActualM[0]->status_activity == 'done'){
 					// if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
 
 					// }
@@ -1463,7 +1502,7 @@ class MasterFunctionsHelper
 					// }else if($keyActualM->qty_actual == 0){
 					// 	$progressActualWeek = $keyActualM->bobot_planning;
 					// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
-						$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
+						$progressActualWeek = $keyActualM[0]->bobot_planning / $keyActualM[0]->count_report;
 					// }else {
 						// $progressActualWeek = $progressActualWeek;
 					// }
@@ -1472,20 +1511,21 @@ class MasterFunctionsHelper
 					// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
 				}
 				else{
-					$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
+					$progressActualWeek = $progressActualWeek > ($keyActualM[0]->bobot_planning*95)/100 ? ($keyActualM[0]->bobot_planning*95)/100 : $progressActualWeek;
 				}
 				$dataActivityActual[] = array(
 					'progressActualDay' 	=> $progressActualWeek,
-					'qty_act'				=> $keyActualM->qty_actual,
-					'bobot_p'				=> $keyActualM->bobot_planning,
-					'qty_plan'				=> $keyActualM->qty_plan,
-					'status_activity'		=> $keyActualM->status_activity,
-					'sum_qty_actual'		=> $keyActualM->sum_qty_actual,
-					'name'					=> $keyActualM->name
+					'qty_act'				=> $keyActualM[0]->qty_actual,
+					'bobot_p'				=> $keyActualM[0]->bobot_planning,
+					'qty_plan'				=> $keyActualM[0]->qty_plan,
+					'status_activity'		=> $keyActualM[0]->status_activity,
+					'sum_qty_actual'		=> $keyActualM[0]->sum_qty_actual,
+					'name'					=> $keyActualM[0]->name
 				);
 				
 				$tmpProgressActualWeek += $progressActualWeek;
 			}
+			}
 
 			$dataActivityPlanDate[] = array(
 				"date" => $loopDay,
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 610c5fc..cbb425e 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -322,7 +322,7 @@ class ActivityController extends Controller
 			$actualEndValues = array_column(array_filter($dataFinal, function($item) {
 				return isset($item['actual_end']);
 			}), 'actual_end');
-			$returnActualStartOrEnd = count($actualEndValues) == count($dataFinal) ? max($actualEndValues) : null;
+			$returnActualStartOrEnd = count($actualEndValues) == count($dataFinal) && count($actualEndValues) > 0 ? max($actualEndValues) : null;
             if (isset($parent)) {
                 $parent->actual_end = $returnActualStartOrEnd;
                 $parent->save();
diff --git a/app/Http/Controllers/HierarchyFtthController.php b/app/Http/Controllers/HierarchyFtthController.php
index a31c626..c880d6e 100644
--- a/app/Http/Controllers/HierarchyFtthController.php
+++ b/app/Http/Controllers/HierarchyFtthController.php
@@ -103,7 +103,7 @@ class HierarchyFtthController extends Controller
         }
     }
 
-    public function countProgress($project_id) {
+    public function countProgress($hierarchy_id) {
       // $ftthIds = VersionGantt::select('hierarchy_ftth_id')
       //   ->where('proyek_id', $project_id)
       //   ->groupBy('hierarchy_ftth_id')
@@ -136,7 +136,7 @@ class HierarchyFtthController extends Controller
 
       // calculate ke curva berdasarkan site
         Artisan::call('calculate:progressgantt', [
-          'project_id' => $project_id
+          'hierarchy_id' => $hierarchy_id
         ]);
     }
 
@@ -185,12 +185,11 @@ class HierarchyFtthController extends Controller
     
     public function getTreeByProject($project_id)
     {
-        $this->countProgress(intval($project_id));
-        
         $data = HierarchyFtth::where('project_id', $project_id)->whereNull('parent_id')->orderByRaw('id ASC')->get();
         $finalData = [];
         foreach($data as $objRow){
             $objRow->key = rand(1, 1000);
+            $this->countProgress(intval($objRow->id));
             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);

From acb7a56a3cfba80e488b4ec5437e585d739a44c8 Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Mon, 4 Dec 2023 14:22:15 +0700
Subject: [PATCH 12/14] update count hierarchy

---
 app/Console/Commands/CalculateProgressGantt.php  | 9 +++------
 app/Http/Controllers/HierarchyFtthController.php | 9 +++++++--
 routes/web.php                                   | 1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Console/Commands/CalculateProgressGantt.php b/app/Console/Commands/CalculateProgressGantt.php
index 6db1d41..3e9f81c 100644
--- a/app/Console/Commands/CalculateProgressGantt.php
+++ b/app/Console/Commands/CalculateProgressGantt.php
@@ -19,13 +19,10 @@ class CalculateProgressGantt extends Command
     $hierarchy = HierarchyFtth::findOrFail($hierarchy_id);
     $project = Project::find($hierarchy->project_id);
 
-    $project->calculation_status = true;
-    $project->save();
-
     $data = MasterFunctionsHelper::CalculateSCurve(null, $hierarchy_id);
 
-    $project->scurve = json_encode($data);
-    $project->calculation_status = true;
-    $project->save();
+    $hierarchy->bobot_planning = end($data[0]['data']['percentagePlan']);
+    $hierarchy->progress = end($data[0]['data']['percentageReal']);
+    $hierarchy->save();
   }
 }
diff --git a/app/Http/Controllers/HierarchyFtthController.php b/app/Http/Controllers/HierarchyFtthController.php
index c880d6e..bcf27ad 100644
--- a/app/Http/Controllers/HierarchyFtthController.php
+++ b/app/Http/Controllers/HierarchyFtthController.php
@@ -189,7 +189,6 @@ class HierarchyFtthController extends Controller
         $finalData = [];
         foreach($data as $objRow){
             $objRow->key = rand(1, 1000);
-            $this->countProgress(intval($objRow->id));
             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);
@@ -210,7 +209,13 @@ class HierarchyFtthController extends Controller
 
         return response()->json(['status'=>'success','data'=>$finalData,'code'=>200], 200);
     }
-
+    public function countProgressTree($hierarchy_id)
+    {
+        Artisan::call('calculate:progressgantt', [
+          'hierarchy_id' => $hierarchy_id
+        ]);
+        return response()->json(['status'=>'success','code'=>200], 200);
+    }
     private function getChildren($project_id, $parent_id)
     {
         $finalData = [];
diff --git a/routes/web.php b/routes/web.php
index 14e1d08..f82f295 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -491,6 +491,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->put('/hierarchy-ftths/{id}', 'HierarchyFtthController@update');
 		$router->delete('/hierarchy-ftths/{id}', 'HierarchyFtthController@destroy');
 		$router->get('/hierarchy-ftths/tree/{project_id}', 'HierarchyFtthController@getTreeByProject');
+		$router->get('/hierarchy-ftths/count-tree/{hierarchy_id}', 'HierarchyFtthController@countProgressTree');
 		$router->get('/hierarchy-ftths/tree-gantt/{gantt_id}', 'HierarchyFtthController@getTreeByGantt');
 
 		$router->post('/map-monitoring/search', 'MapMonitoringController@search');

From fb308af91bb7ec19652c97665ec2b8554df06b76 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Mon, 4 Dec 2023 15:57:52 +0700
Subject: [PATCH 13/14] update calculate progress hierarchy

---
 .../Commands/CalculateProgressGantt.php       |   6 +-
 app/Helpers/MasterFunctionsHelper.php         | 480 +++++++++++++-----
 2 files changed, 368 insertions(+), 118 deletions(-)

diff --git a/app/Console/Commands/CalculateProgressGantt.php b/app/Console/Commands/CalculateProgressGantt.php
index 3e9f81c..5ac1e5f 100644
--- a/app/Console/Commands/CalculateProgressGantt.php
+++ b/app/Console/Commands/CalculateProgressGantt.php
@@ -19,10 +19,10 @@ class CalculateProgressGantt extends Command
     $hierarchy = HierarchyFtth::findOrFail($hierarchy_id);
     $project = Project::find($hierarchy->project_id);
 
-    $data = MasterFunctionsHelper::CalculateSCurve(null, $hierarchy_id);
+    $data = MasterFunctionsHelper::calculateSCurveForProgressTree($hierarchy_id);
 
-    $hierarchy->bobot_planning = end($data[0]['data']['percentagePlan']);
-    $hierarchy->progress = end($data[0]['data']['percentageReal']);
+    $hierarchy->bobot_planning = 100;
+    $hierarchy->progress =((int) end($data[0]['data']['percentageReal']) / (int) end($data[0]['data']['percentagePlan'])) * 100;
     $hierarchy->save();
   }
 }
diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index dfc4d89..acf3f69 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -1306,18 +1306,18 @@ class MasterFunctionsHelper
 		return $dataFinal;
 	}
 
-	public function calculateSCurve($projectId, $hierarchyId = null)
+	public function calculateSCurve($projectId)
 	{
 		DB::enableQueryLog();
 
-		$hierarchyGantts = [];
-		if (isset($hierarchyId)) {
-			$hierarchy = HierarchyFtth::findOrFail($hierarchyId);
-			$projectId = $hierarchy->project_id;
-			if (isset($hierarchy)) {
-				$hierarchyGantts = VersionGantt::where('hierarchy_ftth_id', $hierarchyId)->get()->toArray();
-			}
-		}
+		// $hierarchyGantts = [];
+		// if (isset($hierarchyId)) {
+		// 	$hierarchy = HierarchyFtth::findOrFail($hierarchyId);
+		// 	$projectId = $hierarchy->project_id;
+		// 	// if (isset($hierarchy)) {
+		// 	// 	$hierarchyGantts = VersionGantt::where('hierarchy_ftth_id', $hierarchyId)->get()->toArray();
+		// 	// }
+		// }
 
 		$dataFinal = [];
 		$dataPayload = [];
@@ -1333,9 +1333,9 @@ class MasterFunctionsHelper
 		}
 
 		if ($dataHeader) {
-			$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $projectId)->sum("rencana_biaya");
+			// $totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $projectId)->sum("rencana_biaya");
 		} else {
-			$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $projectId)->sum("rencana_biaya");
+			// $totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $projectId)->sum("rencana_biaya");
 		}
 
 		$minDate = $dataProject->mulai_proyek;
@@ -1382,41 +1382,41 @@ class MasterFunctionsHelper
 			$tempDate[] = array($dt->format("Y-m-d"));
 			$dataPlanM = [];
 			$dataActualM = [];
-			if (count($hierarchyGantts) > 0) {
-				foreach ($hierarchyGantts as $key => $gantt) {
-				$dataPlanM[] = DB::table('m_activity') 
-					->where('type_activity', 'task')
-					->where('bobot_planning', '>', 0)
-					->where('version_gantt_id', $gantt['id'])
-					->whereDate('planned_start', '<=', $loopDay)
-					->whereDate('planned_end', '>=', $loopDay)
-					->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
-					->get()->toArray(); 
-
-				$dataActualM[] = DB::table('report_activity_material as ram')
-					->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
-					->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
-							DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
-							DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
-							DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
-							DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
-						)
-					->where('ram.report_date', $loopDay)
-					->where('ma.version_gantt_id', $gantt['id'])
-					->get()->toArray();
-				}
-			} else {
+			// if (count($hierarchyGantts) > 0) {
+			// 	foreach ($hierarchyGantts as $key => $gantt) {
+			// 	$dataPlanM[] = DB::table('m_activity') 
+			// 		->where('type_activity', 'task')
+			// 		->where('bobot_planning', '>', 0)
+			// 		->where('version_gantt_id', $gantt['id'])
+			// 		->whereDate('planned_start', '<=', $loopDay)
+			// 		->whereDate('planned_end', '>=', $loopDay)
+			// 		->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
+			// 		->get()->toArray(); 
+
+			// 	$dataActualM[] = DB::table('report_activity_material as ram')
+			// 		->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
+			// 		->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+			// 				DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+			// 				DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+			// 				DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+			// 				DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
+			// 			)
+			// 		->where('ram.report_date', $loopDay)
+			// 		->where('ma.version_gantt_id', $gantt['id'])
+			// 		->get()->toArray();
+			// 	}
+			// } else {
 
-			$dataPlanM[] = DB::table('m_activity') 
+			$dataPlanM = DB::table('m_activity') 
 				->where('type_activity', 'task')
 				->where('bobot_planning', '>', 0)
 				->where('proyek_id', $projectId)
 				->whereDate('planned_start', '<=', $loopDay)
 				->whereDate('planned_end', '>=', $loopDay)
 				->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
-				->get()->toArray(); 
+				->get(); 
 
-			$dataActualM[] = DB::table('report_activity_material as ram')
+			$dataActualM = DB::table('report_activity_material as ram')
 				->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
 				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
 						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
@@ -1426,8 +1426,8 @@ class MasterFunctionsHelper
 					)
 				->where('ram.report_date', $loopDay)
 				->where('ma.proyek_id', $projectId)
-				->get()->toArray();
-			}
+				->get();
+			// }
 		
 			$dataActivityPlan = []; 
 			$dataActivityActual = [];
@@ -1442,90 +1442,340 @@ class MasterFunctionsHelper
 				$dateWeek[] = [$loopDay]; 
 			}
 			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
-			if (count($dataPlanM) > 0 && count($dataPlanM[0]) > 0) {
-			foreach ($dataPlanM as $keyPlanM) {
-				# hitung untuk persentase progress planning
-				// if($keyPlanM->duration == 0){
-					// $duration = 2;
-					// Tanggal awal
-					$startDate = new DateTime($keyPlanM[0]->planned_start);
-					// Tanggal akhir
-					$endDate = new DateTime($keyPlanM[0]->planned_end);
-					// Menghitung selisih hari
-					$interval = $startDate->diff($endDate);
-					// Mengambil hasil selisih hari
-					$duration = (int) $interval->days+1;
-				// }else{
-				// 	$duration = $keyPlanM->duration + 2;
-				// }
-				// $startPlan = new DateTime($keyPlanM->planned_start);
-				// $endPlan = new DateTime($keyPlanM->planned_end);
-				// $interval = $startPlan->diff($endPlan);
-
-				// // Mengambil hasil selisih hari
-				// $duration = $interval->days;
-				// 2023-07-26
-				$progressPlanWeek = $keyPlanM[0]->bobot_planning / $duration;
-				$dataActivityPlan[] = array(
-					'progressPlanDay' 	=> $progressPlanWeek,
-					'name'				=> $keyPlanM[0]->name,
-					'bobot_p'			=> $keyPlanM[0]->bobot_planning,
-					'duration'			=> $keyPlanM[0]->duration
-				);
-				$tmpProgressPlanWeek += $progressPlanWeek;
-			}
-			}
+			// if (count($dataPlanM) > 0 && count($dataPlanM[0]) > 0) {
+				foreach ($dataPlanM as $keyPlanM) {
+					# hitung untuk persentase progress planning
+					// if($keyPlanM->duration == 0){
+						// $duration = 2;
+						// Tanggal awal
+						$startDate = new DateTime($keyPlanM->planned_start);
+						// Tanggal akhir
+						$endDate = new DateTime($keyPlanM->planned_end);
+						// Menghitung selisih hari
+						$interval = $startDate->diff($endDate);
+						// Mengambil hasil selisih hari
+						$duration = (int) $interval->days+1;
+					// }else{
+					// 	$duration = $keyPlanM->duration + 2;
+					// }
+					// $startPlan = new DateTime($keyPlanM->planned_start);
+					// $endPlan = new DateTime($keyPlanM->planned_end);
+					// $interval = $startPlan->diff($endPlan);
+
+					// // Mengambil hasil selisih hari
+					// $duration = $interval->days;
+					// 2023-07-26
+					$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
+					$dataActivityPlan[] = array(
+						'progressPlanDay' 	=> $progressPlanWeek,
+						'name'				=> $keyPlanM->name,
+						'bobot_p'			=> $keyPlanM->bobot_planning,
+						'duration'			=> $keyPlanM->duration
+					);
+					$tmpProgressPlanWeek += $progressPlanWeek;
+				}
+			// }
 
 			// hitung progress actual
-			if (count($dataActualM) > 0 && count($dataActualM[0]) > 0) {
-			foreach ($dataActualM as $keyActualM) {
-				# hitung untuk persentase progress actual
-				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
-				// jika total report > dari planning
-				if($keyActualM[0]->sum_qty_actual > $keyActualM[0]->qty_plan){
-					$progressActualWeek = (($keyActualM[0]->qty_actual / $keyActualM[0]->sum_qty_actual) * 100) *$keyActualM[0]->bobot_planning/100;
-				}else{
-					// jika total report < dari planning
-					// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
-					if($keyActualM[0]->qty_actual == 0){
-						$progressActualWeek = 0;
+			// if (count($dataActualM) > 0 && count($dataActualM[0]) > 0) {
+				foreach ($dataActualM as $keyActualM) {
+					# hitung untuk persentase progress actual
+					// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+					// jika total report > dari planning
+					if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+						$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
 					}else{
-						$progressActualWeek = ($keyActualM[0]->qty_actual / $keyActualM[0]->qty_plan) * $keyActualM[0]->bobot_planning;
+						// jika total report < dari planning
+						// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+						if($keyActualM->qty_actual == 0){
+							$progressActualWeek = 0;
+						}else{
+							$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
+						}
+					}
+					if($keyActualM->status_activity == 'done'){
+						// if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+
+						// }
+						// if($progressActualWeek > $keyActualM->bobot_planning){
+						// 	$progressActualWeek = $keyActualM->bobot_planning;
+						// }else if($keyActualM->qty_actual == 0){
+						// 	$progressActualWeek = $keyActualM->bobot_planning;
+						// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
+							$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
+						// }else {
+							// $progressActualWeek = $progressActualWeek;
+						// }
+						// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+						// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
+						// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
 					}
+					else{
+						$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
+					}
+					$dataActivityActual[] = array(
+						'progressActualDay' 	=> $progressActualWeek,
+						'qty_act'				=> $keyActualM->qty_actual,
+						'bobot_p'				=> $keyActualM->bobot_planning,
+						'qty_plan'				=> $keyActualM->qty_plan,
+						'status_activity'		=> $keyActualM->status_activity,
+						'sum_qty_actual'		=> $keyActualM->sum_qty_actual,
+						'name'					=> $keyActualM->name
+					);
+					
+					$tmpProgressActualWeek += $progressActualWeek;
 				}
-				if($keyActualM[0]->status_activity == 'done'){
-					// if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+			// }
 
+			$dataActivityPlanDate[] = array(
+				"date" => $loopDay,
+				"statusWeek" => new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday') ? true : false,
+				"activity-plan" => $dataActivityPlan,
+				"activity-actual" => $dataActivityActual,
+				"tmpProgressActualWeek"	=> $tmpProgressActualWeek,
+				"progressPlanWeek" => $tmpProgressPlanWeek
+			); 
+			
+		}
+
+		$dataFinal[] = array(
+			// "date" => $dateWeek,
+			"proyek_name" => $dataProject->nama,
+			"data"	=> ["date" => $dateWeek, 
+						"percentagePlan" => $progressPlanKomulatifWeek,
+						"percentageReal" => $progressActualKomulatifWeek
+						// "data_details" => $dataActivityPlanDate
+					]
+		);
+
+		return $dataFinal;
+	}
+
+	public function calculateSCurveForProgressTree($hierarchyId)
+	{
+		DB::enableQueryLog();
+
+		// $hierarchyGantts = [];
+		if (isset($hierarchyId)) {
+			$hierarchy = HierarchyFtth::findOrFail($hierarchyId);
+			$projectId = $hierarchy->project_id;
+			// if (isset($hierarchy)) {
+			// 	$hierarchyGantts = VersionGantt::where('hierarchy_ftth_id', $hierarchyId)->get()->toArray();
+			// }
+		}
+
+		$dataFinal = [];
+		$dataPayload = [];
+		$dataPayload['period'] = 'week';
+		$totalACWP = 0;
+		$totalBCWP = 0;
+		$tempPercentage = [];
+
+		$dataProject = Project::find($projectId);
+		$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $projectId)->first();
+		if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) {
+			$dataPayload['end_date'] = $dataProject->akhir_proyek;
+		}
+
+		if ($dataHeader) {
+			// $totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $projectId)->sum("rencana_biaya");
+		} else {
+			// $totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $projectId)->sum("rencana_biaya");
+		}
+
+		$minDate = $dataProject->mulai_proyek;
+
+		$begin = new \DateTime($minDate);
+		$begin = $begin->modify('-1 day');
+		if (isset($dataPayload['end_date'])) {
+			$maxDate = $dataPayload['end_date'];
+			$end = new \DateTime($maxDate . ' Friday');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
+			/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged
+			$interval = new \DateInterval('P1D');
+		} else {
+			$maxDate = $dataProject->akhir_proyek; 
+			$end = new \DateTime($maxDate);
+			$end = new \DateTime($end->format('Y-m-d') . ' Friday');
+			// $end->modify('next Friday');
+			// $end->modify('next Friday');
+			$interval = new \DateInterval('P1D');
+		}
+		$period = new \DatePeriod($begin, $interval, $end);
+
+		// $arr_ActualM = [];
+		$tempDate = [];
+		// $tempPercentagePlan = [];
+		// $tempPercentagePlanWhr = [];
+		// $tempPercentageReal = [];
+		// $tempTtlPercentPlan = 0;
+		// $tempTtlPercentActual = 0;
+
+		// $currentACWP = 0;
+		// $currentBCWP = 0;
+		$dataActivityPlanDate = [];
+		$progressPlanKomulatifWeek = [];
+		$progressActualKomulatifWeek = [];
+		$dateWeek = [];
+		$tmpProgressPlanWeek = 0;
+		$tmpProgressActualWeek = 0;
+		foreach ($period as $dt) {
+			$loopDay = $dt->format("Y-m-d");
+			//new \Datetime($dt->format("Y-m-d"));
+			// $minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d");
+			$tempDate[] = array($dt->format("Y-m-d"));
+			$dataPlanM = [];
+			$dataActualM = [];
+			// if (count($hierarchyGantts) > 0) {
+			// 	foreach ($hierarchyGantts as $key => $gantt) {
+			// 	$dataPlanM[] = DB::table('m_activity') 
+			// 		->where('type_activity', 'task')
+			// 		->where('bobot_planning', '>', 0)
+			// 		->where('version_gantt_id', $gantt['id'])
+			// 		->whereDate('planned_start', '<=', $loopDay)
+			// 		->whereDate('planned_end', '>=', $loopDay)
+			// 		->select('name', 'bobot_planning', 'biaya_actual', 'duration', 'persentase_progress', 'id', 'planned_start', 'planned_end')
+			// 		->get()->toArray(); 
+
+			// 	$dataActualM[] = DB::table('report_activity_material as ram')
+			// 		->join('m_activity as ma', 'ma.id', '=', 'ram.activity_id')
+			// 		->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+			// 				DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+			// 				DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+			// 				DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+			// 				DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
+			// 			)
+			// 		->where('ram.report_date', $loopDay)
+			// 		->where('ma.version_gantt_id', $gantt['id'])
+			// 		->get()->toArray();
+			// 	}
+			// } else {
+
+			$dataPlanM = DB::table('m_hierarchy_ftth as mhf')
+				->join('m_version_gantt as mvg', 'mvg.hierarchy_ftth_id', '=', 'mhf.id')
+				->join('m_activity as ma', 'ma.version_gantt_id', '=', 'mvg.id')
+				->where('ma.type_activity', 'task')
+				->where('ma.bobot_planning', '>', 0)
+				->where('mhf.project_id', $projectId)
+				->whereDate('planned_start', '<=', $loopDay)
+				->whereDate('planned_end', '>=', $loopDay)
+				->select('ma.name', 'ma.bobot_planning', 'ma.biaya_actual', 'ma.duration', 'ma.persentase_progress', 'ma.id', 'ma.planned_start', 'ma.planned_end')
+				->get(); 
+
+			$dataActualM = DB::table('m_hierarchy_ftth as mhf')
+				->join('m_version_gantt as mvg', 'mvg.hierarchy_ftth_id', '=', 'mhf.id')
+				->join('m_activity as ma', 'ma.version_gantt_id', '=', 'mvg.id')
+				->join('report_activity_material as ram', 'ram.activity_id', '=', 'ma.id')
+				->select('ram.activity_id', 'ram.qty as qty_actual', 'ma.bobot_planning', 'ma.name',
+						DB::raw('(SELECT SUM(amta.qty_planning) FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS qty_plan'),
+						DB::raw('(SELECT SUM(ram.qty) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS sum_qty_actual'),
+						DB::raw('(SELECT DISTINCT status_activity FROM assign_material_to_activity amta WHERE amta.activity_id = ram.activity_id) AS status_activity'),
+						DB::raw('(SELECT COUNT(id) FROM report_activity_material ram WHERE ram.activity_id = ma.id) AS count_report')
+					)
+				->where('ram.report_date', $loopDay)
+				// ->where('ma.proyek_id', $projectId)
+				->where('mhf.project_id', $projectId)
+				->get();
+			// }
+		
+			$dataActivityPlan = []; 
+			$dataActivityActual = [];
+			$today = new DateTime();
+			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
+				
+				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
+				if (new \DateTime($loopDay) < $today) {
+					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
+					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
+				}
+				$dateWeek[] = [$loopDay]; 
+			}
+			// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek;
+			// if (count($dataPlanM) > 0 && count($dataPlanM[0]) > 0) {
+				foreach ($dataPlanM as $keyPlanM) {
+					# hitung untuk persentase progress planning
+					// if($keyPlanM->duration == 0){
+						// $duration = 2;
+						// Tanggal awal
+						$startDate = new DateTime($keyPlanM->planned_start);
+						// Tanggal akhir
+						$endDate = new DateTime($keyPlanM->planned_end);
+						// Menghitung selisih hari
+						$interval = $startDate->diff($endDate);
+						// Mengambil hasil selisih hari
+						$duration = (int) $interval->days+1;
+					// }else{
+					// 	$duration = $keyPlanM->duration + 2;
 					// }
-					// if($progressActualWeek > $keyActualM->bobot_planning){
-					// 	$progressActualWeek = $keyActualM->bobot_planning;
-					// }else if($keyActualM->qty_actual == 0){
-					// 	$progressActualWeek = $keyActualM->bobot_planning;
-					// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
-						$progressActualWeek = $keyActualM[0]->bobot_planning / $keyActualM[0]->count_report;
-					// }else {
-						// $progressActualWeek = $progressActualWeek;
-					// }
-					// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
-					// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
-					// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
+					// $startPlan = new DateTime($keyPlanM->planned_start);
+					// $endPlan = new DateTime($keyPlanM->planned_end);
+					// $interval = $startPlan->diff($endPlan);
+
+					// // Mengambil hasil selisih hari
+					// $duration = $interval->days;
+					// 2023-07-26
+					$progressPlanWeek = $keyPlanM->bobot_planning / $duration;
+					$dataActivityPlan[] = array(
+						'progressPlanDay' 	=> $progressPlanWeek,
+						'name'				=> $keyPlanM->name,
+						'bobot_p'			=> $keyPlanM->bobot_planning,
+						'duration'			=> $keyPlanM->duration
+					);
+					$tmpProgressPlanWeek += $progressPlanWeek;
 				}
-				else{
-					$progressActualWeek = $progressActualWeek > ($keyActualM[0]->bobot_planning*95)/100 ? ($keyActualM[0]->bobot_planning*95)/100 : $progressActualWeek;
+			// }
+
+			// hitung progress actual
+			// if (count($dataActualM) > 0 && count($dataActualM[0]) > 0) {
+				foreach ($dataActualM as $keyActualM) {
+					# hitung untuk persentase progress actual
+					// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
+					// jika total report > dari planning
+					if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+						$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
+					}else{
+						// jika total report < dari planning
+						// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
+						if($keyActualM->qty_actual == 0){
+							$progressActualWeek = 0;
+						}else{
+							$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->qty_plan) * $keyActualM->bobot_planning;
+						}
+					}
+					if($keyActualM->status_activity == 'done'){
+						// if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
+
+						// }
+						// if($progressActualWeek > $keyActualM->bobot_planning){
+						// 	$progressActualWeek = $keyActualM->bobot_planning;
+						// }else if($keyActualM->qty_actual == 0){
+						// 	$progressActualWeek = $keyActualM->bobot_planning;
+						// }else if($keyActualM->qty_plan == $keyActualM->sum_qty_actual){
+							$progressActualWeek = $keyActualM->bobot_planning / $keyActualM->count_report;
+						// }else {
+							// $progressActualWeek = $progressActualWeek;
+						// }
+						// $progressActualWeek = $progressActualWeek > $keyActualM->bobot_planning ? $keyActualM->bobot_planning : $progressActualWeek;
+						// jika report lebih dari 1 x, maka harusnya di bagi sabanyak jumlah report,
+						// contoh ada 3 report, report ke 1 adalah 5 maka 100/3 dan di looping
+					}
+					else{
+						$progressActualWeek = $progressActualWeek > ($keyActualM->bobot_planning*95)/100 ? ($keyActualM->bobot_planning*95)/100 : $progressActualWeek;
+					}
+					$dataActivityActual[] = array(
+						'progressActualDay' 	=> $progressActualWeek,
+						'qty_act'				=> $keyActualM->qty_actual,
+						'bobot_p'				=> $keyActualM->bobot_planning,
+						'qty_plan'				=> $keyActualM->qty_plan,
+						'status_activity'		=> $keyActualM->status_activity,
+						'sum_qty_actual'		=> $keyActualM->sum_qty_actual,
+						'name'					=> $keyActualM->name
+					);
+					
+					$tmpProgressActualWeek += $progressActualWeek;
 				}
-				$dataActivityActual[] = array(
-					'progressActualDay' 	=> $progressActualWeek,
-					'qty_act'				=> $keyActualM[0]->qty_actual,
-					'bobot_p'				=> $keyActualM[0]->bobot_planning,
-					'qty_plan'				=> $keyActualM[0]->qty_plan,
-					'status_activity'		=> $keyActualM[0]->status_activity,
-					'sum_qty_actual'		=> $keyActualM[0]->sum_qty_actual,
-					'name'					=> $keyActualM[0]->name
-				);
-				
-				$tmpProgressActualWeek += $progressActualWeek;
-			}
-			}
+			// }
 
 			$dataActivityPlanDate[] = array(
 				"date" => $loopDay,

From e7dd76c5a5d7c4185088729b1c60057164d32eb0 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Tue, 5 Dec 2023 11:22:44 +0700
Subject: [PATCH 14/14] update fix diff today, and fix round progress hirarchy,
 and fix estimated finish

---
 .../Commands/CalculateProgressGantt.php       |  2 +-
 app/Helpers/MasterFunctionsHelper.php         | 40 ++++++++++---------
 app/Http/Controllers/ProjectController.php    | 32 ++++++++++-----
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/app/Console/Commands/CalculateProgressGantt.php b/app/Console/Commands/CalculateProgressGantt.php
index 5ac1e5f..f3b40c9 100644
--- a/app/Console/Commands/CalculateProgressGantt.php
+++ b/app/Console/Commands/CalculateProgressGantt.php
@@ -22,7 +22,7 @@ class CalculateProgressGantt extends Command
     $data = MasterFunctionsHelper::calculateSCurveForProgressTree($hierarchy_id);
 
     $hierarchy->bobot_planning = 100;
-    $hierarchy->progress =((int) end($data[0]['data']['percentageReal']) / (int) end($data[0]['data']['percentagePlan'])) * 100;
+    $hierarchy->progress =round(((int) end($data[0]['data']['percentageReal']) / (int) end($data[0]['data']['percentagePlan'])) * 100, 2);
     $hierarchy->save();
   }
 }
diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index acf3f69..805c01d 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -468,9 +468,9 @@ class MasterFunctionsHelper
 		}
 
 		if ($dataHeader) {
-			$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
+			// $totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
 		} else {
-			$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
+			// $totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya");
 		}
 
 		if (!Activity::where("version_gantt_id", $keyGantt['id'])->first())
@@ -506,16 +506,16 @@ class MasterFunctionsHelper
 		}
 		$period = new \DatePeriod($begin, $interval, $end);
 
-		$arr_ActualM = [];
+		// $arr_ActualM = [];
 		$tempDate = [];
-		$tempPercentagePlan = [];
-		$tempPercentagePlanWhr = [];
-		$tempPercentageReal = [];
-		$tempTtlPercentPlan = 0;
-		$tempTtlPercentActual = 0;
+		// $tempPercentagePlan = [];
+		// $tempPercentagePlanWhr = [];
+		// $tempPercentageReal = [];
+		// $tempTtlPercentPlan = 0;
+		// $tempTtlPercentActual = 0;
 
-		$currentACWP = 0;
-		$currentBCWP = 0;
+		// $currentACWP = 0;
+		// $currentBCWP = 0;
 		$dataActivityPlanDate = [];
 		$progressPlanKomulatifWeek = [];
 		$progressActualKomulatifWeek = [];
@@ -551,11 +551,15 @@ class MasterFunctionsHelper
 		
 			$dataActivityPlan = []; 
 			$dataActivityActual = [];
-			$today = new DateTime();
+			$today = date('Y-m-d');
+			$statusCutOfDate = false;
+			// if (new \DateTime($loopDay) < $today) {
+			// 	$statusCutOfDate = true;
+			// }
 			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
 				
 				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
-				if (new \DateTime($loopDay) < $today) {
+				if (new \DateTime($loopDay . ' Friday') <= new \DateTime($today . ' Friday')) {
 					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
 					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
 				}
@@ -599,7 +603,7 @@ class MasterFunctionsHelper
 				// $progressActualWeek = ((((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*100)*$keyActualM->bobot_planning)/100;
 				// jika total report > dari planning
 				if($keyActualM->sum_qty_actual > $keyActualM->qty_plan){
-					$progressActualWeek = (($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) *$keyActualM->bobot_planning/100;
+					$progressActualWeek = ($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * $keyActualM->bobot_planning;
 				}else{
 					// jika total report < dari planning
 					// $progressActualWeek = ((($keyActualM->qty_actual / $keyActualM->sum_qty_actual) * 100) / $keyActualM->qty_plan)*$keyActualM->bobot_planning;
@@ -1431,11 +1435,11 @@ class MasterFunctionsHelper
 		
 			$dataActivityPlan = []; 
 			$dataActivityActual = [];
-			$today = new DateTime();
+			$today = date('Y-m-d');
 			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
 				
 				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
-				if (new \DateTime($loopDay) < $today) {
+				if (new \DateTime($loopDay . ' Friday') <= new \DateTime($today . ' Friday')) {
 					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
 					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
 				}
@@ -1681,11 +1685,11 @@ class MasterFunctionsHelper
 		
 			$dataActivityPlan = []; 
 			$dataActivityActual = [];
-			$today = new DateTime();
+			$today = date('Y-m-d');
 			if	(new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){
 				
-				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2);
-				if (new \DateTime($loopDay) < $today) {
+				$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2); 
+				if (new \DateTime($loopDay . ' Friday') <= new \DateTime($today . ' Friday')) {
 					// $tempPercentageReal[] = round($tempTtlPercentActual, 2);
 					$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2);
 				}
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 737c648..66f4724 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -538,16 +538,26 @@ class ProjectController extends Controller
             $actualStartExist = Activity::where('proyek_id', $id)->whereNotNull('actual_start')->exists();
             if($result['type_proyek_id'] === 9)
             {
-                $actualEndExist = Activity::where('proyek_id', $id)->exists();
-                $query = Activity::where('proyek_id', $id);
+                // $actualEndExist = Activity::where('proyek_id', $id)->exists();
+                // $query = Activity::where('proyek_id', $id);
+				$maxEndDate = Activity::where('proyek_id', $id)->select('end_date')
+										->orderBy('end_date', 'desc')
+										->first();
+				
             }else{
-                $actualEndExist = Activity::where('version_gantt_id', $ganttId)->exists();
+                // $actualEndExist = Activity::where('version_gantt_id', $ganttId)->exists();
+				$maxEndDate = Activity::where('version_gantt_id', $ganttId)->select('end_date')
+										->orderBy('end_date', 'desc')
+										->first();
                 $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();
-            $actualEndExist = Activity::where('version_gantt_id', $ganttId)->exists();
+            // $actualEndExist = Activity::where('version_gantt_id', $ganttId)->exists();
+			$maxEndDate = Activity::where('version_gantt_id', $ganttId)->select('end_date')
+										->orderBy('end_date', 'desc')
+										->first();
             $query = Activity::where('version_gantt_id', $ganttId);
         }
 
@@ -556,11 +566,13 @@ class ProjectController extends Controller
         } else {
             $startDate = $query->orderBy('start_date')->value('start_date');
         }
-        if($actualEndExist)
-        {
-            $maxEndDate = $query->max('id');
-            $endDate = $query->where('id',$maxEndDate)->first()->end_date;
-        }
+        // if($actualEndExist)
+        // {
+        //     // $maxEndDate = $query->max('id');
+		// 	// get last end_date
+        //     // $endDate = $query->where('id',$maxEndDate)->first()->end_date;
+
+        // }
 
         $plannedStart = Activity::where('version_gantt_id', $ganttId)
 				->orderBy('planned_start')
@@ -569,7 +581,7 @@ class ProjectController extends Controller
 				->orderByDesc('planned_end')
 				->value('planned_end');
         $result->header->start_date = $startDate;
-        $result->header->end_date = $endDate;
+        $result->header->end_date = $maxEndDate->end_date;
         $result->header->planned_start = $plannedStart;
         $result->header->planned_end = $plannedEnd;
 		return response()->json(['status'=>'success','code'=> 200,'data'=>$result, 'gantt'=>$ganttId], 200);