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

bug fixes

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-03-03 14:45:46 +01:00
parent 004b141cab
commit 5dfaf7db54
11 changed files with 166 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/controllers/atemschutz.controller.ts
View File

@@ -18,9 +18,11 @@ function getUserId(req: Request): string {
// ── Controller ────────────────────────────────────────────────────────────────
class AtemschutzController {
async list(_req: Request, res: Response): Promise<void> {
async list(req: Request, res: Response): Promise<void> {
try {
const records = await atemschutzService.getAll();
const userGroups: string[] = (req.user as any)?.groups ?? [];
const userId = getUserId(req);
const records = await atemschutzService.getAll(userGroups, userId);
res.status(200).json({ success: true, data: records });
} catch (error) {
logger.error('Atemschutz list error', { error });
@@ -47,9 +49,11 @@ class AtemschutzController {
}
}
async getStats(_req: Request, res: Response): Promise<void> {
async getStats(req: Request, res: Response): Promise<void> {
try {
const stats = await atemschutzService.getStats();
const userGroups: string[] = (req.user as any)?.groups ?? [];
const userId = getUserId(req);
const stats = await atemschutzService.getStats(userGroups, userId);
res.status(200).json({ success: true, data: stats });
} catch (error) {
logger.error('Atemschutz getStats error', { error });

18
backend/src/controllers/events.controller.ts
View File

@@ -265,6 +265,24 @@ class EventsController {
}
};
// -------------------------------------------------------------------------
// POST /api/events/:id/delete (hard delete)
// -------------------------------------------------------------------------
deleteEvent = async (req: Request, res: Response): Promise<void> => {
try {
const { id } = req.params as Record<string, string>;
const deleted = await eventsService.deleteEvent(id);
if (!deleted) {
res.status(404).json({ success: false, message: 'Veranstaltung nicht gefunden' });
return;
}
res.json({ success: true, message: 'Veranstaltung wurde gelöscht' });
} catch (error) {
logger.error('deleteEvent error', { error });
res.status(500).json({ success: false, message: 'Fehler beim Löschen der Veranstaltung' });
}
};
// -------------------------------------------------------------------------
// GET /api/events/calendar-token
// -------------------------------------------------------------------------

4
backend/src/routes/atemschutz.routes.ts
View File

@@ -3,8 +3,8 @@ import atemschutzController from '../controllers/atemschutz.controller';
import { authenticate } from '../middleware/auth.middleware';
import { requireGroups } from '../middleware/rbac.middleware';
const ADMIN_GROUPS = ['dashboard_admin'];
const WRITE_GROUPS = ['dashboard_admin', 'dashboard_atemschutz'];
const ADMIN_GROUPS = ['dashboard_admin', 'dashboard_kommando', 'dashboard_atemschutz', 'dashboard_moderator'];
const WRITE_GROUPS = ['dashboard_admin', 'dashboard_kommando', 'dashboard_atemschutz', 'dashboard_moderator'];
const router = Router();

11
backend/src/routes/events.routes.ts
View File

@@ -143,4 +143,15 @@ router.delete(
eventsController.cancelEvent.bind(eventsController)
);
/**
* POST /api/events/:id/delete
* Hard-delete an event permanently. Requires admin or moderator.
*/
router.post(
'/:id/delete',
authenticate,
requireGroups(WRITE_GROUPS),
eventsController.deleteEvent.bind(eventsController)
);
export default router;

32
backend/src/services/atemschutz.service.ts
View File

@@ -8,19 +8,31 @@ import {
UpdateAtemschutzData,
} from '../models/atemschutz.model';
const ATEMSCHUTZ_PRIVILEGED = ['dashboard_admin', 'dashboard_kommando', 'dashboard_atemschutz', 'dashboard_moderator'];
class AtemschutzService {
// =========================================================================
// ÜBERSICHT (ALL RECORDS)
// =========================================================================
async getAll(): Promise<AtemschutzUebersicht[]> {
async getAll(userGroups: string[], userId: string): Promise<AtemschutzUebersicht[]> {
const isPrivileged = userGroups.some(g => ATEMSCHUTZ_PRIVILEGED.includes(g));
try {
const result = await pool.query(`
let result;
if (isPrivileged) {
result = await pool.query(`
SELECT *
FROM atemschutz_uebersicht
WHERE mitglied_status IS NULL OR mitglied_status IN ('aktiv', 'anwärter')
ORDER BY user_family_name, user_given_name
`);
} else {
result = await pool.query(`
SELECT *
FROM atemschutz_uebersicht
WHERE user_id = $1
`, [userId]);
}
return result.rows.map((row) => ({
...row,
@@ -208,7 +220,21 @@ class AtemschutzService {
// DASHBOARD KPI / STATISTIKEN
// =========================================================================
async getStats(): Promise<AtemschutzStats> {
async getStats(userGroups: string[], userId: string): Promise<AtemschutzStats> {
const isPrivileged = userGroups.some(g => ATEMSCHUTZ_PRIVILEGED.includes(g));
if (!isPrivileged) {
return {
total: 0,
mitLehrgang: 0,
untersuchungGueltig: 0,
untersuchungAbgelaufen: 0,
untersuchungBaldFaellig: 0,
leistungstestGueltig: 0,
leistungstestAbgelaufen: 0,
leistungstestBaldFaellig: 0,
einsatzbereit: 0,
};
}
try {
const result = await pool.query(`
SELECT

18
backend/src/services/events.service.ts
View File

@@ -490,6 +490,24 @@ class EventsService {
}
}
/**
* Hard-deletes an event (and any recurrence children) from the database.
* Returns true if the event was found and deleted, false if not found.
*/
async deleteEvent(id: string): Promise<boolean> {
logger.info('Hard-deleting event', { id });
// Delete recurrence children first (wiederholung_parent_id references)
await pool.query(
`DELETE FROM veranstaltungen WHERE wiederholung_parent_id = $1`,
[id]
);
const result = await pool.query(
`DELETE FROM veranstaltungen WHERE id = $1`,
[id]
);
return (result.rowCount ?? 0) > 0;
}
// -------------------------------------------------------------------------
// ICAL TOKEN
// -------------------------------------------------------------------------

10
frontend/src/pages/Atemschutz.tsx
View File

@@ -152,7 +152,9 @@ const StatCard: React.FC<StatCardProps> = ({ label, value, color, bgcolor }) =>
function Atemschutz() {
const notification = useNotification();
const { user } = useAuth();
const canWrite = user?.groups?.some(g => ['dashboard_admin', 'dashboard_atemschutz'].includes(g)) ?? false;
const ATEMSCHUTZ_PRIVILEGED = ['dashboard_admin', 'dashboard_kommando', 'dashboard_atemschutz', 'dashboard_moderator'];
const canViewAll = user?.groups?.some(g => ATEMSCHUTZ_PRIVILEGED.includes(g)) ?? false;
const canWrite = canViewAll;
// Data state
const [traeger, setTraeger] = useState<AtemschutzUebersicht[]>([]);
@@ -359,7 +361,7 @@ function Atemschutz() {
<Typography variant="h4" gutterBottom sx={{ mb: 0 }}>
Atemschutzverwaltung
</Typography>
{!loading && stats && (
{!loading && stats && canViewAll && (
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1, mt: 0.5 }}>
<Typography variant="body2" color="text.secondary">
{stats.total} Gesamt
@@ -382,7 +384,7 @@ function Atemschutz() {
</Box>
{/* Stats cards */}
{!loading && stats && (
{!loading && stats && canViewAll && (
<Grid container spacing={2} sx={{ mb: 3 }}>
<Grid item xs={6} sm={3}>
<StatCard
@@ -405,6 +407,7 @@ function Atemschutz() {
)}
{/* Search bar */}
{canViewAll && (
<Box sx={{ mb: 3 }}>
<TextField
placeholder="Suchen (Name, E-Mail, Dienstgrad...)"
@@ -421,6 +424,7 @@ function Atemschutz() {
}}
/>
</Box>
)}
{/* Loading state */}
{loading && (

7
frontend/src/pages/Dashboard.tsx
View File

@@ -33,12 +33,7 @@ function Dashboard() {
<Box
sx={{
display: 'grid',
gridTemplateColumns: {
xs: '1fr',
sm: 'repeat(2, 1fr)',
lg: 'repeat(3, 1fr)',
xl: 'repeat(4, 1fr)',
},
gridTemplateColumns: 'repeat(auto-fit, minmax(280px, 1fr))',
gap: 2.5,
alignItems: 'start',
}}

12
frontend/src/pages/Profile.tsx
View File

@@ -41,6 +41,8 @@ function Profile() {
});
};
const dashboardGroups = (user.groups ?? []).filter((g) => g.startsWith('dashboard_'));
return (
<DashboardLayout>
<Container maxWidth="lg">
@@ -93,7 +95,7 @@ function Profile() {
<Divider sx={{ my: 2 }} />
{/* Groups/Roles */}
{user.groups && user.groups.length > 0 && (
{dashboardGroups.length > 0 && (
<Box sx={{ mt: 2 }}>
<Typography
variant="subtitle2"
@@ -105,9 +107,11 @@ function Profile() {
Gruppen
</Typography>
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1, mt: 1 }}>
{user.groups.map((group) => (
<Chip key={group} label={group} size="small" color="primary" />
))}
{dashboardGroups.map((group) => {
const name = group.replace(/^dashboard_/, '');
const label = name.charAt(0).toUpperCase() + name.slice(1);
return <Chip key={group} label={label} size="small" color="primary" />;
})}
</Box>
</Box>
)}

56
frontend/src/pages/Veranstaltungen.tsx
View File

@@ -49,6 +49,7 @@ import {
Today as TodayIcon,
IosShare,
Event as EventIcon,
Delete as DeleteIcon,
} from '@mui/icons-material';
import DashboardLayout from '../components/dashboard/DashboardLayout';
import { useAuth } from '../contexts/AuthContext';
@@ -851,9 +852,10 @@ interface ListViewProps {
canWrite: boolean;
onEdit: (ev: VeranstaltungListItem) => void;
onCancel: (id: string) => void;
onDelete: (id: string) => void;
}
function EventListView({ events, canWrite, onEdit, onCancel }: ListViewProps) {
function EventListView({ events, canWrite, onEdit, onCancel, onDelete }: ListViewProps) {
if (events.length === 0) {
return (
<Alert severity="info" sx={{ mt: 2 }}>
@@ -945,9 +947,16 @@ function EventListView({ events, canWrite, onEdit, onCancel }: ListViewProps) {
<IconButton size="small" onClick={() => onEdit(ev)}>
<EditIcon fontSize="small" />
</IconButton>
<Tooltip title="Stornieren">
<IconButton size="small" color="error" onClick={() => onCancel(ev.id)}>
<CancelIcon fontSize="small" />
</IconButton>
</Tooltip>
<Tooltip title="Löschen">
<IconButton size="small" color="error" onClick={() => onDelete(ev.id)}>
<DeleteIcon fontSize="small" />
</IconButton>
</Tooltip>
</Box>
)}
</ListItem>
@@ -996,6 +1005,10 @@ export default function Veranstaltungen() {
const [cancelGrund, setCancelGrund] = useState('');
const [cancelLoading, setCancelLoading] = useState(false);
// Delete dialog
const [deleteId, setDeleteId] = useState<string | null>(null);
const [deleteLoading, setDeleteLoading] = useState(false);
// iCal dialog
const [icalOpen, setIcalOpen] = useState(false);
@@ -1100,6 +1113,22 @@ export default function Veranstaltungen() {
}
};
const handleDeleteEvent = async () => {
if (!deleteId) return;
setDeleteLoading(true);
try {
await eventsApi.deleteEvent(deleteId);
setDeleteId(null);
loadData();
notification.showSuccess('Veranstaltung wurde gelöscht');
} catch (e: unknown) {
const msg = e instanceof Error ? e.message : 'Fehler beim Löschen';
notification.showError(msg);
} finally {
setDeleteLoading(false);
}
};
// ---------------------------------------------------------------------------
// Filtered events for list view
// ---------------------------------------------------------------------------
@@ -1246,6 +1275,7 @@ export default function Veranstaltungen() {
canWrite={canWrite}
onEdit={(ev) => { setEditingEvent(ev); setFormOpen(true); }}
onCancel={(id) => { setCancelId(id); setCancelGrund(''); }}
onDelete={(id) => setDeleteId(id)}
/>
</Paper>
)}
@@ -1289,16 +1319,16 @@ export default function Veranstaltungen() {
maxWidth="xs"
fullWidth
>
<DialogTitle>Veranstaltung absagen</DialogTitle>
<DialogTitle>Veranstaltung stornieren</DialogTitle>
<DialogContent>
<DialogContentText sx={{ mb: 2 }}>
Bitte gib einen Grund für die Absage an (mind. 5 Zeichen).
Bitte gib einen Grund für die Stornierung an (mind. 5 Zeichen).
</DialogContentText>
<TextField
fullWidth
multiline
rows={3}
label="Absagegrund"
label="Stornierungsgrund"
value={cancelGrund}
onChange={(e) => setCancelGrund(e.target.value)}
autoFocus
@@ -1312,7 +1342,23 @@ export default function Veranstaltungen() {
onClick={handleCancelEvent}
disabled={cancelGrund.trim().length < 5 || cancelLoading}
>
{cancelLoading ? <CircularProgress size={20} /> : 'Absagen'}
{cancelLoading ? <CircularProgress size={20} /> : 'Stornieren'}
</Button>
</DialogActions>
</Dialog>
{/* Delete Dialog */}
<Dialog open={Boolean(deleteId)} onClose={() => setDeleteId(null)} maxWidth="xs" fullWidth>
<DialogTitle>Veranstaltung endgültig löschen</DialogTitle>
<DialogContent>
<DialogContentText>
Soll diese Veranstaltung wirklich endgültig gelöscht werden? Diese Aktion kann nicht rückgängig gemacht werden.
</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={() => setDeleteId(null)}>Abbrechen</Button>
<Button variant="contained" color="error" onClick={handleDeleteEvent} disabled={deleteLoading}>
{deleteLoading ? <CircularProgress size={20} /> : 'Endgültig löschen'}
</Button>
</DialogActions>
</Dialog>

5
frontend/src/services/events.ts
View File

@@ -129,6 +129,11 @@ export const eventsApi = {
.then(() => undefined);
},
/** Hard-delete an event permanently */
deleteEvent(id: string): Promise<void> {
return api.post(`/api/events/${id}/delete`).then(() => undefined);
},
// -------------------------------------------------------------------------
// iCal
// -------------------------------------------------------------------------