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

update Do 6. Feb 15:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-02-06 15:31:01 +01:00
parent ec2b1c3a71
commit 13c2342bfb
5 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/rueckmeldung_client.js
View File

@ -36,10 +36,10 @@ var map = L.map('map', {
// Split timestamp into [ Y, M, D, h, m, s ] // Split timestamp into [ Y, M, D, h, m, s ]
console.log(einsatzdaten); console.log(einsatzdaten_obj);
var t1 = eisnatzdaten.zeitstempel.split(/[- :]/); var t1 = einsatzdaten_obj.zeitstempel.split(' ');
var start = new Date(t1[0], t1[1] - 1, t1[2], t1[3], t1[4], t1[5]); $("#einsatz_datum").text(t1[0]);

2
server/routing.js
View File

@ -51,7 +51,7 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
var waip_uuid = req.params.waip_uuid; var waip_uuid = req.params.waip_uuid;
sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) { sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
if (einsatzdaten) { if (einsatzdaten) {
res.render('test_rueckmeldung', { res.render('response', {
title: 'Einsatz-Rückmeldung', title: 'Einsatz-Rückmeldung',
user: req.user, user: req.user,
einsatzdaten: einsatzdaten einsatzdaten: einsatzdaten

47
views/includes/rueckmeldung.pug
View File

@ -1,10 +1,8 @@
.row.no-gutters .row.no-gutters
.col-6 .col-6
p#einsatz_datum.text-muted 01.01.2020
a #{' ' + start}
p.text-muted 01.01.2020
.col-6 .col-6
p.text-muted.text-right 11:22:33 p#einsatz_uhrzeit.text-muted.text-right 11:22:33
.col-10 .col-10
case einsatzdaten.einsatzart case einsatzdaten.einsatzart
when 'Brandeinsatz' when 'Brandeinsatz'
@ -69,36 +67,17 @@
div.d-flex.justify-content-between div.d-flex.justify-content-between
div.pr-2 #{val.einsatzmittel} div.pr-2 #{val.einsatzmittel}
unless val.status == null unless val.status == null
div.p-2.badge.badge-success 2 case val.status
when 1
div.p-2.badge.badge-info #{val.status}
when 2
div.p-2.badge.badge-success #{val.status}
when 3
div.flex-fill.rounded.bg-light.p-2.m-1 div.p-2.badge.badge-warning #{val.status}
div.d-flex.justify-content-between when 4
div.pr-2 FL CB 00/00-00 div.p-2.badge.badge-danger #{val.status}
div.p-2.badge.badge-success 2 default
div.flex-fill.rounded.bg-light.p-2.m-1 div.p-2.badge.badge-dark #{val.status}
div.d-flex.justify-content-between
div.pr-2 FL CB 01/00-00
div.p-2.badge.badge-warning 3
div.flex-fill.rounded.bg-light.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 FL CB T-Dienst
div.p-2.badge.badge-danger 4
div.flex-fill.rounded.bg-light.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 FL CB 12/00-00
div.p-2.badge.badge-success 2
div.flex-fill.rounded.bg-light.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 FL SPN 00/00-00
div.p-2.badge.badge-info 1
div.flex-fill.rounded.bg-light.p-2.m-1
div.d-flex.justify-content-between
div.pr-2 KAT CB 00/00-00
div.p-2.badge.badge-success 2
//.col-12 //.col-12
div.border-top.my-3 div.border-top.my-3
.card.bg-secondary.mt-2 .card.bg-secondary.mt-2

2
views/includes/wachalarm.pug
View File

@ -4,7 +4,7 @@
.ion-md-play-circle .ion-md-play-circle
button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline
.ion-md-volume-high .ion-md-volume-high
#date-time. #date-time
.tf_singleline -Datum- - -Uhrzeit- .tf_singleline -Datum- - -Uhrzeit-
.col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-dark.tf_singleline .col-6.h-5.d-flex.flex-row.align-items-center.justify-content-end.py-1.text-dark.tf_singleline
#wachenname.ion-md-business=data_wache || ' -Wachenname-' #wachenname.ion-md-business=data_wache || ' -Wachenname-'

5
views/response.pug
View File

@ -1,13 +1,14 @@
extends layout extends layout
append head append head
//link(rel='stylesheet', href='/css/ionicons.min.css')
link(rel='stylesheet', href='/css/leaflet.css') link(rel='stylesheet', href='/css/leaflet.css')
block content block content
include includes/modal_global include includes/modal_info
include includes/modal_response include includes/modal_response
.container-fluid .container-fluid
include includes/rueckmeldung include includes/rueckmeldung
script.
var einsatzdaten_obj = !{JSON.stringify(einsatzdaten).replace(/<\//g, '<\\/')}
script(src='/js/leaflet.js') script(src='/js/leaflet.js')
script(src='/js/rueckmeldung_client.js') script(src='/js/rueckmeldung_client.js')