mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update So 21. Jun 19:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-21 19:31:01 +02:00
parent cda10efd58
commit d7c5c2cd95
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/app_cfg.js
View File

@ -9,7 +9,7 @@ app_cfg.global = {
database: './database.sqlite3', database: './database.sqlite3',
soundpath: '/public/media/', soundpath: '/public/media/',
mediapath: '/media/', mediapath: '/media/',
time_to_delete_waip: 1, time_to_delete_waip: 4,
default_time_for_standby: 10, default_time_for_standby: 10,
circumcircle: 5, circumcircle: 5,
defaultuser: 'me', defaultuser: 'me',

4
server/sql_qry.js
View File

@ -206,8 +206,8 @@ module.exports = function (db, app_cfg) {
) em1 ON em1.waip_einsaetze_id = e.ID ) em1 ON em1.waip_einsaetze_id = e.ID
LEFT JOIN ( LEFT JOIN (
SELECT waip_einsaetze_id, \'[\' || group_concat(\'{\"name\": \"\' || einsatzmittel || \'\", \"zeit\": \"\' || zeitstempel || \'\"}\') || \']\' AS em_weitere 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 ( FROM waip_einsatzmittel WHERE waip_einsaetze_id = ? and (waip_wachen_id not in (
select id from waip_wachen where nr_wache like ?||\'%\') select id from waip_wachen where nr_wache like ?||\'%\') or waip_wachen_id is null)
GROUP BY waip_einsaetze_id GROUP BY waip_einsaetze_id
) em0 ON em0.waip_einsaetze_id = e.ID ) em0 ON em0.waip_einsaetze_id = e.ID
WHERE e.id LIKE ? WHERE e.id LIKE ?