From 391507dedbf4fecf9c9c7ab62f3181455e243ca1 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Fri, 7 Jul 2023 15:13:17 +0700 Subject: [PATCH 1/2] fix dashboard --- app/Http/Controllers/DashboardBoDController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardBoDController.php b/app/Http/Controllers/DashboardBoDController.php index 8e851cb..9c48541 100644 --- a/app/Http/Controllers/DashboardBoDController.php +++ b/app/Http/Controllers/DashboardBoDController.php @@ -10,6 +10,7 @@ use App\Models\User; use App\Models\UserToVersionGantt; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class DashboardBoDController extends Controller { @@ -130,8 +131,10 @@ class DashboardBoDController extends Controller $project->scurve = MasterFunctionsHelper::getSCurve($project->id); $selisihProgress = 0; if($project->scurve && $project->scurve[0]){ - $planningProgress = $project->scurve[0]['data']['percentagePlan'][count($project->scurve[0]['data']['percentagePlan'])-1]; - $actualProgress = $project->scurve[0]['data']['percentageReal'][count($project->scurve[0]['data']['percentageReal'])-1]; + $planningArray = $project->scurve[0]['data']['percentagePlan']; + $actualArray = $project->scurve[0]['data']['percentageReal']; + $planningProgress = !empty($planningArray) ? $planningArray[count($planningArray) - 1] : 0; + $actualProgress = !empty($actualArray) ? $actualArray[count($actualArray) - 1] : 0; } $selisihProgress = $planningProgress - $actualProgress; try { From c5fda7e5e3611eca6f6c8b415166ff86b1916f17 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 10 Jul 2023 11:36:00 +0700 Subject: [PATCH 2/2] Fix project count --- 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 9c48541..56ba219 100644 --- a/app/Http/Controllers/DashboardBoDController.php +++ b/app/Http/Controllers/DashboardBoDController.php @@ -140,10 +140,10 @@ class DashboardBoDController extends Controller try { if($selisihProgress > 0 && $selisihProgress <= 5) $return['warning'] += 1; - elseif($selisihProgress > 5 && $selisihProgress <= 100) - $return['behind-schedule'] += 1; elseif($selisihProgress == 0) $return['on-schedule'] += 1; + else + $return['behind-schedule'] += 1; } catch (\Error $e) { return response()->json(['msg' => $e->getMessage(), 'data' => $project], 200); }