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

update Di 3. Mär 13:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-03 13:31:01 +01:00
parent ab57e8e944
commit bbbb7f0599
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/sql_cfg.js
View File

@ -88,7 +88,8 @@ module.exports = function (fs, bcrypt, app_cfg) {
// Rueckmelde-Tabelle erstellen // Rueckmelde-Tabelle erstellen
db.run(`CREATE TABLE waip_response ( db.run(`CREATE TABLE waip_response (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE, id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
waip_einsaetze_id INTEGER NOT NULL, waip_uuid TEXT,
rmld_uuid TEXT,
response_json TEXT)`); response_json TEXT)`);
// Benutzer-Tabelle erstellen // Benutzer-Tabelle erstellen
db.run(`CREATE TABLE waip_users ( db.run(`CREATE TABLE waip_users (

11
server/sql_qry.js
View File

@ -655,14 +655,15 @@ module.exports = function(db, async, app_cfg) {
db.get(`select name_wache from waip_wachen where id = ?;`, [reuckmeldung.wache_id], function(err, row) { db.get(`select name_wache from waip_wachen where id = ?;`, [reuckmeldung.wache_id], function(err, row) {
if (err == null && row) { if (err == null && row) {
reuckmeldung.wache_name = row; reuckmeldung.wache_name = row.name_wache;
db.run((`INSERT INTO waip_response db.run((`insert or replace into waip_response (id, waip_uuid, rmld_uuid, response_json)
(waip_einsaetze_id, response_json) values
VALUES ( ((select id from waip_response where rmld_uuid = \'` + reuckmeldung.rmld_uuid + `\'),
\'` + reuckmeldung.waip_uuid + `\', \'` + reuckmeldung.waip_uuid + `\',
\'` + reuckmeldung.rmld_uuid + `\',
\'` + JSON.stringify(reuckmeldung) + `\')`), function(err) { \'` + JSON.stringify(reuckmeldung) + `\')`), function(err) {
console.log(err); //console.log(err);
if (err == null) { if (err == null) {
callback && callback('OK'); callback && callback('OK');
} else { } else {

44
views/includes/master_wachalarm.pug
View File

@ -19,28 +19,38 @@
.row.no-gutters.h-100.pt-3 .row.no-gutters.h-100.pt-3
.col-12.h-10.h-100.w-100 .col-12.h-10.h-100.w-100
.d-flex.fustify-content-between.font-weight-bold .d-flex.fustify-content-between.font-weight-bold
#rueckmeldung.list-group.list-group-horizontal.text-center.w-100 .list-group.list-group-horizontal.text-center.w-100
a.list-group-item.bg-secondary.flex-fill.text-success 3 EK .list-group-item.flex-fill.text-success
a.list-group-item.bg-secondary.flex-fill.text-info 2 MA a#ek-counter 0
a.list-group-item.bg-secondary.flex-fill.text-light 1 FK a  EK
#rueckmeldung.list-group.list-group-horizontal.text-center .list-group-item.flex-fill.text-info
a.list-group-item.bg-warning.flex-fill.text-dark 2 AGT a#ma-counter 0
a  MA
.list-group-item.flex-fill.text-light
a#fk-counter 0
a  FK
.list-group.text-center
.list-group-item.border.border-warning.flex-fill.text-warning
a#agt-counter 0
a  AGT
//a.badge.badge-warning 2 AGT //a.badge.badge-warning 2 AGT
.row .row
.col-4 .col-4#pg-ek
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 2min .progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100')
.progress.mt-1.border.border-warning a(style='') 2min
.progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 2min //.progress.mt-1.border.border-warning(style='height: 20px;')
.progress.mt-1 .progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100')
h 2min
//.progress.mt-1
.progress-bar.progress-bar-striped.bg-success.ion-md-checkmark-circle(role='progressbar', style='width: 100%', aria-valuenow='100', aria-valuemin='0', aria-valuemax='100') .progress-bar.progress-bar-striped.bg-success.ion-md-checkmark-circle(role='progressbar', style='width: 100%', aria-valuenow='100', aria-valuemin='0', aria-valuemax='100')
.col-4 .col-4#pg-ma
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 3min .progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 3min
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 1min .progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 1min
.col-4 .col-4#pg-fk
.progress.mt-1.border.border-warning //.progress.mt-1.border.border-warning
.progress-bar.progress-bar-striped.bg-light(role='progressbar', style='width: 50%', aria-valuenow='50', aria-valuemin='0', aria-valuemax='100') 10min .progress-bar.progress-bar-striped.bg-light(role='progressbar', style='width: 50%', aria-valuenow='50', aria-valuemin='0', aria-valuemax='100') 10min
.col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline .col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline
#ortsdaten.flex-fill -Objekt- #ortsdaten.flex-fill -Objekt-