From b496f5c47a7a565c1abe3a6ac7bc21625c200088 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 6 Feb 2020 14:31:01 +0100 Subject: [PATCH] update Do 6. Feb 14:31:01 CET 2020 --- views/includes/{modal.pug => modal_info.pug} | 0 views/includes/rueckmeldung.pug | 21 +++++++++- views/response.pug | 40 ++------------------ 3 files changed, 22 insertions(+), 39 deletions(-) rename views/includes/{modal.pug => modal_info.pug} (100%) diff --git a/views/includes/modal.pug b/views/includes/modal_info.pug similarity index 100% rename from views/includes/modal.pug rename to views/includes/modal_info.pug diff --git a/views/includes/rueckmeldung.pug b/views/includes/rueckmeldung.pug index 6ebe7d8..e66e4f5 100755 --- a/views/includes/rueckmeldung.pug +++ b/views/includes/rueckmeldung.pug @@ -4,8 +4,25 @@ .col-6 p.text-muted.text-right 11:22:33 .col-10 - #einsatz_art.align-items-center.font-weight-bold.rounded.bg-light.p-3.mr-2 - #einsatz_stichwort.ion-md-apps -Stichwort- + case einsatzdaten.einsatzart + when 'Brandeinsatz' + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-danger.p-3.mr-2 + #einsatz_stichwort.ion-md-flame #{' ' + einsatzdaten.stichwort} + when 'Hilfeleistungseinsatz' + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-info.p-3.mr-2 + #einsatz_stichwort.ion-md-construct #{' ' + einsatzdaten.stichwort} + when 'Rettungseinsatz' + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-warning.p-3.mr-2 + #einsatz_stichwort.ion-md-medkit #{' ' + einsatzdaten.stichwort} + when 'Krankentransport' + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-success.p-3.mr-2 + #einsatz_stichwort.ion-md-medical #{' ' + einsatzdaten.stichwort} + when 'Sonstiges' + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-secondary.p-3.mr-2 + #einsatz_stichwort.ion-md-information-circle #{' ' + einsatzdaten.stichwort} + default + #einsatz_art.align-items-center.font-weight-bold.rounded.bg-light.p-3.mr-2 + #einsatz_stichwort.ion-md-apps -Stichwort- .col-2 .align-items-center.justify-content-center.rounded.bg-light.text-info.p-3 #sondersignal.ion-md-apps.text-center diff --git a/views/response.pug b/views/response.pug index 8f35020..712af6b 100755 --- a/views/response.pug +++ b/views/response.pug @@ -1,47 +1,13 @@ extends layout append head - link(rel='stylesheet', href='/css/ionicons.min.css') + //link(rel='stylesheet', href='/css/ionicons.min.css') link(rel='stylesheet', href='/css/leaflet.css') block content + include includes/modal_global include includes/modal_response .container-fluid include includes/rueckmeldung script(src='/js/leaflet.js') - script(src='/js/rueckmeldung_client.js') - - - - a= JSON.stringify(einsatzdaten) - - - - - - - - extends layout - -append head - link(rel='stylesheet', href='/css/leaflet.css') - -block content - include includes/modal - include includes/modal_response - .container-fluid - #waipclock.d-none - include includes/clock - #waiptableau.d-none - include includes/wachalarm - - script. - var map_tile = !{JSON.stringify(map_tile).replace(/<\//g, '<\\/')} - var client_id = !{JSON.stringify(app_id).replace(/<\//g, '<\\/')} - script(src='/js/leaflet.js') - script(src='/js/textFit.min.js') - script(src='/socket.io/socket.io.js') - script. - wachen_id="#{wachen_id}" - waip_id=null - script(src='/js/waip_client.js') + script(src='/js/rueckmeldung_client.js') \ No newline at end of file