From b630b9706368ab70eb92b12464a6b0d9b7a37467 Mon Sep 17 00:00:00 2001 From: farhan048 Date: Mon, 13 Feb 2023 10:09:48 +0700 Subject: [PATCH] Project Expenditure order by DESC, Search Divisi --- app/Http/Controllers/DashboardBoDController.php | 1 + app/Http/Controllers/DivisiController.php | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DashboardBoDController.php b/app/Http/Controllers/DashboardBoDController.php index 94931b6..c6309e5 100644 --- a/app/Http/Controllers/DashboardBoDController.php +++ b/app/Http/Controllers/DashboardBoDController.php @@ -304,6 +304,7 @@ class DashboardBoDController extends Controller $year = $this->interpolateYear($year); $projects = Project::where('mulai_proyek', 'like', $year) /* ->orWhere('akhir_proyek', 'like', $year) */ + ->orderBy('id', 'desc') ->get(); foreach($projects as $project){ $lastGantt = MasterFunctionsHelper::getLatestGantt($project->id); diff --git a/app/Http/Controllers/DivisiController.php b/app/Http/Controllers/DivisiController.php index aad3c90..1991c24 100644 --- a/app/Http/Controllers/DivisiController.php +++ b/app/Http/Controllers/DivisiController.php @@ -72,8 +72,13 @@ class DivisiController extends Controller public function search() { - return $this->list(); - // cant use builder for this case + $payload = $request->all(); + $dataBuilder = $this->setUpPayload($payload, 'm_divisi'); + $builder = $dataBuilder['builder']; + $countBuilder = $dataBuilder['count']; + $dataGet = $builder->get(); + $totalRecord = $countBuilder->count(); + return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200); } public function list()