From 91d6416198aa0eff364cebf82406b1d03ae6a09c Mon Sep 17 00:00:00 2001 From: Samer Salameh Date: Thu, 19 Nov 2026 09:35:04 +0300 Subject: [PATCH] Registry: fix trailers table alignment in truck view, add created on/by, default new driver nationality to Jordan Co-Authored-By: Claude Sonnet 5.5 --- .../features/grains-registry/meta/trucks.ts | 2 ++ web/src/features/grains-registry/pages.tsx | 28 +++++++++++++------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/web/src/features/grains-registry/meta/trucks.ts b/web/src/features/grains-registry/meta/trucks.ts index a6ed851..158e79d 100644 --- a/web/src/features/grains-registry/meta/trucks.ts +++ b/web/src/features/grains-registry/meta/trucks.ts @@ -41,6 +41,8 @@ export function truckGrid(h: { isCompanyUser: boolean; onOpen: (r: TruckRow) => export const connectedTrailerColumns = (): GridMeta['columns'] => [ { key: 'tn', header: lbl('Trailer', 'المقطورة'), ltr: true }, { key: 'regDate', header: lbl('License expiry', 'انتهاء الترخيص'), format: 'date', ltr: true, hideBelow: 'md' }, + { key: 'createTimestamp', header: lbl('Created on', 'تاريخ الإنشاء'), format: 'datetime', ltr: true }, + { key: 'createUserId', header: lbl('Created by', 'أنشئ بواسطة'), ltr: true }, { key: 'statusCode', header: lbl('Status', 'الحالة'), format: 'status', statuses: registryStatuses }, ]; diff --git a/web/src/features/grains-registry/pages.tsx b/web/src/features/grains-registry/pages.tsx index fcde4ea..2d3d01f 100644 --- a/web/src/features/grains-registry/pages.tsx +++ b/web/src/features/grains-registry/pages.tsx @@ -1,5 +1,6 @@ import { useEffect, useMemo, useState } from 'react'; import { useNavigate, useParams, useSearchParams } from 'react-router-dom'; +import { useQuery } from '@tanstack/react-query'; import { Alert, Button, Dialog, DialogActions, DialogContent, DialogTitle, Paper, Stack, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, TextField, Typography, @@ -14,7 +15,7 @@ import { LoadingBanner } from '@/components/LoadingBanner'; import { MetaForm } from '@/components/MetaForm'; import { PageHeader } from '@/components/PageHeader'; import { StatusChip } from '@/components/StatusChip'; -import { formatDate, formatNumber } from '@/components/meta/format'; +import { formatDate, formatDateTime, formatNumber } from '@/components/meta/format'; import { useFeatureUi } from '@/i18n/useUi'; import { useConfirm } from '@/providers/ConfirmProvider'; import { useAuth } from '@/providers/AuthProvider'; @@ -23,7 +24,7 @@ import { downloadFile } from '../grains-orders/api'; import { useAddBlacklist, useCancelBlacklist, useCreateDriver, useCreateTrailer, useCreateTruck, useDestinationOptions, useDriver, useDriverAction, useLocationTruckCounts, usePermissions, useSaveWeighbridge, useTrailer, useTrailerAction, useTruck, - useTruckAction, useTruckTrailers, useUpdateTrailer, useUpdateTruck, + useTruckAction, useTruckTrailers, useUpdateTrailer, useUpdateTruck, nationalityOptions, } from './api'; import { Card, DestinationsPanel, DocumentsSection, num, withDocumentIds, type PendingDoc } from './components'; import { blacklistForm, blacklistGrid, weighbridgeForm } from './meta/blacklist'; @@ -275,10 +276,11 @@ function ConnectedTrailers({ rows, loading, truckId }: { rows: TrailerRow[]; loa {rows.map((r) => ( navigate(`${ROOT}/trailers/${r.id}?truckId=${truckId}`)}> - {r.tn} - {r.chasesNumber} - {formatDate(r.regDate, lang)} - + {r.tn} + {formatDate(r.regDate, lang)} + {formatDateTime(r.createTimestamp, lang)} + {r.createUserId} + ))} @@ -468,9 +470,19 @@ export function DriverPage() { const pending = usePendingDocs(); const d = driver.data; const meta = useMemo(() => driverForm({ isCreate: isNew }), [isNew]); + // new driver: nationality defaults to Jordan (found by name: the lookup code is a database value) + const nationalities = useQuery({ + queryKey: ['grains.registry.nationalities.default'], + queryFn: () => nationalityOptions.load({ lang: 'ar' }), + enabled: isNew, + staleTime: 5 * 60_000, + }); + const jordan = nationalities.data?.find((o) => /أردن|jordan/i.test(String(o.label)))?.value; const initial = useMemo( - () => (d ? { nnpn: d.nnpn, name: d.name, nat: d.nat, dln: d.dln, dled: isoDay(d.dled), cat: d.cat, mobile1: d.mobile1, mobile2: d.mobile2 } : {}), - [d], + () => (d + ? { nnpn: d.nnpn, name: d.name, nat: d.nat, dln: d.dln, dled: isoDay(d.dled), cat: d.cat, mobile1: d.mobile1, mobile2: d.mobile2 } + : jordan !== undefined ? { nat: jordan } : {}), + [d, jordan], ); if (loading || (!isNew && driver.isLoading)) return ;