tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

bugs fix search dan daily monitoring

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-02-19 08:50:22 +07:00
parent 785f20e235
commit cf85af68fe
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -56,7 +56,7 @@ class DailyMonitoringController extends Controller
// ->get() // ->get()
->paginate(); ->paginate();
return Helper::paginateResources(DailyMonitoringResource::collection($memberList)); return Helper::paginateResources(DailyMonitoringResource::collection($memberList));
} }
@@ -75,7 +75,8 @@ class DailyMonitoringController extends Controller
->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->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') ->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.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) ->where("request_logs.member_id", "=", $memberDetail->id)
->when($request->search, function ($q, $search) { ->when($request->search, function ($q, $search) {
$q->where('request_logs.code', 'LIKE', "%".$search."%"); $q->where('request_logs.code', 'LIKE', "%".$search."%");

12
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -57,9 +57,11 @@ class RequestLogController extends Controller
$q->where('final_log', $final_log); $q->where('final_log', $final_log);
}) })
->when($request->search, function ($q, $search) { ->when($request->search, function ($q, $search) {
$q->where('code', 'LIKE', "%".$search."%"); $q->where(function ($subQuery) use ($search) {
$q->orWhereHas('member', function ($subQuery) use ($search) { $subQuery->where('code', 'LIKE', "%".$search."%")
$subQuery->where('name', 'LIKE', "%".$search."%"); ->orWhereHas('member', function ($subSubQuery) use ($search) {
$subSubQuery->where('name', 'LIKE', "%".$search."%");
});
}); });
}) })
->when($request->orderBy, function ($q, $orderBy) use ($request) { ->when($request->orderBy, function ($q, $orderBy) use ($request) {
@@ -424,7 +426,7 @@ class RequestLogController extends Controller
// if($requestLog->service_code != 'IP'){ // if($requestLog->service_code != 'IP'){
// $requestLog->discharge_date = Carbon::now(); // $requestLog->discharge_date = Carbon::now();
// } // }
$requestLog->save(); $requestLog->save();
@@ -921,7 +923,7 @@ class RequestLogController extends Controller
// Menghapus file dari penyimpanan // Menghapus file dari penyimpanan
if (Storage::exists($path)) { if (Storage::exists($path)) {
Storage::delete($path); Storage::delete($path);
// Update entri file dari basis data // Update entri file dari basis data
File::where('path', $request->path)->update([ File::where('path', $request->path)->update([
'deleted_at' => Carbon::now(), // Gunakan Carbon untuk mendapatkan tanggal dan waktu saat ini 'deleted_at' => Carbon::now(), // Gunakan Carbon untuk mendapatkan tanggal dan waktu saat ini