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

rework issue system

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-03-24 15:30:24 +01:00
parent 65994286b2
commit d8d2730547
9 changed files with 316 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ async function getOrders(filters?: { status?: string; lieferant_id?: number; bes
const result = await pool.query(
`SELECT b.*,
l.name AS lieferant_name,
u.display_name AS besteller_name,
COALESCE(u.name, u.preferred_username, u.email) AS besteller_name,
COALESCE(pos.total_cost, 0) AS total_cost,
COALESCE(pos.items_count, 0) AS items_count
FROM bestellungen b
@@ -145,7 +145,7 @@ async function getOrderById(id: number) {
const orderResult = await pool.query(
`SELECT b.*,
l.name AS lieferant_name,
u.display_name AS besteller_name
COALESCE(u.name, u.preferred_username, u.email) AS besteller_name
FROM bestellungen b
LEFT JOIN lieferanten l ON l.id = b.lieferant_id
LEFT JOIN users u ON u.id = b.erstellt_von
@@ -158,7 +158,7 @@ async function getOrderById(id: number) {
pool.query(`SELECT * FROM bestellpositionen WHERE bestellung_id = $1 ORDER BY id`, [id]),
pool.query(`SELECT * FROM bestellung_dateien WHERE bestellung_id = $1 ORDER BY hochgeladen_am DESC`, [id]),
pool.query(`SELECT * FROM bestellung_erinnerungen WHERE bestellung_id = $1 ORDER BY faellig_am`, [id]),
pool.query(`SELECT h.*, u.display_name AS benutzer_name FROM bestellung_historie h LEFT JOIN users u ON u.id = h.erstellt_von WHERE h.bestellung_id = $1 ORDER BY h.erstellt_am DESC`, [id]),
pool.query(`SELECT h.*, COALESCE(u.name, u.preferred_username, u.email) AS benutzer_name FROM bestellung_historie h LEFT JOIN users u ON u.id = h.erstellt_von WHERE h.bestellung_id = $1 ORDER BY h.erstellt_am DESC`, [id]),
]);
return {
@@ -579,7 +579,7 @@ async function logAction(bestellungId: number, aktion: string, details: string,
async function getHistory(bestellungId: number) {
try {
const result = await pool.query(
`SELECT h.*, u.display_name AS benutzer_name
`SELECT h.*, COALESCE(u.name, u.preferred_username, u.email) AS benutzer_name
FROM bestellung_historie h
LEFT JOIN users u ON u.id = h.erstellt_von
WHERE h.bestellung_id = $1