Merge branch 'feature/laboratorium-result' into staging

frontend/dashboard/src/components/hook-form/RHFDatePickerV2.tsx

@@ -17,7 +17,7 @@ interface IProps {
   disabled?: boolean;
 }
 
-export default function RHFDatePickerV2({ name, label, dateFormat, minDate, maxDate, disabled, ...other }: IProps) {
+export default function RHFDatePicker({ name, label, dateFormat, minDate, maxDate, disabled, ...other }: IProps) {
   const { control } = useFormContext();
 
   const { fullWidth } = other;
@@ -32,13 +32,16 @@ export default function RHFDatePickerV2({ name, label, dateFormat, minDate, maxD
             <DesktopDatePicker
               disabled={disabled}
               label={label}
-              onChange={(date) => field.onChange(date)}
+              onChange={(date)=> field.onChange(date)}
               inputFormat={dateFormat}
               value={field.value}
               mask={''}
               minDate={(minDate) ? new Date(minDate) : null}
               maxDate={(maxDate) ? new Date(maxDate) : null}
-              renderInput={(params) => <TextField fullWidth={fullWidth} {...params} />}
+              renderInput={(params) => <TextField
+                fullWidth={fullWidth}
+                {...params}
+                />}
             />
             {!!error && (
               <FormHelperText error sx={{ px: 2 }}>

frontend/dashboard/src/components/hook-form/RHFDatepicker.tsx

@@ -62,6 +62,7 @@ export default function RHFDatepicker({ name, ...other }: IProps & TextFieldProp
             value={field.value}
             inputFormat="dd/MMM/yyyy"
             // inputFormat="dd - MMM - yyyy"
+            mask=''
             onChange={(value) => {
               field.onChange(value);
             }}

frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Components/DetailLabResultForm.tsx

@@ -43,7 +43,7 @@ export default function DetailMonitoringList() {
         id              : '',
         claim_id        : '',
         claim_code      : '',
-        date            : '',
+        date            : null,
         location        : '',
         examination     : '',
         lab_result_file : [],
@@ -119,11 +119,11 @@ export default function DetailMonitoringList() {
                                         </Typography>
                                     </Grid>
                                     <Grid item xs={12} sx={{display: 'flex', gap: 1}}>
-                                        <RHFDatepicker
+                                        <RHFDatePickerV2
-                                            // label=''
+                                            label=''
                                             name="date"
-                                            // dateFormat='dd-mm-yyyy'
+                                            dateFormat='dd-MMMM-yyyy'
-                                            // fullWidth
+                                            fullWidth
                                         />
                                     </Grid>
                                 </Grid>

frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Components/DetailLabResultList.tsx

@@ -61,7 +61,7 @@ export default function DetailLabResultList() {
                 {/* back button */}
                 <Grid item xs={12}>
                     <Box sx={{ display: 'flex', alignItems: 'center' }}>
-                        <IconButton size='large' color='inherit' onClick={() => navigate(`/case_management/daily_monitoring/${member_id}/claims`)} >
+                        <IconButton size='large' color='inherit' onClick={() => navigate(`/case_management/laboratorium_result/${member_id}/claims`)} >
                             <ArrowBackIosNew/>
                         </IconButton>
 

frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Model/Types.ts

@@ -45,7 +45,7 @@ export type DetailLabResultListType = {
     id              : string|null,
     claim_id        : string|null,
     claim_code      : string,
-    date            : string,
+    date            : string|null,
     location        : string,
     examination     : string,
     lab_result_file : LabResultFileStrType[],