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

rework internal order system

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-03-24 13:35:33 +01:00
parent 9a52e41372
commit 64663c0fe4
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/services/ausruestungsanfrage.service.ts
View File

@@ -288,7 +288,8 @@ async function getRequests(filters?: { status?: string; anfrager_id?: string })
`SELECT a.*, `SELECT a.*,
COALESCE(u.given_name || ' ' || u.family_name, u.name) AS anfrager_name, COALESCE(u.given_name || ' ' || u.family_name, u.name) AS anfrager_name,
COALESCE(u2.given_name || ' ' || u2.family_name, u2.name) AS bearbeitet_von_name, COALESCE(u2.given_name || ' ' || u2.family_name, u2.name) AS bearbeitet_von_name,
(SELECT COUNT(*)::int FROM ausruestung_anfrage_positionen p WHERE p.anfrage_id = a.id) AS positionen_count (SELECT COUNT(*)::int FROM ausruestung_anfrage_positionen p WHERE p.anfrage_id = a.id) AS positionen_count,
(SELECT COUNT(*)::int FROM ausruestung_anfrage_positionen p WHERE p.anfrage_id = a.id AND p.geliefert) AS geliefert_count
FROM ausruestung_anfragen a FROM ausruestung_anfragen a
LEFT JOIN users u ON u.id = a.anfrager_id LEFT JOIN users u ON u.id = a.anfrager_id
LEFT JOIN users u2 ON u2.id = a.bearbeitet_von LEFT JOIN users u2 ON u2.id = a.bearbeitet_von

6
frontend/src/pages/Ausruestungsanfrage.tsx
View File

@@ -1382,6 +1382,7 @@ function AlleAnfragenTab() {
<TableCell>Anfrage für</TableCell> <TableCell>Anfrage für</TableCell>
<TableCell>Status</TableCell> <TableCell>Status</TableCell>
<TableCell>Positionen</TableCell> <TableCell>Positionen</TableCell>
<TableCell>Geliefert</TableCell>
<TableCell>Erstellt am</TableCell> <TableCell>Erstellt am</TableCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
@@ -1393,6 +1394,11 @@ function AlleAnfragenTab() {
<TableCell>{r.anfrager_name || r.anfrager_id}</TableCell> <TableCell>{r.anfrager_name || r.anfrager_id}</TableCell>
<TableCell><Chip label={AUSRUESTUNG_STATUS_LABELS[r.status]} color={AUSRUESTUNG_STATUS_COLORS[r.status]} size="small" /></TableCell> <TableCell><Chip label={AUSRUESTUNG_STATUS_LABELS[r.status]} color={AUSRUESTUNG_STATUS_COLORS[r.status]} size="small" /></TableCell>
<TableCell>{r.positionen_count ?? r.items_count ?? '-'}</TableCell> <TableCell>{r.positionen_count ?? r.items_count ?? '-'}</TableCell>
<TableCell>
{r.positionen_count != null && r.positionen_count > 0
? `${r.geliefert_count ?? 0}/${r.positionen_count}`
: '-'}
</TableCell>
<TableCell>{new Date(r.erstellt_am).toLocaleDateString('de-AT')}</TableCell> <TableCell>{new Date(r.erstellt_am).toLocaleDateString('de-AT')}</TableCell>
</TableRow> </TableRow>
))} ))}

1
frontend/src/types/ausruestungsanfrage.types.ts
View File

@@ -90,6 +90,7 @@ export interface AusruestungAnfrage {
erstellt_am: string; erstellt_am: string;
aktualisiert_am: string; aktualisiert_am: string;
positionen_count?: number; positionen_count?: number;
geliefert_count?: number;
items_count?: number; items_count?: number;
} }