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 10:07:35 +01:00
parent 0389c3d2aa
commit 3ce8adfa07
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,8 +286,8 @@ async function getRequests(filters?: { status?: string; anfrager_id?: string })
const where = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
const result = await pool.query(
`SELECT a.*,
u.display_name AS anfrager_name,
u2.display_name AS bearbeitet_von_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,
(SELECT COUNT(*)::int FROM ausruestung_anfrage_positionen p WHERE p.anfrage_id = a.id) AS positionen_count
FROM ausruestung_anfragen a
LEFT JOIN users u ON u.id = a.anfrager_id
@@ -314,8 +314,8 @@ async function getMyRequests(userId: string) {
async function getRequestById(id: number) {
const reqResult = await pool.query(
`SELECT a.*,
u.display_name AS anfrager_name,
u2.display_name AS bearbeitet_von_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
FROM ausruestung_anfragen a
LEFT JOIN users u ON u.id = a.anfrager_id
LEFT JOIN users u2 ON u2.id = a.bearbeitet_von