From 006be9da232c652a9e35ce1fab1bb8a38d4a7833 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 30 Jul 2024 15:32:36 +0700 Subject: [PATCH 1/2] fix: anggaran biaya <-> nilai kontrak --- app/Http/Controllers/DashboardBoDController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardBoDController.php b/app/Http/Controllers/DashboardBoDController.php index c458ac3..6f30cff 100644 --- a/app/Http/Controllers/DashboardBoDController.php +++ b/app/Http/Controllers/DashboardBoDController.php @@ -66,11 +66,11 @@ class DashboardBoDController extends Controller return response()->json([ 'data' => [ - 'total_budget' => (int) ($totalBudgets->total_rencana_biaya ?? 0), + 'total_budget' => $totalBudgets->total_value_proyek ?? 0, 'total_expenditure' => $totalExpenditure, 'total_invoice' => $totalInvoice, 'total_paid_invoice' => $totalPaidInvoice, - 'total_value_proyek' => $totalBudgets->total_value_proyek ?? 0, + 'total_value_proyek' => (int) ($totalBudgets->total_rencana_biaya ?? 0), 'total_income_year' => $totalBudgets->total_income_year ?? 0 ] ], 200); From 033373ebf0c2772b0d2dcc21f0e3890d25decd8e Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 30 Jul 2024 15:33:01 +0700 Subject: [PATCH 2/2] fix: total_progress update logic --- app/Http/Controllers/ProjectController.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 916c81e..63fdf87 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -291,6 +291,23 @@ class ProjectController extends Controller $builder = $dataBuilder['builder']; $countBuilder = $dataBuilder['count']; $dataGet = $builder->get(); + foreach($dataGet as $p) { + $project = Project::find($p->id); + if (!$project) continue; + + $act = Activity::select('persentase_progress as total_progress') + ->where([ + ['proyek_id', $p->id], + ['parent_id', null] + ]) + ->first(); + if ($act) { + $project->persentase_progress = $act->total_progress; + } else { + $project->persentase_progress = 0; + } + $project->save(); + } $totalRecord = $countBuilder->count(); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); }