From cf85af68fe352dd84a88461e46669ad804629392 Mon Sep 17 00:00:00 2001 From: Linksehat Staging Server Date: Mon, 19 Feb 2024 08:50:22 +0700 Subject: [PATCH] bugs fix search dan daily monitoring --- .../Controllers/Api/DailyMonitoringController.php | 5 +++-- .../Http/Controllers/Api/RequestLogController.php | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php index 0eef8570..fea450b1 100644 --- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php +++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php @@ -56,7 +56,7 @@ class DailyMonitoringController extends Controller // ->get() ->paginate(); - + return Helper::paginateResources(DailyMonitoringResource::collection($memberList)); } @@ -75,7 +75,8 @@ class DailyMonitoringController extends Controller ->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->select('request_logs.id','request_logs.submission_date AS admission_date','request_logs.discharge_date','request_logs.code','services.name as service_name','request_logs.status','members.name', 'members.member_id') ->where('request_logs.service_code', 'IP') - ->where('request_logs.status_final_log', 'approved') + ->where('request_logs.deleted_at', null) + // ->where('request_logs.status_final_log', 'approved') ->where("request_logs.member_id", "=", $memberDetail->id) ->when($request->search, function ($q, $search) { $q->where('request_logs.code', 'LIKE', "%".$search."%"); diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 74531c12..7b3fc169 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -57,9 +57,11 @@ class RequestLogController extends Controller $q->where('final_log', $final_log); }) ->when($request->search, function ($q, $search) { - $q->where('code', 'LIKE', "%".$search."%"); - $q->orWhereHas('member', function ($subQuery) use ($search) { - $subQuery->where('name', 'LIKE', "%".$search."%"); + $q->where(function ($subQuery) use ($search) { + $subQuery->where('code', 'LIKE', "%".$search."%") + ->orWhereHas('member', function ($subSubQuery) use ($search) { + $subSubQuery->where('name', 'LIKE', "%".$search."%"); + }); }); }) ->when($request->orderBy, function ($q, $orderBy) use ($request) { @@ -424,7 +426,7 @@ class RequestLogController extends Controller // if($requestLog->service_code != 'IP'){ // $requestLog->discharge_date = Carbon::now(); // } - + $requestLog->save(); @@ -921,7 +923,7 @@ class RequestLogController extends Controller // Menghapus file dari penyimpanan if (Storage::exists($path)) { Storage::delete($path); - + // Update entri file dari basis data File::where('path', $request->path)->update([ 'deleted_at' => Carbon::now(), // Gunakan Carbon untuk mendapatkan tanggal dan waktu saat ini