Update data

This commit is contained in:
ivan-sim
2024-01-25 10:47:03 +07:00
parent d76865f336
commit f3b69c4540
6 changed files with 22 additions and 7 deletions

View File

@@ -334,7 +334,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
onChange={(newValue:any) => {
setDischargeDate( (newValue));
}}
inputFormat="dd-MM-yyyy"
inputFormat="dd-MM-yyyy HH:mm"
renderInput={(params) => <TextField sx={{width:'40%'}} {...params} required/>}
/>
</LocalizationProvider>

View File

@@ -198,7 +198,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
onChange={(newValue:any) => {
setSubmissionDate( (newValue));
}}
inputFormat="dd-MM-yyyy"
inputFormat="dd-MM-yyyy HH:mm"
renderInput={(params) => <TextField sx={{width:'40%'}} {...params} required/>}
/>
</LocalizationProvider>

View File

@@ -15,7 +15,7 @@ import palette from '../../theme/palette';
//import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
import { useSearchParams, useNavigate } from 'react-router-dom';
import { fDate, fDateSuffix } from '../../utils/formatTime';
import { fDate, fDateSuffix, fDateTime } from '../../utils/formatTime';
import Typography from '@mui/material/Typography';
import { format } from 'date-fns';
import TableMoreMenu from '../../components/table/TableMoreMenu';
@@ -264,6 +264,12 @@ export default function TableListFinalLog() {
label: localeData.txtServiceType,
isSort: true,
},
{
id: 'discharge_date',
align: 'center',
label: localeData.txtDischargeDate,
isSort: true,
},
{
id: 'status',
align: 'center',
@@ -358,9 +364,16 @@ export default function TableListFinalLog() {
),
submission_date:
<Label>
{obj.submission_date ? fDateSuffix(obj.submission_date) : ''}
{obj.submission_date ? fDateTime(obj.submission_date) : ''}
</Label>
,
discharge_date:
obj.discharge_date ? (
<Label>
{obj.discharge_date ? fDateTime(obj.discharge_date) : ''}
</Label>
) : ''
,
action:
<TableMoreMenu actions={
<>

View File

@@ -15,7 +15,7 @@ import palette from '../../theme/palette';
//import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
import { useSearchParams, useNavigate } from 'react-router-dom';
import { fDate, fDateSuffix } from '../../utils/formatTime';
import { fDate, fDateSuffix, fDateTime } from '../../utils/formatTime';
import Typography from '@mui/material/Typography';
import { format } from 'date-fns';
import TableMoreMenu from '../../components/table/TableMoreMenu';
@@ -356,7 +356,7 @@ export default function TableList() {
),
submission_date:
<Label>
{obj.submission_date ? fDateSuffix(obj.submission_date) : ''}
{obj.submission_date ? fDateTime(obj.submission_date) : ''}
</Label>
,
action:

View File

@@ -8,7 +8,7 @@ export function fDate(date: Date | string | number) {
}
export function fDateTime(date: Date | string | number) {
return format(new Date(date), 'dd MMM yyyy hh:mm');
return format(new Date(date), 'dd MMM yyyy HH:mm');
}
export function fTimestamp(date: Date | string | number) {