[Improvement] add fitur delete request log
This commit is contained in:
@@ -52,6 +52,10 @@ class RequestLogController extends Controller
|
||||
public function index(Request $request)
|
||||
{
|
||||
$requestLog = RequestLog::query()
|
||||
->where('deleted_at', null)
|
||||
->when($request->final_log, function($q, $final_log) {
|
||||
$q->where('final_log', $final_log);
|
||||
})
|
||||
->when($request->search, function ($q, $search) {
|
||||
$q->where('code', 'LIKE', "%".$search."%");
|
||||
$q->orWhereHas('member', function ($subQuery) use ($search) {
|
||||
@@ -66,9 +70,6 @@ class RequestLogController extends Controller
|
||||
->when(empty($request->orderBy), function ($q) {
|
||||
$q->orderBy('created_at', 'desc');
|
||||
})
|
||||
->when($request->final_log, function($q, $final_log) {
|
||||
$q->where('final_log', $final_log);
|
||||
})
|
||||
->when($request->service_code, function($q, $service_code) {
|
||||
if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring
|
||||
$q->where('service_code', $service_code);
|
||||
@@ -252,16 +253,12 @@ class RequestLogController extends Controller
|
||||
$requestLog->reason = $request->reason;
|
||||
}
|
||||
|
||||
// Simpan perubahan pada entitas
|
||||
$requestLog->save();
|
||||
|
||||
|
||||
if ($request->status){
|
||||
$requestLog->status = $request->status;
|
||||
$requestLog->approved_by = auth()->user()->id;
|
||||
$requestLog->approved_at = Carbon::now();
|
||||
}
|
||||
|
||||
$requestLog->approved_by = auth()->user()->id;
|
||||
$requestLog->approved_at = Carbon::now();
|
||||
$requestLog->save();
|
||||
|
||||
// update nirc member
|
||||
@@ -284,9 +281,27 @@ class RequestLogController extends Controller
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function destroy($id)
|
||||
public function destroy(Request $request, $id)
|
||||
{
|
||||
//
|
||||
$requestLog = RequestLog::findOrFail($id);
|
||||
$requestLog->reason = 'Reason Delete ' .$request->reason;
|
||||
$requestLog->deleted_at = Carbon::now();
|
||||
$requestLog->deleted_by = auth()->user()->id;
|
||||
// Delete the record
|
||||
$requestLog->save();
|
||||
}
|
||||
|
||||
public function deleteFinalLog(Request $request, $id){
|
||||
$requestLog = RequestLog::findOrFail($id);
|
||||
$requestLog->status_final_log = null;
|
||||
$requestLog->final_log = 0;
|
||||
$requestLog->reason_final = 'Reason Delete ' .$request->reason;
|
||||
$requestLog->save();
|
||||
return response()->json([
|
||||
'error' => false,
|
||||
'message' => 'Delete Final LOG',
|
||||
'data' => $requestLog],
|
||||
200);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user