Compare commits

..

No commits in common. "0ab1a804ebb92d21b810264f2f08f087cce916c3" and "54d0048d5d4d32fdb9fa400a03fcfb0806dc9ab7" have entirely different histories.

6 changed files with 11 additions and 16 deletions

View File

@ -19,10 +19,6 @@ externalPort = 80
localPort = 33035 localPort = 33035
externalPort = 3001 externalPort = 3001
[[ports]]
localPort = 37125
externalPort = 4200
[[ports]] [[ports]]
localPort = 41343 localPort = 41343
externalPort = 3000 externalPort = 3000

View File

@ -184,7 +184,7 @@ export default function Sites() {
Aggiungi Sito Aggiungi Sito
</Button> </Button>
</DialogTrigger> </DialogTrigger>
<DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto"> <DialogContent className="max-w-2xl">
<DialogHeader> <DialogHeader>
<DialogTitle>Nuovo Sito</DialogTitle> <DialogTitle>Nuovo Sito</DialogTitle>
<DialogDescription> <DialogDescription>
@ -422,7 +422,7 @@ export default function Sites() {
{/* Edit Site Dialog */} {/* Edit Site Dialog */}
<Dialog open={!!editingSite} onOpenChange={(open) => !open && setEditingSite(null)}> <Dialog open={!!editingSite} onOpenChange={(open) => !open && setEditingSite(null)}>
<DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto"> <DialogContent className="max-w-2xl">
<DialogHeader> <DialogHeader>
<DialogTitle>Modifica Sito</DialogTitle> <DialogTitle>Modifica Sito</DialogTitle>
<DialogDescription> <DialogDescription>

View File

@ -659,6 +659,10 @@ export async function registerRoutes(app: Express): Promise<Server> {
try { try {
const dateStr = req.query.date as string || format(new Date(), "yyyy-MM-dd"); 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 // Ottieni tutti i siti attivi
const allSites = await db const allSites = await db
.select() .select()
@ -686,7 +690,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
return selectedDate >= contractStart && selectedDate <= contractEnd; return selectedDate >= contractStart && selectedDate <= contractEnd;
}); });
// Ottieni turni del giorno con assegnazioni (usando SQL date comparison) // Ottieni turni del giorno con assegnazioni
const dayShifts = await db const dayShifts = await db
.select({ .select({
shift: shifts, shift: shifts,
@ -696,7 +700,8 @@ export async function registerRoutes(app: Express): Promise<Server> {
.leftJoin(shiftAssignments, eq(shifts.id, shiftAssignments.shiftId)) .leftJoin(shiftAssignments, eq(shifts.id, shiftAssignments.shiftId))
.where( .where(
and( and(
sql`DATE(${shifts.startTime}) = ${dateStr}`, gte(shifts.startTime, startOfDay),
lte(shifts.startTime, endOfDay),
ne(shifts.status, "cancelled") ne(shifts.status, "cancelled")
) )
) )

View File

@ -1,13 +1,7 @@
{ {
"version": "1.0.18", "version": "1.0.17",
"lastUpdate": "2025-10-17T15:56:56.628Z", "lastUpdate": "2025-10-17T15:41:26.844Z",
"changelog": [ "changelog": [
{
"version": "1.0.18",
"date": "2025-10-17",
"type": "patch",
"description": "Deployment automatico v1.0.18"
},
{ {
"version": "1.0.17", "version": "1.0.17",
"date": "2025-10-17", "date": "2025-10-17",