From cbdfe423c12f4296a3691399e97dd526d95af3e0 Mon Sep 17 00:00:00 2001 From: Samer Salameh Date: Sun, 15 Nov 2026 15:58:07 +0300 Subject: [PATCH] Date fields as dd/mm/yyyy; no spinner on number fields; empty billing fines default to 0 Co-Authored-By: Claude Sonnet 5.5 --- web/src/components/DateField.tsx | 85 ++++++++++++++++++++ web/src/components/MetaForm/FieldControl.tsx | 17 ++-- web/src/features/grains-orders/pages.tsx | 13 +-- web/src/features/grains-permits/pages.tsx | 3 +- web/src/features/grains-reports/pages.tsx | 7 +- 5 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 web/src/components/DateField.tsx diff --git a/web/src/components/DateField.tsx b/web/src/components/DateField.tsx new file mode 100644 index 0000000..0322135 --- /dev/null +++ b/web/src/components/DateField.tsx @@ -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 & { + /** 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(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 ( + 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: ( + + picker.current?.showPicker?.()}> + + + {/* the native picker only supplies the calendar; its value is converted to the text above */} + { setText(isoToDisplay(e.target.value)); onChange(e.target.value); }} + style={{ position: 'absolute', opacity: 0, width: 0, height: 0, pointerEvents: 'none' }} + /> + + ), + }, + }} + /> + ); +} diff --git a/web/src/components/MetaForm/FieldControl.tsx b/web/src/components/MetaForm/FieldControl.tsx index 8aca9c2..636fe0f 100644 --- a/web/src/components/MetaForm/FieldControl.tsx +++ b/web/src/components/MetaForm/FieldControl.tsx @@ -1,4 +1,5 @@ import { Autocomplete, Checkbox, FormControl, FormControlLabel, FormHelperText, MenuItem, TextField } from '@mui/material'; +import { DateField } from '@/components/DateField'; import { FileUpload } from '@/components/FileUpload'; import { useOptions } from '@/components/meta/useOptions'; import type { FieldMeta, FilterMeta, FormValues, OptionItem } from '@/components/meta/types'; @@ -17,6 +18,12 @@ export interface FieldControlProps { 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 = { 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. */ @@ -119,13 +126,7 @@ export function FieldControl({ field, value, onChange, values, error, disabled, case 'date': return ( - 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': @@ -135,6 +136,8 @@ export function FieldControl({ field, value, onChange, values, error, disabled, type="number" value={value === undefined || value === null ? '' : String(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' } } }} /> ); diff --git a/web/src/features/grains-orders/pages.tsx b/web/src/features/grains-orders/pages.tsx index f144e3b..d0559ea 100644 --- a/web/src/features/grains-orders/pages.tsx +++ b/web/src/features/grains-orders/pages.tsx @@ -14,6 +14,7 @@ import LocalShippingIcon from '@mui/icons-material/LocalShipping'; import SearchIcon from '@mui/icons-material/Search'; import { ApiError } from '@/api/client'; import { DataGrid } from '@/components/DataGrid'; +import { DateField } from '@/components/DateField'; import { DestinationGroups } from '@/components/DestinationGroups'; import { LoadingBanner } from '@/components/LoadingBanner'; 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() { const { t, tr } = useFeatureUi(strings); const navigate = useNavigate(); @@ -395,7 +399,7 @@ export function BillingEntryPage() { new Promise((resolve) => { setServerErrors({}); 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(); }, onError: (e) => { setServerErrors({ ...e.fieldErrors }); resolve(); }, @@ -606,10 +610,9 @@ export function TenderOrderReportPage() { } /> - setDate(e.target.value)} - slotProps={{ inputLabel: { shrink: true }, htmlInput: { dir: 'ltr' } }} sx={{ maxWidth: 260 }} + {!date && {t('ord.orders.reportPickDate')}} {q.isPending && date && } diff --git a/web/src/features/grains-permits/pages.tsx b/web/src/features/grains-permits/pages.tsx index 8b5c124..3e7fc54 100644 --- a/web/src/features/grains-permits/pages.tsx +++ b/web/src/features/grains-permits/pages.tsx @@ -28,6 +28,7 @@ import LockIcon from '@mui/icons-material/Lock'; import PlaylistAddCheckIcon from '@mui/icons-material/PlaylistAddCheck'; import ScaleIcon from '@mui/icons-material/Scale'; import { DataGrid } from '@/components/DataGrid'; +import { DateField } from '@/components/DateField'; import { FormCard, FormGrid } from '@/components/FormCard'; // the shared framed section look (see components/SectionPaper): every Paper on the permit screens uses it import { SectionPaper as Paper } from '@/components/SectionPaper'; @@ -812,7 +813,7 @@ function ProcessTab() { {t('pm.proc.withDest')} - setDate(e.target.value)} slotProps={{ inputLabel: { shrink: true } }} /> + diff --git a/web/src/features/grains-reports/pages.tsx b/web/src/features/grains-reports/pages.tsx index 94a82a6..d685851 100644 --- a/web/src/features/grains-reports/pages.tsx +++ b/web/src/features/grains-reports/pages.tsx @@ -1,3 +1,4 @@ +import { DateField } from '@/components/DateField'; import { useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from 'react'; import { useParams, useSearchParams } from 'react-router-dom'; import { @@ -71,10 +72,8 @@ function useRange(opts: { company?: boolean; cargo?: boolean }) { const bar = ( - setFrom(e.target.value)} required - slotProps={{ inputLabel: { shrink: true } }} sx={{ width: 200 }} error={!!err && !from} /> - setTo(e.target.value)} required - slotProps={{ inputLabel: { shrink: true } }} sx={{ width: 200 }} error={!!err && !to} /> + + {opts.company && ( setScac(e.target.value)} sx={{ width: 260 }}> {t('rpt.allCompanies')}