Date fields as dd/mm/yyyy; no spinner on number fields; empty billing fines default to 0
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
174734c359
commit
cbdfe423c1
|
|
@ -0,0 +1,85 @@
|
||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { IconButton, InputAdornment, TextField, type TextFieldProps } from '@mui/material';
|
||||||
|
import CalendarMonthIcon from '@mui/icons-material/CalendarMonth';
|
||||||
|
|
||||||
|
/** yyyy-mm-dd (or an ISO date/time) -> dd/mm/yyyy ('' when not a date). */
|
||||||
|
export function isoToDisplay(v: unknown): string {
|
||||||
|
const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(String(v ?? ''));
|
||||||
|
return m ? `${m[3]}/${m[2]}/${m[1]}` : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** dd/mm/yyyy -> yyyy-mm-dd, or '' when incomplete / not a real calendar date. */
|
||||||
|
function displayToIso(text: string): string {
|
||||||
|
const m = /^(\d{2})\/(\d{2})\/(\d{4})$/.exec(text);
|
||||||
|
if (!m) return '';
|
||||||
|
const d = Number(m[1]), mo = Number(m[2]), y = Number(m[3]);
|
||||||
|
const dt = new Date(y, mo - 1, d);
|
||||||
|
return dt.getFullYear() === y && dt.getMonth() === mo - 1 && dt.getDate() === d ? `${m[3]}-${m[2]}-${m[1]}` : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Digits typed so far -> dd, dd/mm, dd/mm/yyyy. */
|
||||||
|
function mask(raw: string): string {
|
||||||
|
const d = raw.replace(/\D/g, '').slice(0, 8);
|
||||||
|
if (d.length <= 2) return d;
|
||||||
|
if (d.length <= 4) return `${d.slice(0, 2)}/${d.slice(2)}`;
|
||||||
|
return `${d.slice(0, 2)}/${d.slice(2, 4)}/${d.slice(4)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
type Props = Omit<TextFieldProps, 'value' | 'onChange' | 'type'> & {
|
||||||
|
/** yyyy-mm-dd (the form / API format) */
|
||||||
|
value: string;
|
||||||
|
onChange: (value: string) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Date input that always reads and shows dd/mm/yyyy (the native date input follows the browser language).
|
||||||
|
* The value going in and out is yyyy-mm-dd; it is '' until a complete, valid date is typed. A calendar button opens the picker.
|
||||||
|
*/
|
||||||
|
export function DateField({ value, onChange, slotProps, disabled, ...rest }: Props) {
|
||||||
|
const [text, setText] = useState(isoToDisplay(value));
|
||||||
|
const picker = useRef<HTMLInputElement>(null);
|
||||||
|
|
||||||
|
// follow the outside value (form reset, prefill) without fighting the user's typing
|
||||||
|
useEffect(() => {
|
||||||
|
if (displayToIso(text) !== (value ? value.slice(0, 10) : '')) setText(isoToDisplay(value));
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [value]);
|
||||||
|
|
||||||
|
const typed = (raw: string) => {
|
||||||
|
const next = mask(raw);
|
||||||
|
setText(next);
|
||||||
|
onChange(displayToIso(next));
|
||||||
|
};
|
||||||
|
|
||||||
|
const inputSlot = (slotProps as { htmlInput?: object } | undefined)?.htmlInput;
|
||||||
|
return (
|
||||||
|
<TextField
|
||||||
|
{...rest}
|
||||||
|
disabled={disabled}
|
||||||
|
value={text}
|
||||||
|
onChange={(e) => typed(e.target.value)}
|
||||||
|
placeholder="dd/mm/yyyy"
|
||||||
|
slotProps={{
|
||||||
|
...slotProps,
|
||||||
|
inputLabel: { shrink: true },
|
||||||
|
htmlInput: { ...inputSlot, dir: 'ltr', inputMode: 'numeric', maxLength: 10, style: { textAlign: 'start' } },
|
||||||
|
input: {
|
||||||
|
endAdornment: (
|
||||||
|
<InputAdornment position="end">
|
||||||
|
<IconButton size="small" edge="end" tabIndex={-1} disabled={disabled} onClick={() => picker.current?.showPicker?.()}>
|
||||||
|
<CalendarMonthIcon fontSize="small" />
|
||||||
|
</IconButton>
|
||||||
|
{/* the native picker only supplies the calendar; its value is converted to the text above */}
|
||||||
|
<input
|
||||||
|
ref={picker} type="date" tabIndex={-1} aria-hidden
|
||||||
|
value={value ? value.slice(0, 10) : ''}
|
||||||
|
onChange={(e) => { setText(isoToDisplay(e.target.value)); onChange(e.target.value); }}
|
||||||
|
style={{ position: 'absolute', opacity: 0, width: 0, height: 0, pointerEvents: 'none' }}
|
||||||
|
/>
|
||||||
|
</InputAdornment>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { Autocomplete, Checkbox, FormControl, FormControlLabel, FormHelperText, MenuItem, TextField } from '@mui/material';
|
import { Autocomplete, Checkbox, FormControl, FormControlLabel, FormHelperText, MenuItem, TextField } from '@mui/material';
|
||||||
|
import { DateField } from '@/components/DateField';
|
||||||
import { FileUpload } from '@/components/FileUpload';
|
import { FileUpload } from '@/components/FileUpload';
|
||||||
import { useOptions } from '@/components/meta/useOptions';
|
import { useOptions } from '@/components/meta/useOptions';
|
||||||
import type { FieldMeta, FilterMeta, FormValues, OptionItem } from '@/components/meta/types';
|
import type { FieldMeta, FilterMeta, FormValues, OptionItem } from '@/components/meta/types';
|
||||||
|
|
@ -17,6 +18,12 @@ export interface FieldControlProps {
|
||||||
idPrefix?: string;
|
idPrefix?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Hides the browser's up / down arrows of a number input. */
|
||||||
|
const NO_SPIN = {
|
||||||
|
'& input[type=number]': { MozAppearance: 'textfield' },
|
||||||
|
'& input[type=number]::-webkit-outer-spin-button, & input[type=number]::-webkit-inner-spin-button': { WebkitAppearance: 'none', margin: 0 },
|
||||||
|
};
|
||||||
|
|
||||||
const INPUT_MODE: Record<string, 'tel' | 'email' | 'text'> = { phone: 'tel', email: 'email', plate: 'text', code: 'text' };
|
const INPUT_MODE: Record<string, 'tel' | 'email' | 'text'> = { phone: 'tel', email: 'email', plate: 'text', code: 'text' };
|
||||||
|
|
||||||
/** One control for every field type. Every control is fullWidth so widths are identical inside a grid cell. */
|
/** One control for every field type. Every control is fullWidth so widths are identical inside a grid cell. */
|
||||||
|
|
@ -119,13 +126,7 @@ export function FieldControl({ field, value, onChange, values, error, disabled,
|
||||||
|
|
||||||
case 'date':
|
case 'date':
|
||||||
return (
|
return (
|
||||||
<TextField
|
<DateField {...common} value={String(value ?? '')} onChange={onChange} />
|
||||||
{...common}
|
|
||||||
type="date"
|
|
||||||
value={String(value ?? '')}
|
|
||||||
onChange={(e) => onChange(e.target.value)}
|
|
||||||
slotProps={{ inputLabel: { shrink: true }, htmlInput: { dir: 'ltr', lang: dir === 'rtl' ? 'ar' : 'en', style: align ?? { textAlign: dir === 'rtl' ? 'end' : 'start' } } }}
|
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
|
|
||||||
case 'number':
|
case 'number':
|
||||||
|
|
@ -135,6 +136,8 @@ export function FieldControl({ field, value, onChange, values, error, disabled,
|
||||||
type="number"
|
type="number"
|
||||||
value={value === undefined || value === null ? '' : String(value)}
|
value={value === undefined || value === null ? '' : String(value)}
|
||||||
onChange={(e) => onChange(e.target.value)}
|
onChange={(e) => onChange(e.target.value)}
|
||||||
|
onWheel={(e) => (e.target as HTMLElement).blur()}
|
||||||
|
sx={NO_SPIN}
|
||||||
slotProps={{ htmlInput: { ...htmlInput, dir: 'ltr', min: full.min, max: full.max, style: { textAlign: dir === 'rtl' ? 'end' : 'start' } } }}
|
slotProps={{ htmlInput: { ...htmlInput, dir: 'ltr', min: full.min, max: full.max, style: { textAlign: dir === 'rtl' ? 'end' : 'start' } } }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ import LocalShippingIcon from '@mui/icons-material/LocalShipping';
|
||||||
import SearchIcon from '@mui/icons-material/Search';
|
import SearchIcon from '@mui/icons-material/Search';
|
||||||
import { ApiError } from '@/api/client';
|
import { ApiError } from '@/api/client';
|
||||||
import { DataGrid } from '@/components/DataGrid';
|
import { DataGrid } from '@/components/DataGrid';
|
||||||
|
import { DateField } from '@/components/DateField';
|
||||||
import { DestinationGroups } from '@/components/DestinationGroups';
|
import { DestinationGroups } from '@/components/DestinationGroups';
|
||||||
import { LoadingBanner } from '@/components/LoadingBanner';
|
import { LoadingBanner } from '@/components/LoadingBanner';
|
||||||
import { MetaForm } from '@/components/MetaForm';
|
import { MetaForm } from '@/components/MetaForm';
|
||||||
|
|
@ -338,6 +339,9 @@ function PermitBar(props: {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** An empty fine box means 0. */
|
||||||
|
const zeroIfEmpty = (v: unknown) => (v === '' || v === null || v === undefined ? 0 : v);
|
||||||
|
|
||||||
export function BillingEntryPage() {
|
export function BillingEntryPage() {
|
||||||
const { t, tr } = useFeatureUi(strings);
|
const { t, tr } = useFeatureUi(strings);
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
@ -395,7 +399,7 @@ export function BillingEntryPage() {
|
||||||
new Promise<void>((resolve) => {
|
new Promise<void>((resolve) => {
|
||||||
setServerErrors({});
|
setServerErrors({});
|
||||||
add.mutate(
|
add.mutate(
|
||||||
{ ...payload, pn: Number(pn), scac: Number(scac) },
|
{ ...payload, demurrageFine: zeroIfEmpty(payload.demurrageFine), otherFine: zeroIfEmpty(payload.otherFine), pn: Number(pn), scac: Number(scac) },
|
||||||
{
|
{
|
||||||
onSuccess: () => { setPermit(null); setPn(''); resolve(); },
|
onSuccess: () => { setPermit(null); setPn(''); resolve(); },
|
||||||
onError: (e) => { setServerErrors({ ...e.fieldErrors }); resolve(); },
|
onError: (e) => { setServerErrors({ ...e.fieldErrors }); resolve(); },
|
||||||
|
|
@ -606,10 +610,9 @@ export function TenderOrderReportPage() {
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<Stack spacing={2}>
|
<Stack spacing={2}>
|
||||||
<TextField
|
<DateField
|
||||||
type="date" size="small" label={tr({ en: 'Order date', ar: 'تاريخ الطلبية' })}
|
size="small" label={tr({ en: 'Order date', ar: 'تاريخ الطلبية' })}
|
||||||
value={date} onChange={(e) => setDate(e.target.value)}
|
value={date} onChange={setDate} sx={{ maxWidth: 260 }}
|
||||||
slotProps={{ inputLabel: { shrink: true }, htmlInput: { dir: 'ltr' } }} sx={{ maxWidth: 260 }}
|
|
||||||
/>
|
/>
|
||||||
{!date && <Alert severity="info">{t('ord.orders.reportPickDate')}</Alert>}
|
{!date && <Alert severity="info">{t('ord.orders.reportPickDate')}</Alert>}
|
||||||
{q.isPending && date && <LoadingBanner variant="first" />}
|
{q.isPending && date && <LoadingBanner variant="first" />}
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ import LockIcon from '@mui/icons-material/Lock';
|
||||||
import PlaylistAddCheckIcon from '@mui/icons-material/PlaylistAddCheck';
|
import PlaylistAddCheckIcon from '@mui/icons-material/PlaylistAddCheck';
|
||||||
import ScaleIcon from '@mui/icons-material/Scale';
|
import ScaleIcon from '@mui/icons-material/Scale';
|
||||||
import { DataGrid } from '@/components/DataGrid';
|
import { DataGrid } from '@/components/DataGrid';
|
||||||
|
import { DateField } from '@/components/DateField';
|
||||||
import { FormCard, FormGrid } from '@/components/FormCard';
|
import { FormCard, FormGrid } from '@/components/FormCard';
|
||||||
// the shared framed section look (see components/SectionPaper): every Paper on the permit screens uses it
|
// the shared framed section look (see components/SectionPaper): every Paper on the permit screens uses it
|
||||||
import { SectionPaper as Paper } from '@/components/SectionPaper';
|
import { SectionPaper as Paper } from '@/components/SectionPaper';
|
||||||
|
|
@ -812,7 +813,7 @@ function ProcessTab() {
|
||||||
<Typography variant="subtitle1">{t('pm.proc.withDest')}</Typography>
|
<Typography variant="subtitle1">{t('pm.proc.withDest')}</Typography>
|
||||||
<NumberField label={t('pm.order.pn')} value={pn} onChange={setPn} />
|
<NumberField label={t('pm.order.pn')} value={pn} onChange={setPn} />
|
||||||
<NumberField label={t('pm.manual.order')} value={orderId} onChange={setOrderId} />
|
<NumberField label={t('pm.manual.order')} value={orderId} onChange={setOrderId} />
|
||||||
<TextField size="small" sx={FIELD_SX} type="date" label={t('pm.manual.orderDate')} value={date} onChange={(e) => setDate(e.target.value)} slotProps={{ inputLabel: { shrink: true } }} />
|
<DateField size="small" sx={FIELD_SX} label={t('pm.manual.orderDate')} value={date} onChange={setDate} />
|
||||||
<Box><Button variant="contained" disabled={!pn || !orderId || !date}
|
<Box><Button variant="contained" disabled={!pn || !orderId || !date}
|
||||||
onClick={async () => { if (await confirm({ message: t('pm.proc.confirm') })) withDest.mutate({ pn, locations: Number(orderId), orderDate: date, reservedQueue: false }); }}>{t('common.save')}</Button></Box>
|
onClick={async () => { if (await confirm({ message: t('pm.proc.confirm') })) withDest.mutate({ pn, locations: Number(orderId), orderDate: date, reservedQueue: false }); }}>{t('common.save')}</Button></Box>
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import { DateField } from '@/components/DateField';
|
||||||
import { useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from 'react';
|
import { useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from 'react';
|
||||||
import { useParams, useSearchParams } from 'react-router-dom';
|
import { useParams, useSearchParams } from 'react-router-dom';
|
||||||
import {
|
import {
|
||||||
|
|
@ -71,10 +72,8 @@ function useRange(opts: { company?: boolean; cargo?: boolean }) {
|
||||||
const bar = (
|
const bar = (
|
||||||
<Paper variant="outlined" sx={{ p: 2, mb: 2, '@media print': { display: 'none' } }}>
|
<Paper variant="outlined" sx={{ p: 2, mb: 2, '@media print': { display: 'none' } }}>
|
||||||
<Stack direction="row" spacing={2} useFlexGap sx={{ flexWrap: 'wrap', alignItems: 'flex-start' }} onKeyDown={onKey}>
|
<Stack direction="row" spacing={2} useFlexGap sx={{ flexWrap: 'wrap', alignItems: 'flex-start' }} onKeyDown={onKey}>
|
||||||
<TextField type="date" label={t('rpt.from')} value={from} onChange={(e) => setFrom(e.target.value)} required
|
<DateField label={t('rpt.from')} value={from} onChange={setFrom} required sx={{ width: 200 }} error={!!err && !from} />
|
||||||
slotProps={{ inputLabel: { shrink: true } }} sx={{ width: 200 }} error={!!err && !from} />
|
<DateField label={t('rpt.to')} value={to} onChange={setTo} required sx={{ width: 200 }} error={!!err && !to} />
|
||||||
<TextField type="date" label={t('rpt.to')} value={to} onChange={(e) => setTo(e.target.value)} required
|
|
||||||
slotProps={{ inputLabel: { shrink: true } }} sx={{ width: 200 }} error={!!err && !to} />
|
|
||||||
{opts.company && (
|
{opts.company && (
|
||||||
<TextField select label={t('rpt.company')} value={scac} onChange={(e) => setScac(e.target.value)} sx={{ width: 260 }}>
|
<TextField select label={t('rpt.company')} value={scac} onChange={(e) => setScac(e.target.value)} sx={{ width: 260 }}>
|
||||||
<MenuItem value="">{t('rpt.allCompanies')}</MenuItem>
|
<MenuItem value="">{t('rpt.allCompanies')}</MenuItem>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue