From a0e560631afe3b4d27e8e5caefaada2fda46494d Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 22 Jan 2024 11:52:49 +0700 Subject: [PATCH] Update Discharge Date Di Final LOG --- .../Controllers/Api/RequestLogController.php | 12 +++++--- .../hospital-portal/public/lang/en-US.json | 6 ++-- .../hospital-portal/public/lang/id-ID.json | 4 ++- .../src/sections/dashboard/DialogFinalLog.tsx | 30 ++++++++++++++++++- .../src/sections/dashboard/FormRequestLog.tsx | 4 +-- .../views/pdf/final_log_page_1.blade.php | 4 +-- resources/views/pdf/req_log_page_1.blade.php | 2 +- 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 3f1f7ac3..a5a2a6e8 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -317,12 +317,15 @@ class RequestLogController extends Controller public function requestFinalLog(Request $request) { $data = [ - 'request_logs_id' => $request->request_logs_id + 'request_logs_id' => $request->request_logs_id, + 'discharge_date' => $request->discharge_date, ]; $validator = Validator::make($request->all(), [ - 'request_logs_id' => 'required' + 'request_logs_id' => 'required', + 'discharge_date' => 'required' ], [ - 'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']) + 'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']), + 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']) ]); if ($validator->fails()) { @@ -336,7 +339,8 @@ class RequestLogController extends Controller ->where('request_logs.id', '=', $request->request_logs_id) ->update([ 'status_final_log' => 'requested', - 'final_log' => 1 + 'final_log' => 1, + 'discharge_date' => $request->discharge_date, ]); if ($request->hasFile('result_files')) { foreach ($request->result_files as $file) { diff --git a/frontend/hospital-portal/public/lang/en-US.json b/frontend/hospital-portal/public/lang/en-US.json index 37990c22..c2240c3e 100644 --- a/frontend/hospital-portal/public/lang/en-US.json +++ b/frontend/hospital-portal/public/lang/en-US.json @@ -14,7 +14,8 @@ "txtDialogMember3" : "Detail", "txtDialogMember4" : "Please select services", "txtDialogMember5" : "Submission Date", - "txtDialogMember6" : "Please select submission date", + "txtDialogMember6" : "Please select submission date", + "txtWarningDischargeDate" : "Please select discharge date", "txtCreateAt" : "Create at", "txtDateBirth" : "Date of Birth", "txtGender" : "Gender", @@ -47,5 +48,6 @@ "txtYouHave" : "You have", "txtUnm" : "unread messages", "txtNew" : "New", - "txtBeforeThat" : "Before that" + "txtBeforeThat" : "Before that", + "txtDischargeDate" : "Discharge Date" } diff --git a/frontend/hospital-portal/public/lang/id-ID.json b/frontend/hospital-portal/public/lang/id-ID.json index 4e952700..4d9cca02 100644 --- a/frontend/hospital-portal/public/lang/id-ID.json +++ b/frontend/hospital-portal/public/lang/id-ID.json @@ -15,6 +15,7 @@ "txtDialogMember4" : "Mohon pilih layanan", "txtDialogMember5" : "Tanggal Pengajuan", "txtDialogMember6" : "Mohon pilih tanggal pengajuan", + "txtWarningDischargeDate" : "Mohon pilih tanggal keluar", "txtCreateAt" : "Tanggal Buat", "txtDateBirth" : "Tanggal Lahir", "txtGender" : "Jenis Kelamin", @@ -47,5 +48,6 @@ "txtYouHave" : "Anda memiliki", "txtUnm" : "pesan yang belum dibaca", "txtNew" : "Baru", - "txtBeforeThat" : "Sebelum" + "txtBeforeThat" : "Sebelum", + "txtDischargeDate" : "Tanggal Keluar" } diff --git a/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx index 26a74e8b..7bebba3f 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx @@ -12,9 +12,14 @@ import { useRef, useState, useContext } from 'react'; import { makeFormData } from '@/utils/jsonToFormData'; import { format } from 'date-fns'; import { LanguageContext } from '@/contexts/LanguageContext'; +import { DatePicker, LocalizationProvider, MobileDatePicker } from '@mui/x-date-pickers'; +import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns'; +import TextField from '@mui/material/TextField'; export default function DialogFinalLog({ member, getData, onClose, handleSubmitSuccess }: any) { const { localeData }: any = useContext(LanguageContext); + //Submission date + const [dischargeDate, setDischargeDate] = useState(format(new Date(), "yyyy MMM d HH:mm:ss")); // ---------------------------------------------------------------------- // Files Diagnosa @@ -84,12 +89,18 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS const [submitLoading, setSubmitLoading] = useState(false); function submitRequestFinalLog() { + if(dischargeDate == '') + { + enqueueSnackbar(localeData.txtWarningDischargeDate, { variant: 'warning' }); + return false; + } setSubmitLoading(true); const formData = makeFormData({ request_logs_id: member.id, result_files: fileHasilPenunjangs, diagnosa_files: fileDiagnosas, - kondisi_files: fileKondisis + kondisi_files: fileKondisis, + discharge_date: fPostFormat(dischargeDate, 'yyyy-MM-dd HH:mm:ss'), }); axios .post('/request-final-log', formData) @@ -313,6 +324,23 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS + + + {localeData.txtDischargeDate} * + + { + setDischargeDate( (newValue)); + }} + inputFormat="dd-MM-yyyy" + renderInput={(params) => } + /> + + + + (''); const [idProvider, setIdProvider] = useState(0); //Submission date - const [submissionDate, setSubmissionDate] = useState(format(new Date(), "yyyy MMM d")); + const [submissionDate, setSubmissionDate] = useState(format(new Date(), "yyyy MMM d HH:mm:ss")); const [submitLoading, setSubmitLoading] = useState(false); function submitRequest() { @@ -63,7 +63,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe organization_id: idProvider, organization_name : name, address_provider: alamat, - submission_date: fPostFormat(submissionDate, 'yyyy-MM-dd') + submission_date: fPostFormat(submissionDate, 'yyyy-MM-dd HH:mm:ss') }; axios .post('/request-log', formData) diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index 42b1b176..47320b3c 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -242,7 +242,7 @@ {{ wordwrap($request_logs->code,15,"
\n")}} Tanggal : - {{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }} + {{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }} Kepada @@ -354,7 +354,7 @@ Periode Jaminan : - {{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }} + {{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') . ($request_logs->discharge_date ? ' - ' . \Carbon\Carbon::parse($request_logs->discharge_date)->format('d M Y') : '') }} Mata Uang diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php index 57013dff..f8ee97d5 100644 --- a/resources/views/pdf/req_log_page_1.blade.php +++ b/resources/views/pdf/req_log_page_1.blade.php @@ -250,7 +250,7 @@ {{ wordwrap($request_logs->code, 15, "
\n") }} Tanggal : - {{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }} + {{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }}