update So 15. Mär 21:31:01 CET 2020

public/css/waip.css

@@ -61,10 +61,6 @@ audio {
   height: 40% !important;
 }
 
-.h-70 {
-  height: 70% !important;
-}
-
 .h-45 {
   height: 45% !important;
 }
@@ -73,10 +69,18 @@ audio {
   height: 55% !important;
 }
 
+.h-60 {
+  height: 60% !important;
+}
+
 .h-65 {
   height: 65% !important;
 }
 
+.h-70 {
+  height: 70% !important;
+}
+
 .h-80 {
   height: 80% !important;
 }

public/js/client_waip.js

@@ -520,11 +520,14 @@ function add_resp_progressbar(p_id, p_type, p_agt, p_start, p_end) {
       break;
   };
 
+  // pruefen ob div mit id 'pg-'+p_id schon vorhanden ist
+  var pgbar = document.getElementById('pg-' + p_id);
+    if(!pgbar){ 
   $( '#pg-' + p_type ).append( '<div class="progress mt-1 position-relative '+bar_border+'" id="pg-' + p_id + '" style="height: 15px; font-size: 14px;"></div>'); //+ ' ></div>' );
 
   $( '#pg-'+ p_id ).append( '<div id="pg-bar'+ p_id +'" class="progress-bar progress-bar-striped '+ bar_background +'" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>' );
   $( '#pg-bar'+ p_id ).append('<small id="pg-text'+ p_id +'" class="justify-content-center d-flex position-absolute w-100"></small>');
-  
+    };
   
   
 

server/routing.js

@@ -168,6 +168,7 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
   app.get('/rmld/:waip_uuid/:rmld_uuid', function(req, res, next) {
     
     var waip_uuid = req.params.waip_uuid;
+    var rmld_uuid = req.params.rmld_uuid;
     sql.db_get_einsatzdaten_by_uuid(waip_uuid, function(einsatzdaten) {
       if (einsatzdaten) {        
         sql.db_check_permission(req.user, einsatzdaten.id, function(valid) {
@@ -178,6 +179,7 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
             delete einsatzdaten.wgs84_x;
   			    delete einsatzdaten.wgs84_y;
           };
+          einsatzdaten.rmld_uuid = rmld_uuid;
           res.render('rmld', {
             public: app_cfg.public,
             title: 'Einsatz-Rückmeldung',
@@ -197,14 +199,14 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
 
   // Rueckmeldung entgegennehmen
   app.post('/rmld/:waip_uuid/:rmld_uuid', function(req, res) {
-    var waip_uuid = req.params.waip_uuid;
+    var waip_uuid = req.body.waip_uuid;
-    var rmld_uuid = req.params.rmld_uuid;
+    var rmld_uuid = req.body.rmld_uuid;
-    var rmld_obj = Object.assign(req.params, req.body);
+    //var rmld_obj = Object.assign(req.params, req.body);
     
-    console.log(req.params);
+    //console.log(req.params);
-    console.log(req.body);
+    //console.log(req.body);
-    console.log(rmld_obj);
+    //console.log(rmld_obj);
-    sql.db_save_rmld(rmld_obj, function(result){
+    sql.db_save_rmld(req.body, function(result){
       if (result) {
         req.flash('successMessage', 'Rückmeldung erfolgreich gesendet, auf zum Einsatz!');
         res.redirect('/rmld/' + waip_uuid + '/' + rmld_uuid );

server/sql_qry.js

@@ -774,7 +774,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
   };
   
   function db_get_single_response_by_rmlduuid(rmld_uuid, callback) {
-    db.get(`SELECT * FROM waip_response WHERE rmld_uuid like ?`, [rmld_uuid], function (err, row) {
+    db.all(`SELECT * FROM waip_response WHERE rmld_uuid like ?`, [rmld_uuid], function (err, row) {
       if (err == null && row) {
                 console.log('single_rmld_uuid '+row);
                 if (row.einsatzkraft == 1) {

views/includes/master_wachalarm.pug

@@ -52,7 +52,7 @@
           .col-4#pg-fk
             //.progress.mt-1.border.border-warning
                 .progress-bar.progress-bar-striped.bg-light(role='progressbar', style='width: 50%', aria-valuenow='50', aria-valuemin='0', aria-valuemax='100') 10min    
-      .col-6.h-65.d-flex.align-items-end.justify-content-start.tf_multiline
+      .col-6.h-60.d-flex.align-items-end.justify-content-start.tf_multiline
         #ortsdaten.flex-fill -Objekt-
           br
           | -Ort-

views/includes/modal_rmld.pug

@@ -17,6 +17,8 @@
           span(aria-hidden='true') ×
       #responseModalBody.modal-body
         form#send_response.was-validated(action=einsatzdaten.uuid, method="POST")
+          input(type="hidden" name="waip_uuid" value=einsatzdaten.uuid)
+          input(type="hidden" name="rmld_uuid" value=einsatzdaten.rmld_uuid)
           .form-group
             p.text-muted Ich komme als ...
             .custom-control.custom-radio.form-control-lg