From aded36c0ae3f3e02ac4087727b0528eaec783201 Mon Sep 17 00:00:00 2001
From: ibnu <ibnuhamdani234@gmail.com>
Date: Tue, 12 Dec 2023 07:16:34 +0700
Subject: [PATCH] update for logic update status report on-progress, actual >=
 plan is 95, actual < plan is calculate

---
 .../Controllers/ReportActivityMaterialController.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ReportActivityMaterialController.php b/app/Http/Controllers/ReportActivityMaterialController.php
index e451129..1712b5b 100644
--- a/app/Http/Controllers/ReportActivityMaterialController.php
+++ b/app/Http/Controllers/ReportActivityMaterialController.php
@@ -64,10 +64,18 @@ class ReportActivityMaterialController extends Controller
 			} else {
 				$sumAssignMaterial = AssignMaterial::where('activity_id', $request->activity_id)->sum('qty_planning');
 				$sumReportActivityMaterial = ReportActivityMaterial::where('activity_id', $request->activity_id)->sum('qty');
+				// if actual >= plan
+				if ($sumReportActivityMaterial >= $sumAssignMaterial){
+					$persentaseProgress = 95;
+				}else{
+					// actual < plan
+					$persentaseProgress = $sumReportActivityMaterial/$sumAssignMaterial*100;
+				}
+				
 				$dataUpdate = array(
                     "actual_start" => null,
-                    "actual_end" => null,
-					"persentase_progress" => $sumReportActivityMaterial/$sumAssignMaterial*100,
+                    "actual_end" => null, 
+					"persentase_progress" => $persentaseProgress,
 					"updated_by" => $this->currentName
 				);
                 if ($sumReportActivityMaterial > 0) {