From bee51f8ce50ef94cad8523c9640f08bd0a07c4a3 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Fri, 9 Jun 2023 15:00:42 +0700 Subject: [PATCH 1/2] Remove progress status checker --- app/Models/ReportActivityMaterial.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Models/ReportActivityMaterial.php b/app/Models/ReportActivityMaterial.php index 75b0817..44db31c 100644 --- a/app/Models/ReportActivityMaterial.php +++ b/app/Models/ReportActivityMaterial.php @@ -61,15 +61,10 @@ class ReportActivityMaterial extends Model $activity->biaya_actual -= floatval($assignedMaterial->budget) * floatval($data->qty); $dataPlan = AssignMaterial::where('activity_id', $activity->id)->get(); - if($dataPlan[0]->status_activity == 'done'){ - $activity->persentase_progress = 100; - } else { $totalPlan = $dataPlan->sum('qty_planning'); $totalVolumeActual = ReportActivityMaterial::where('activity_id', '=', $activity->id)->sum("qty"); $percentage = ($totalVolumeActual * 100) / $totalPlan; $activity->persentase_progress = $percentage >= config('app.max_percentage_not_done') ? config('app.max_percentage_not_done') : $percentage; - } - $activity->save(); }); From af770faae999a15779131db169d10ed816836b72 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Fri, 9 Jun 2023 16:04:21 +0700 Subject: [PATCH 2/2] Fix refresh --- app/Http/Controllers/ActivityController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 23ef012..c9a2081 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -247,7 +247,7 @@ class ActivityController extends Controller if(empty($id) || !is_int((int)$id)) return response()->json(['status'=>'failed', 'action'=>'error','message'=>'id is required!','code'=>400], 400); - $updateBobot = true; + $updateBobot = false; if(!$data = Activity::find($id)) return response()->json(['status'=>'failed', 'action'=>'error','message'=>'Data not found!','code'=> 404], 404); $dataUpdate = $request->all();