rework internal order system
This commit is contained in:
@@ -288,7 +288,8 @@ async function getRequests(filters?: { status?: string; anfrager_id?: string })
|
||||
`SELECT a.*,
|
||||
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,
|
||||
(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
|
||||
LEFT JOIN users u ON u.id = a.anfrager_id
|
||||
LEFT JOIN users u2 ON u2.id = a.bearbeitet_von
|
||||
|
||||
@@ -1382,6 +1382,7 @@ function AlleAnfragenTab() {
|
||||
<TableCell>Anfrage für</TableCell>
|
||||
<TableCell>Status</TableCell>
|
||||
<TableCell>Positionen</TableCell>
|
||||
<TableCell>Geliefert</TableCell>
|
||||
<TableCell>Erstellt am</TableCell>
|
||||
</TableRow>
|
||||
</TableHead>
|
||||
@@ -1393,6 +1394,11 @@ function AlleAnfragenTab() {
|
||||
<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>{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>
|
||||
</TableRow>
|
||||
))}
|
||||
|
||||
@@ -90,6 +90,7 @@ export interface AusruestungAnfrage {
|
||||
erstellt_am: string;
|
||||
aktualisiert_am: string;
|
||||
positionen_count?: number;
|
||||
geliefert_count?: number;
|
||||
items_count?: number;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user