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

Merge branch 'feature/laboratorium-result' into staging

Browse Source
This commit is contained in:
korospace
2023-10-30 11:02:59 +07:00
parent 4fec5df5e6 557b8713dd
commit e34ec97d27
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/dashboard/src/components/hook-form/RHFDatePickerV2.tsx
View File

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

1
frontend/dashboard/src/components/hook-form/RHFDatepicker.tsx
View File

@@ -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);
}}

10
frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Components/DetailLabResultForm.tsx
View File

@@ -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
// label=''
<RHFDatePickerV2
label=''
name="date"
// dateFormat='dd-mm-yyyy'
// fullWidth
dateFormat='dd-MMMM-yyyy'
fullWidth
/>
</Grid>
</Grid>

2
frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Components/DetailLabResultList.tsx
View File

@@ -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>

2
frontend/dashboard/src/pages/CaseManagement/LaboratoriumResult/Model/Types.ts
View File

@@ -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[],