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

update Mi 29. Apr 13:31:02 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-04-29 13:31:02 +02:00
parent e266b1c27e
commit ba5a862e62
4 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/vis-timeline.css
View File

@ -26,7 +26,7 @@
*/ */
} }
/* TODO: get animation working nicely /*
.vis-item { .vis-item {
-webkit-transition: top .4s ease-in-out; -webkit-transition: top .4s ease-in-out;
@ -134,7 +134,7 @@
width: 100%; width: 100%;
height: 1px; height: 1px;
box-shadow: 0 0 10px rgba(0,0,0,0.8); box-shadow: 0 0 10px rgba(0,0,0,0.8);
/* TODO: find a nice way to ensure vis-shadows are drawn on top of items /*
z-index: 1; z-index: 1;
*/ */
} }

4
server/waip.js
View File

@ -241,8 +241,8 @@ module.exports = function (io, sql, tw, async, app_cfg) {
var nsp_waip = io.of('/waip'); var nsp_waip = io.of('/waip');
console.log(JSON.stringify(row)); console.log(JSON.stringify(row));
console.log(nsp_waip.sockets.connected[row.socket_id]); console.log(nsp_waip.connected[row.socket_id]);
//var socket = ; var socket = nsp_waip.connected[row.socket_id];
//nsp_waip.to(rooms.room).emit('io.response', rmld_obj); //nsp_waip.to(rooms.room).emit('io.response', rmld_obj);
//io.of('/waip').to(row.socket_id).emit('io.standby', null); //io.of('/waip').to(row.socket_id).emit('io.standby', null);

30
views/includes/master_wachalarm.pug
View File

@ -1,17 +1,17 @@
#waiptableau.fullheight.row.no-gutters #waiptableau.fullheight.row.no-gutters
.col-6.h-5.d-flex.align-items-center.py-1.text-dark .col-6.h-5.d-flex.align-items-center.py-1.text-muted
button#replay.btn.btn-outline-dark.h-100.py-1.tf_singleline button#replay.btn.btn-outline-light.h-100.py-1.tf_singleline
.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-light.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-muted.tf_singleline
#wachenname.ion-md-business=data_wache || ' -Wachenname-' #wachenname.ion-md-business=data_wache || ' -Wachenname-'
.col-10.h-15.h-20_ls.pr-3 .col-10.h-15.h-20_ls.pr-3
#einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-light.tf_singleline #einsatz_art.h-100.w-100.d-flex.align-items-center.font-weight-bold.p-3.rounded.bg-dark.tf_singleline
#einsatz_stichwort.ion-md-apps -Stichwort- #einsatz_stichwort.ion-md-apps -Stichwort-
.col-2.h-15.h-20_ls.d-flex.align-items-center.justify-content-center.p-3.rounded.bg-light.text-info.tf_singleline .col-2.h-15.h-20_ls.d-flex.align-items-center.justify-content-center.p-3.rounded.bg-dark.text-info.tf_singleline
#sondersignal.ion-md-apps #sondersignal.ion-md-apps
.col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls .col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls
#map.h-100.rounded #map.h-100.rounded
@ -61,14 +61,26 @@
| -Ortsteil- | -Ortsteil-
br br
| -Straße Hsnr- | -Straße Hsnr-
.col-6.h-65.d-flex.align-items-end.justify-content-end.tf_multiline //.col-6.h-65.d-flex.align-items-end.justify-content-end
ul#em_alarmiert.list-group .col-6.h-65.d-flex.align-content-end.flex-wrap
//div.flex-fill.rounded.bg-secondary.p-2.m-1
div.rounded.bg-secondary.d-flex.justify-content-between
div.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2
div.rounded.bg-secondary.d-flex.justify-content-between
div.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2
div.rounded.bg-secondary.d-flex.justify-content-between
div.pr-2 FL CB 01/42-01
div.p-2.badge.badge-success 2
//ul#em_alarmiert.list-group
li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 1- li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 1-
li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 2- li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel 2-
li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n- li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n-
// TODO: Status mit anzeigen (als .badge.badge-pill) // TODO: Status mit anzeigen (als .badge.badge-pill)
// TODO: auflistung vieler Fahrzeuge verbessern. flexfill // TODO: auflistung vieler Fahrzeuge verbessern. flexfill
.col-12.h-5.d-flex.align-items-end.justify-content-center.text-dark.tf_singleline .col-12.h-5.d-flex.align-items-end.justify-content-center.text-muted.tf_singleline
#em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n- #em_weitere -weiteres Einsatzmittel 1-, -weiteres Einsatzmittel 2-, -weiteres Einsatzmittel n-
.col-12.h-20.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline .col-12.h-20.d-flex.align-items-center.rounded.bg-light.font-weight-bold.text-info.tf_singleline
#besonderheiten -Besonderheiten- #besonderheiten -Besonderheiten-

7
views/tests/test_wachalarm.pug
View File

@ -1,4 +1,4 @@
extends layout extends ../layout
append head append head
link(rel='stylesheet', href='/css/ionicons.min.css') link(rel='stylesheet', href='/css/ionicons.min.css')
@ -6,10 +6,9 @@ append head
link(rel='stylesheet', href='/css/waip.css') link(rel='stylesheet', href='/css/waip.css')
block content block content
include includes/modal_response
.container-fluid .container-fluid
include includes/wachalarm include ../includes/master_wachalarm
script(src='/js/leaflet.js') script(src='/js/leaflet.js')
script(src='/js/textFit.min.js') script(src='/js/textFit.min.js')
script(src='/js/waip_client.js') script(src='/js/client_waip.js')