From 59dc00f0485ea58898efa1fb6d264e04d419951c Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Wed, 6 May 2026 09:42:34 +0200 Subject: [PATCH] ok --- .../components/servizio/parametri_ricerca.tsx | 5 +- .../src/components/tables/richieste-table.tsx | 53 ++++++++++++------- .../server/controllers/servizio.controller.ts | 2 + 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/apps/infoalloggi/src/components/servizio/parametri_ricerca.tsx b/apps/infoalloggi/src/components/servizio/parametri_ricerca.tsx index 3c67bfe..bb36a80 100644 --- a/apps/infoalloggi/src/components/servizio/parametri_ricerca.tsx +++ b/apps/infoalloggi/src/components/servizio/parametri_ricerca.tsx @@ -1,5 +1,6 @@ import { format } from "date-fns"; -import { Check, SlidersHorizontal } from "lucide-react" +import { Check, SlidersHorizontal } from "lucide-react"; + import { useState } from "react"; import toast from "react-hot-toast"; import { z } from "zod/v4"; @@ -524,7 +525,7 @@ const FormServizio = ({ id="scadenza_motivazione_transitoria" onChange={field.onChange} placeholder={t.anagrafica.scegli_data} - value={field.value || new Date()} + value={field.value} /> )} diff --git a/apps/infoalloggi/src/components/tables/richieste-table.tsx b/apps/infoalloggi/src/components/tables/richieste-table.tsx index 16f1303..816dba9 100644 --- a/apps/infoalloggi/src/components/tables/richieste-table.tsx +++ b/apps/infoalloggi/src/components/tables/richieste-table.tsx @@ -176,6 +176,7 @@ export const RichiesteTable = ({ data }: RichiesteTableProps) => { const columns_titles = { id: "ID Ordine", + created_at: "Creato il", username: "Utente", note: "Note", decorrenza: "Decorrenza", @@ -184,7 +185,7 @@ export const RichiesteTable = ({ data }: RichiesteTableProps) => { annunci: "Annunci", ordini: "Ordini", interruzione_expires_at: "Scad. interr.", - actions: "Azioni", + actions: "Apri", }; const statusOptions = Object.entries(StatusMapping).map(([key, label]) => ({ label, @@ -219,12 +220,44 @@ export const RichiesteTable = ({ data }: RichiesteTableProps) => { }; const columns: ColumnDef[] = [ + { + cell: ({ row }) => { + return ( + + + + ); + }, + header: ({ column }) => ( + + ), + enableHiding: false, + id: "actions", + }, { accessorKey: "id", cell: () => null, enableHiding: false, header: () => null, }, + { + accessorKey: "created_at", + sortingFn: "datetime", + cell: ({ row }) => { + return

{format(row.original.created_at, "dd/MM")}

; + }, + header: ({ column }) => ( + + ), + }, { accessorKey: "username", @@ -628,22 +661,6 @@ export const RichiesteTable = ({ data }: RichiesteTableProps) => { ), enableSorting: false, }, - { - cell: ({ row }) => { - return ( - - - - ); - }, - enableHiding: false, - id: "actions", - }, ]; const pinnedFiltri: PinnedFiltro[] = [ @@ -666,7 +683,7 @@ export const RichiesteTable = ({ data }: RichiesteTableProps) => { columns={columns} columns_titles={columns_titles} data={tabledata} - defaultSort={[{ desc: true, id: "decorrenza" }]} + defaultSort={[{ desc: true, id: "created_at" }]} onTableInit={(t) => (tableRef.current = t)} pinnedFiltri={pinnedFiltri} searchColumn={searchFiltro} diff --git a/apps/infoalloggi/src/server/controllers/servizio.controller.ts b/apps/infoalloggi/src/server/controllers/servizio.controller.ts index 719970a..f1d3aba 100644 --- a/apps/infoalloggi/src/server/controllers/servizio.controller.ts +++ b/apps/infoalloggi/src/server/controllers/servizio.controller.ts @@ -1139,6 +1139,7 @@ export const getCompatibileAnnunci = async ({ export type RichiesteData = Pick< Servizio, + | "created_at" | "servizio_id" | "user_id" | "isInterrotto" @@ -1180,6 +1181,7 @@ export const getRichieste = async (): Promise => { .innerJoin("users", "users.id", "servizio.user_id") .select([ "servizio.servizio_id", + "servizio.created_at", "servizio.user_id", "servizio.isInterrotto", "servizio.isOkAcconto",