matthias/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: matthias:a04577ac9e4c9183724bddcbf0ffc6248355e07e
Branches Tags
matthias:main
...
compare: matthias:3fca17f853c7716f2ca02891481abdbdd8212be5
Branches Tags
matthias:main

2 Commits
a04577ac9e ... 3fca17f853

Author SHA1 Message Date
Matthias Hochmeister
3fca17f853 update 2026-03-16 15:47:28 +01:00
Matthias Hochmeister
41f45acd1c update 2026-03-16 15:47:11 +01:00
2 changed files with 18 additions and 11 deletions
Expand all files Collapse all files

1
docker-compose.yml
View File

@@ -109,6 +109,7 @@ services:
DB_USER: ${POSTGRES_USER:-prod_user} DB_USER: ${POSTGRES_USER:-prod_user}
DB_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required} DB_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
SYNC_HTTP_PORT: 3001 SYNC_HTTP_PORT: 3001
FDISK_DEBUG_HTML: ${FDISK_DEBUG_HTML:-}
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy

22
frontend/src/pages/Kalender.tsx
View File

@@ -1519,10 +1519,11 @@ function VeranstaltungFormDialog({
onChange={(e) => { onChange={(e) => {
const raw = e.target.value; const raw = e.target.value;
if (!raw) return; if (!raw) return;
const iso = form.ganztaegig const d = form.ganztaegig
? new Date(raw + 'T00:00:00').toISOString() ? new Date(raw + 'T00:00:00')
: new Date(raw).toISOString(); : new Date(raw + ':00');
handleChange('datum_von', iso); if (isNaN(d.getTime())) return;
handleChange('datum_von', d.toISOString());
}} }}
InputLabelProps={{ shrink: true }} InputLabelProps={{ shrink: true }}
fullWidth fullWidth
@@ -1538,9 +1539,12 @@ function VeranstaltungFormDialog({
onChange={(e) => { onChange={(e) => {
const raw = e.target.value; const raw = e.target.value;
if (!raw) return; if (!raw) return;
const iso = form.ganztaegig const d = form.ganztaegig
? new Date(raw + 'T23:59:00').toISOString() ? new Date(raw + 'T23:59:00')
: new Date(raw).toISOString(); : new Date(raw + ':00');
if (isNaN(d.getTime())) return;
handleChange('datum_bis', d.toISOString());
}}
handleChange('datum_bis', iso); handleChange('datum_bis', iso);
}} }}
InputLabelProps={{ shrink: true }} InputLabelProps={{ shrink: true }}
@@ -2981,11 +2985,13 @@ export default function Kalender() {
Von: {detailBooking.gebucht_von_name} Von: {detailBooking.gebucht_von_name}
</Typography> </Typography>
)} )}
{canWriteBookings && ( {(canWriteBookings || detailBooking.gebucht_von === user?.id) && (
<Box sx={{ mt: 1.5, display: 'flex', gap: 1 }}> <Box sx={{ mt: 1.5, display: 'flex', gap: 1 }}>
{canWriteBookings && (
<Button size="small" startIcon={<EditIcon />} onClick={handleOpenBookingEdit}> <Button size="small" startIcon={<EditIcon />} onClick={handleOpenBookingEdit}>
Bearbeiten Bearbeiten
</Button> </Button>
)}
<Button <Button
size="small" size="small"
color="error" color="error"