update
This commit is contained in:
parent
e7feafc29c
commit
9ba3a9bc69
0
misc/hexagon_brb_2km.geojson
Executable file → Normal file
0
misc/hexagon_brb_2km.geojson
Executable file → Normal file
@ -51,9 +51,9 @@ 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_userconfig(req.user.id, function(data) {
|
sql.db_get_userconfig(req.user.id, function(data) {
|
||||||
res.render('config', {
|
res.render('config', {
|
||||||
title: 'Einstellungen',
|
//title: 'Einstellungen',
|
||||||
user: req.user,
|
//user: req.user,
|
||||||
reset_counter: data
|
//reset_counter: data
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -99,6 +99,14 @@ module.exports = function(app, sql, app_cfg, passport, auth, udp) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// get /test_rueckmeldung
|
||||||
|
app.get('/test_rueckmeldung', function(req, res) {
|
||||||
|
res.render('test_rueckmeldung', {
|
||||||
|
title: 'Test Einsatz-Rückmeldung',
|
||||||
|
user: req.user
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// get /show_active_user
|
// get /show_active_user
|
||||||
app.get('/show_active_user', auth.ensureAdmin, function(req, res) {
|
app.get('/show_active_user', auth.ensureAdmin, function(req, res) {
|
||||||
sql.db_get_active_clients(function(data) {
|
sql.db_get_active_clients(function(data) {
|
||||||
|
|||||||
0
server/socket.js
Executable file → Normal file
0
server/socket.js
Executable file → Normal file
@ -703,8 +703,10 @@ module.exports = function(db, async, app_cfg) {
|
|||||||
db_get_userconfig: db_get_userconfig,
|
db_get_userconfig: db_get_userconfig,
|
||||||
db_set_userconfig: db_set_userconfig,
|
db_set_userconfig: db_set_userconfig,
|
||||||
db_get_sockets_to_standby: db_get_sockets_to_standby,
|
db_get_sockets_to_standby: db_get_sockets_to_standby,
|
||||||
db_update_response: db_update_response,
|
//db_update_response: db_update_response,
|
||||||
db_get_response:db_get_response
|
db_save_response: db_save_response,
|
||||||
|
db_get_response_gesamter_einsatz: db_get_response_gesamter_einsatz,
|
||||||
|
db_get_response_wache: db_get_response_wache
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
46
views/includes/rueckmeldung.pug
Normal file
46
views/includes/rueckmeldung.pug
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
#waiptableau.fullheight.row.no-gutters
|
||||||
|
.col-6.h-5.d-flex.align-items-center.py-1.text-dark
|
||||||
|
button#replay.btn.btn-outline-dark.h-100.py-1.tf_singleline
|
||||||
|
.ion-md-play-circle
|
||||||
|
button#volume.btn.btn-outline-dark.h-100.mx-1.tf_singleline
|
||||||
|
.ion-md-volume-high
|
||||||
|
#date-time.
|
||||||
|
.tf_singleline -Datum- - -Uhrzeit-
|
||||||
|
.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-'
|
||||||
|
.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_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
|
||||||
|
#sondersignal.ion-md-apps
|
||||||
|
.col-12.col-5_ls.h-35.h-70_ls.pt-3_pt.ptr-3_ls
|
||||||
|
#map.h-100.rounded
|
||||||
|
.col-12.col-7_ls.h-40.h-70_ls
|
||||||
|
.row.no-gutters.h-100.pt-3
|
||||||
|
.col-12.h-10.h-100.w-100
|
||||||
|
#rueckmeldung.list-group.list-group-horizontal.text-center.h-100.w-100
|
||||||
|
a.list-group-item.flex-fill.list-group-item-action.text-secondary.tf_singleline
|
||||||
|
.ion-md-paper-plane
|
||||||
|
.col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline
|
||||||
|
#ortsdaten.flex-fill -Objekt-
|
||||||
|
br
|
||||||
|
| -Ort-
|
||||||
|
br
|
||||||
|
| -Ortsteil-
|
||||||
|
br
|
||||||
|
| -Straße Hsnr-
|
||||||
|
.col-6.h-65.d-flex.align-items-end.justify-content-end.tf_multiline
|
||||||
|
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 2-
|
||||||
|
li.list-group-item.d-flex.justify-content-between.align-items-center -Einsatzmittel n-
|
||||||
|
// TODO: Status mit anzeigen (als .badge.badge-pill)
|
||||||
|
.col-12.h-5.d-flex.align-items-end.justify-content-center.text-dark.tf_singleline
|
||||||
|
#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
|
||||||
|
#besonderheiten -Besonderheiten-
|
||||||
|
.col-12.h-5.d-flex.align-items-end.justify-content-center.pt-3
|
||||||
|
.progress(style='height: 100%;').flex-fill
|
||||||
|
#hilfsfrist.progress-bar.progress-bar-striped.progress-bar-animated(role='progressbar', aria-valuenow='0', aria-valuemin='0', aria-valuemax='100', style='width: 0%')
|
||||||
|
audio#audio(controls='')
|
||||||
|
source(src='', type='audio/mpeg')
|
||||||
15
views/test_rueckmeldung.pug
Normal file
15
views/test_rueckmeldung.pug
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
extends layout
|
||||||
|
|
||||||
|
append head
|
||||||
|
link(rel='stylesheet', href='/css/ionicons.min.css')
|
||||||
|
link(rel='stylesheet', href='/css/leaflet.css')
|
||||||
|
// link(rel='stylesheet', href='/css/waip.css')
|
||||||
|
|
||||||
|
block content
|
||||||
|
//include includes/modal_response
|
||||||
|
.container-fluid
|
||||||
|
include includes/rueckmeldung
|
||||||
|
script(src='/js/leaflet.js')
|
||||||
|
// script(src='/js/textFit.min.js')
|
||||||
|
// script(src='/js/waip_client.js')
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user