From d7c5c2cd95b6e4d063fffbc1ffbd602bf67d2790 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Sun, 21 Jun 2020 19:31:01 +0200 Subject: [PATCH] update So 21. Jun 19:31:01 CEST 2020 --- server/app_cfg.js | 2 +- server/sql_qry.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/app_cfg.js b/server/app_cfg.js index 1d6fd62..b879c2e 100644 --- a/server/app_cfg.js +++ b/server/app_cfg.js @@ -9,7 +9,7 @@ app_cfg.global = { database: './database.sqlite3', soundpath: '/public/media/', mediapath: '/media/', - time_to_delete_waip: 1, + time_to_delete_waip: 4, default_time_for_standby: 10, circumcircle: 5, defaultuser: 'me', diff --git a/server/sql_qry.js b/server/sql_qry.js index 70e2f59..64be4c5 100755 --- a/server/sql_qry.js +++ b/server/sql_qry.js @@ -206,8 +206,8 @@ module.exports = function (db, app_cfg) { ) em1 ON em1.waip_einsaetze_id = e.ID LEFT JOIN ( SELECT waip_einsaetze_id, \'[\' || group_concat(\'{\"name\": \"\' || einsatzmittel || \'\", \"zeit\": \"\' || zeitstempel || \'\"}\') || \']\' AS em_weitere - FROM waip_einsatzmittel WHERE waip_einsaetze_id = ? and waip_wachen_id not in ( - select id from waip_wachen where nr_wache like ?||\'%\') + FROM waip_einsatzmittel WHERE waip_einsaetze_id = ? and (waip_wachen_id not in ( + select id from waip_wachen where nr_wache like ?||\'%\') or waip_wachen_id is null) GROUP BY waip_einsaetze_id ) em0 ON em0.waip_einsaetze_id = e.ID WHERE e.id LIKE ?