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

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) {

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"
 }

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"
 }

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<string>(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
         </Stack>
       </Stack>
 
+      <Stack direction="row" spacing={2}>
+            <Stack spacing={2} sx={{ width: '100%' }}>
+                <Typography variant='subtitle1'>{localeData.txtDischargeDate} *</Typography>
+                <LocalizationProvider dateAdapter={AdapterDateFns}>
+                    <DatePicker
+                        label={localeData.txtDischargeDate}
+                        value={dischargeDate}
+                        onChange={(newValue:any) => {
+                          setDischargeDate(  (newValue));
+                        }}
+                        inputFormat="dd-MM-yyyy"
+                        renderInput={(params) => <TextField sx={{width:'40%'}} {...params} required/>}
+                    />
+                </LocalizationProvider>
+            </Stack>
+        </Stack>
+
       <LoadingButton
         variant="contained"
         sx={{ marginTop: 2, p: 2, backgroundColor: '#19BBBB' }}

frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx

@@ -37,7 +37,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
     const [serviceCode, setServiceCode] = useState<string>('');
     const [idProvider, setIdProvider] = useState<number>(0);
     //Submission date
-    const [submissionDate, setSubmissionDate] = useState<string>(format(new Date(), "yyyy MMM d"));
+    const [submissionDate, setSubmissionDate] = useState<string>(format(new Date(), "yyyy MMM d HH:mm:ss"));
 
     const [submitLoading, setSubmitLoading] = useState<boolean>(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)

resources/views/pdf/final_log_page_1.blade.php

@@ -242,7 +242,7 @@
                 <td style="width: 29%;">{{ wordwrap($request_logs->code,15,"<br>\n")}}</td>
                 <td style="width: 20%;">Tanggal</td>
                 <td style="width: 1%;">:</td>
-                <td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }}</td>
+                <td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }}</td>
             </tr>
             <tr>
                 <td>Kepada</td>
@@ -354,7 +354,7 @@
                     <tr>
                         <td>Periode Jaminan</td>
                         <td>:</td>
-                        <td>{{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }}</td>
+                        <td>{{ \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') : '') }} </td>
                     </tr>
                     <tr>
                         <td>Mata Uang</td>

resources/views/pdf/req_log_page_1.blade.php

@@ -250,7 +250,7 @@
                 <td style="width: 29%;">{{ wordwrap($request_logs->code, 15, "<br>\n") }}</td>
                 <td style="width: 20%;">Tanggal</td>
                 <td style="width: 1%;">:</td>
-                <td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }}
+                <td style="width: 29%;">{{ \Carbon\Carbon::parse($request_logs->created_at)->format('d M Y') }}
                 </td>
             </tr>
             <tr>