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

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-29 17:06:41 +07:00
parent ccbc515686 c41181b93b
commit 55ff788dd6
15 changed files with 632 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {
@@ -60,14 +64,11 @@ class RequestLogController extends Controller
})
->when($request->orderBy, function ($q, $orderBy) use ($request) {
if (in_array($orderBy, ['submission_date', 'code'])) {
$q->orderBy($orderBy, $request->order);
$q->orderBy($orderBy, $request->orderBy);
}
})
->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);
$q->orderBy('submission_date', 'desc');
})
->when($request->service_code, function($q, $service_code) {
if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring
@@ -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);
}
/**