From 3b2c347aecb5266b5667ae6ed9de960fdaa2d830 Mon Sep 17 00:00:00 2001 From: marco370 <48531002-marco370@users.noreply.replit.com> Date: Fri, 17 Oct 2025 15:54:45 +0000 Subject: [PATCH] Improve site creation and editing display and optimize date filtering Adjust dialog content height for better site form visibility and optimize shift retrieval by using SQL date comparison instead of date range filtering. Replit-Commit-Author: Agent Replit-Commit-Session-Id: e5565357-90e1-419f-b9a8-6ee8394636df Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/6d543d2c-20b9-4ea6-93fe-70fe9b1d9f80/e5565357-90e1-419f-b9a8-6ee8394636df/BjRzszS --- .replit | 4 ++++ client/src/pages/sites.tsx | 4 ++-- server/routes.ts | 9 ++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.replit b/.replit index c50bc15..f835bea 100644 --- a/.replit +++ b/.replit @@ -19,6 +19,10 @@ externalPort = 80 localPort = 33035 externalPort = 3001 +[[ports]] +localPort = 37125 +externalPort = 4200 + [[ports]] localPort = 41343 externalPort = 3000 diff --git a/client/src/pages/sites.tsx b/client/src/pages/sites.tsx index a72f34d..b63d6ec 100644 --- a/client/src/pages/sites.tsx +++ b/client/src/pages/sites.tsx @@ -184,7 +184,7 @@ export default function Sites() { Aggiungi Sito - + Nuovo Sito @@ -422,7 +422,7 @@ export default function Sites() { {/* Edit Site Dialog */} !open && setEditingSite(null)}> - + Modifica Sito diff --git a/server/routes.ts b/server/routes.ts index 87e71f1..676ff97 100644 --- a/server/routes.ts +++ b/server/routes.ts @@ -659,10 +659,6 @@ export async function registerRoutes(app: Express): Promise { try { const dateStr = req.query.date as string || format(new Date(), "yyyy-MM-dd"); - // Imposta inizio e fine giornata in UTC - const startOfDay = new Date(dateStr + "T00:00:00.000Z"); - const endOfDay = new Date(dateStr + "T23:59:59.999Z"); - // Ottieni tutti i siti attivi const allSites = await db .select() @@ -690,7 +686,7 @@ export async function registerRoutes(app: Express): Promise { return selectedDate >= contractStart && selectedDate <= contractEnd; }); - // Ottieni turni del giorno con assegnazioni + // Ottieni turni del giorno con assegnazioni (usando SQL date comparison) const dayShifts = await db .select({ shift: shifts, @@ -700,8 +696,7 @@ export async function registerRoutes(app: Express): Promise { .leftJoin(shiftAssignments, eq(shifts.id, shiftAssignments.shiftId)) .where( and( - gte(shifts.startTime, startOfDay), - lte(shifts.startTime, endOfDay), + sql`DATE(${shifts.startTime}) = ${dateStr}`, ne(shifts.status, "cancelled") ) )