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

fix: use ausruestung.bezeichnung in checklist queries and cast interval param in atemschutz

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-03-28 18:13:07 +01:00
parent 0d6d5e4f54
commit 4c1f188371
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,20 +230,20 @@ class AtemschutzService {
at.leistungstest_gueltig_bis, at.leistungstest_gueltig_bis,
CASE CASE
WHEN at.untersuchung_gueltig_bis < CURRENT_DATE THEN 'abgelaufen' WHEN at.untersuchung_gueltig_bis < CURRENT_DATE THEN 'abgelaufen'
WHEN at.untersuchung_gueltig_bis <= CURRENT_DATE + $1 THEN 'bald_faellig' WHEN at.untersuchung_gueltig_bis <= CURRENT_DATE + $1::interval THEN 'bald_faellig'
ELSE 'ok' ELSE 'ok'
END as untersuchung_status, END as untersuchung_status,
CASE CASE
WHEN at.leistungstest_gueltig_bis < CURRENT_DATE THEN 'abgelaufen' WHEN at.leistungstest_gueltig_bis < CURRENT_DATE THEN 'abgelaufen'
WHEN at.leistungstest_gueltig_bis <= CURRENT_DATE + $1 THEN 'bald_faellig' WHEN at.leistungstest_gueltig_bis <= CURRENT_DATE + $1::interval THEN 'bald_faellig'
ELSE 'ok' ELSE 'ok'
END as leistungstest_status END as leistungstest_status
FROM atemschutz_traeger at FROM atemschutz_traeger at
JOIN users u ON u.id = at.user_id JOIN users u ON u.id = at.user_id
WHERE at.einsatzbereit = TRUE WHERE at.einsatzbereit = TRUE
AND ( AND (
at.untersuchung_gueltig_bis <= CURRENT_DATE + $1 at.untersuchung_gueltig_bis <= CURRENT_DATE + $1::interval
OR at.leistungstest_gueltig_bis <= CURRENT_DATE + $1 OR at.leistungstest_gueltig_bis <= CURRENT_DATE + $1::interval
) )
ORDER BY LEAST(at.untersuchung_gueltig_bis, at.leistungstest_gueltig_bis) ASC ORDER BY LEAST(at.untersuchung_gueltig_bis, at.leistungstest_gueltig_bis) ASC
`, [`${daysAhead} days`]); `, [`${daysAhead} days`]);

6
backend/src/services/checklist.service.ts
View File

@@ -667,7 +667,7 @@ async function getExecutionById(id: string) {
const execResult = await pool.query( const execResult = await pool.query(
`SELECT a.*, `SELECT a.*,
f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname, f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
ar.name AS ausruestung_name, ar.bezeichnung AS ausruestung_name,
v.name AS vorlage_name, v.name AS vorlage_name,
u1.name AS ausgefuehrt_von_name, u1.name AS ausgefuehrt_von_name,
u2.name AS freigegeben_von_name u2.name AS freigegeben_von_name
@@ -823,7 +823,7 @@ async function getExecutions(filter?: { fahrzeugId?: string; ausruestungId?: str
const result = await pool.query( const result = await pool.query(
`SELECT a.*, `SELECT a.*,
f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname, f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
ar.name AS ausruestung_name, ar.bezeichnung AS ausruestung_name,
v.name AS vorlage_name, v.name AS vorlage_name,
u1.name AS ausgefuehrt_von_name, u1.name AS ausgefuehrt_von_name,
u2.name AS freigegeben_von_name u2.name AS freigegeben_von_name
@@ -853,7 +853,7 @@ async function getOverdueChecklists() {
const result = await pool.query(` const result = await pool.query(`
SELECT cf.*, SELECT cf.*,
f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname, f.bezeichnung AS fahrzeug_name, f.kurzname AS fahrzeug_kurzname,
ar.name AS ausruestung_name, ar.bezeichnung AS ausruestung_name,
v.name AS vorlage_name v.name AS vorlage_name
FROM checklist_faelligkeit cf FROM checklist_faelligkeit cf
LEFT JOIN fahrzeuge f ON f.id = cf.fahrzeug_id AND f.deleted_at IS NULL LEFT JOIN fahrzeuge f ON f.id = cf.fahrzeug_id AND f.deleted_at IS NULL