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

This commit is contained in:
Server D3 Linksehat
2025-02-24 16:03:57 +07:00
37 changed files with 1299 additions and 250 deletions

View File

@@ -150,7 +150,9 @@ class RequestLogController extends Controller
// status: 'approved',
status: 'requested', // di nonaktifkan dulu auto approved
organization_id: $request->organization_id,
source: $request->source
source: $request->source,
specialities_id: $request->specialities_id,
dppj: $request->dppj
);
DB::commit();
@@ -172,7 +174,9 @@ class RequestLogController extends Controller
submissionDate: $request->submission_date,
status: 'requested',
organization_id: $request->organization_id,
source: $request->source
source: $request->source,
specialities_id: $request->specialities_id,
dppj: $request->dppj
);
DB::commit();
@@ -237,6 +241,31 @@ class RequestLogController extends Controller
return Helper::responseJson(data: $manipulatedIcds);
}
public function codeLog(Request $request)
{
$codeLogs = RequestLog::with(['member'])
->when($request->search, function ($q) use ($request) {
$q->where('code', 'LIKE', "%{$request->search}%")
->orWhereHas('member', function ($subQuery) use ($request) {
$subQuery->where('name', 'LIKE', "%{$request->search}%");
});
})
->whereHas('member', function ($subQuery) {
$subQuery->whereNull('deleted_at');
})
->get();
$manipulatedIcds = $codeLogs->map(function ($codeLog) {
return [
'value' => $codeLog->id,
'label' => $codeLog->code . ' - ' . ($codeLog->member->name ?? 'Unknown'),
];
});
return Helper::responseJson(data: $manipulatedIcds);
}
public function hospitals(){
$organizations = Organization::query()
->where([
@@ -490,11 +519,11 @@ class RequestLogController extends Controller
if (!empty($request->reason)) {
$requestLog->reason_final = $request->reason;
}
if (!empty($request->type_of_member)){
$requestLog->type_of_member = $request->type_of_member;
}
$requestLog->final_log = 1;
$requestLog->approved_final_log_by = auth()->user()->id;
$requestLog->approved_final_log_at = Carbon::now();