diff --git a/public/js/client_dbrd.js b/public/js/client_dbrd.js index 1a98a53..12d9f7d 100755 --- a/public/js/client_dbrd.js +++ b/public/js/client_dbrd.js @@ -50,30 +50,30 @@ var map = L.map('map', { var date = new Date(); - date.setMinutes(date.getMinutes() + 4 ); + date.setMinutes(date.getMinutes() - 0,1 ); var start = new Date(date); - date.setMinutes(date.getMinutes() + 5 ); + date.setMinutes(date.getMinutes() +4,9 ); var end = new Date(date); var date2 = new Date(); - var start2 = new Date(date2.setMinutes(date2.getMinutes() - 2)); - var end2 = new Date(date2.setMinutes(date2.getMinutes() + 10 )); + var start2 = new Date(date2.setMinutes(date2.getMinutes() - 1)); + var end2 = new Date(date2.setMinutes(date2.getMinutes() + 9 )); var date3 = new Date(); - var start3 = new Date(date3.setMinutes(date3.getMinutes() - 1)); - var end3 = new Date(date3.setMinutes(date3.getMinutes() + 5 )); + var start3 = new Date(date3.setMinutes(date3.getMinutes() - 1,5)); + var end3 = new Date(date3.setMinutes(date3.getMinutes() + 4,5 )); var date4 = new Date(); - var start4 = new Date(date4.setMinutes(date4.getMinutes() +2 )); - var end4 = new Date(date4.setMinutes(date4.getMinutes() + 10 )); + var start4 = new Date(date4.setMinutes(date4.getMinutes() + 0,8 )); + var end4 = new Date(date4.setMinutes(date4.getMinutes() + 10,8 )); var date5 = new Date(); - var start5 = new Date(date5.setMinutes(date5.getMinutes() + 5)); - var end5 = new Date(date5.setMinutes(date5.getMinutes() + 10 )); + var start5 = new Date(date5.setMinutes(date5.getMinutes() - 0,2)); + var end5 = new Date(date5.setMinutes(date5.getMinutes() + 9,8 )); var date6 = new Date(); - var start6 = new Date(date6.setMinutes(date6.getMinutes() - 0)); - var end6 = new Date(date6.setMinutes(date6.getMinutes() + 15 )); + var start6 = new Date(date6.setMinutes(date6.getMinutes() - 0,1)); + var end6 = new Date(date6.setMinutes(date6.getMinutes() + 15,1 )); var item5 = document.createElement('div'); item5.className = 'ion-md-star'; @@ -96,7 +96,7 @@ var map = L.map('map', { var id2 = "id2"; var customDate = new Date(); var alert_start = new Date(customDate.setMinutes(customDate.getMinutes() - 2)); - var timeline_end = new Date(customDate.setMinutes(customDate.getMinutes() + 18)); + var timeline_end = new Date(customDate.setMinutes(customDate.getMinutes() + 13)); diff --git a/views/includes/master_dashboard.pug b/views/includes/master_dashboard.pug index aa6fe6c..a77fa72 100755 --- a/views/includes/master_dashboard.pug +++ b/views/includes/master_dashboard.pug @@ -148,8 +148,8 @@ style(type='text/css'). table.table.table-hover thead.table-borderless tr - th(scope='col') Wache - th(scope='col') Alarmierte Einsatzmittel + th(scope='col').text-info Wache + th(scope='col').text-info Einsatzmittel tbody tr th(scope='row') CB FW Cottbus 1 @@ -224,19 +224,16 @@ style(type='text/css'). div.p-2.badge.badge-warning 3 div.border-top.m-3 .card.mt-2 - .card-header.bg-secondary.p-2 - h5.text-danger.text-center Einsatzrückmeldungen - .card-body.p-2 - .form - .button + .card-header.bg-dark.px-3 + .text-info.font-weight-bold Einsatzrückmeldungen .card-body.p-2 #visualization.border.rounded(style='background-color:white') .card-body.p-2 - #rueckmeldung.list-group.list-group-horizontal.text-center - a.list-group-item.flex-fill.text-info 4 EK - a.list-group-item.flex-fill.text-danger 1 MA - a.list-group-item.flex-fill 0 FK - a.list-group-item.list-group-item-light.flex-fill.text-dark 0 AGT + #rueckmeldung.list-group.list-group-horizontal.text-center.d-flex + .list-group-item.flex-fill.text-info 4 EK + .list-group-item.flex-fill.text-danger 1 MA + .list-group-item.flex-fill 0 FK + .flex-fill 0 AGT //div.border-top.m-3 //.card.bg-dark.mt-2 .card-header.bg-secondary.p-2