From fd87c74fad55ceb49f21b0542779478f38fb6b5d Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 17 May 2023 14:02:57 +0700 Subject: [PATCH 1/2] Fix overhead --- app/Http/Controllers/AssignMaterialController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AssignMaterialController.php b/app/Http/Controllers/AssignMaterialController.php index 5a89147..b3f917a 100644 --- a/app/Http/Controllers/AssignMaterialController.php +++ b/app/Http/Controllers/AssignMaterialController.php @@ -42,7 +42,7 @@ class AssignMaterialController extends Controller $data['budget'] = $checkStock->price; $data['qty_planning'] = $this->sanitizeDecimal($data['qty_planning']); - if ($planDate > $startDate) { + if ($planDate >= $startDate) { $result = AssignMaterial::create($data); return response()->json(['status'=>'success','message'=>'Data added!', 'code'=>200], 200); }else{ From c052fbce16b6c2eec1e861bb0cb33f12122b0f53 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 17 May 2023 15:36:01 +0700 Subject: [PATCH 2/2] Calculation type hack --- app/Helpers/MasterFunctionsHelper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php index 86197d7..1224d23 100644 --- a/app/Helpers/MasterFunctionsHelper.php +++ b/app/Helpers/MasterFunctionsHelper.php @@ -71,12 +71,14 @@ class MasterFunctionsHelper { // foreach ($gantt as $key => $value) { // Log::info('gantt '.$value.' index '.$key); // } - if($gantt['calculation_type'] == 'simple') { - // to do - return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt); - } else { - return MasterFunctionsHelper::calculateProgressBasedOnReportMaterial($gantt); - } + if (isset($gantt['calculation_type'])) { + if($gantt['calculation_type'] == 'simple') { + // to do + return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt); + } else { + return MasterFunctionsHelper::calculateProgressBasedOnReportMaterial($gantt); + } + } } }