update Di 28. Apr 11:01:01 CEST 2020

server/routing.js

@@ -157,13 +157,33 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
     sql.db_get_active_waips(function(data) {
       res.render('overview', {
         public: app_cfg.public,
-        title: 'Einsatzübersicht',
+        title: 'Dashboard',
         user: req.user,
         dataSet: data
       });
     });
   });
 
+  // Dasboard fuer einen Einsatz
+  app.get('/dbrd/:dbrd_uuid', function(req, res, next) {
+    var dbrd_uuid = req.params.dbrd_uuid;
+    sql.db_einsatz_uuid_vorhanden(dbrd_uuid, function(wache) {
+      if (wache) {
+        res.render('dbrd', {
+          public: app_cfg.public,
+          title: 'Dashboard',
+          dbrd_uuid: dbrd_uuid,
+          app_id: app_cfg.global.app_id,
+          user: req.user
+        });
+      } else {
+        var err = new Error('Dashboard oder Einsatz nicht vorhanden!');
+        err.status = 404;
+        next(err);
+      };
+    });
+  });
+
   /* ######################## */
   /* ##### Rueckmeldung ##### */
   /* ######################## */

server/sql_qry.js

@@ -49,10 +49,18 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
       var wgs_x = parseFloat(content.ortsdaten.wgs84_x);
       var wgs_y = parseFloat(content.ortsdaten.wgs84_y);
       var point = turf.point([wgs_y, wgs_x]);
-      var buffered = turf.buffer(point, 1, {steps: 5, units: 'kilometers'});
+      var buffered = turf.buffer(point, 1, {
+        steps: 5,
+        units: 'kilometers'
+      });
       var bbox = turf.bbox(buffered);
-      var new_point = turf.randomPoint(1, {bbox: bbox});
+      var new_point = turf.randomPoint(1, {
-      var new_buffer = turf.buffer(new_point, 1, {steps: 5, units: 'kilometers'})
+        bbox: bbox
+      });
+      var new_buffer = turf.buffer(new_point, 1, {
+        steps: 5,
+        units: 'kilometers'
+      })
       content.ortsdaten.wgs84_area = JSON.stringify(new_buffer);
     };
 
@@ -210,6 +218,18 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     };
   };
 
+  function db_einsatz_uuid_vorhanden(uuid, callback) {
+    // Einsatz mit dieser UUID vorhanden?        
+    db.get('select uuid from waip_einsaetze where uuid like ?', [uuid], function (err, row) {
+      if (err == null && row) {
+        callback && callback(row);
+      } else {
+        callback && callback(null);
+      };
+    });
+
+  };
+
   function db_wache_id_ermitteln(content, callback) {
     db.each('select waip_wachen_ID from waip_einsatzmittel where waip_einsaetze_ID = ? ' +
       'and waip_wachen_ID not null group by waip_wachen_ID', [content],
@@ -353,7 +373,8 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
             ) em0 ON em0.waip_einsaetze_id = e.ID
           WHERE e.id LIKE ?
           ORDER BY e.id DESC LIMIT 1`,
-          [app_cfg.global.default_time_for_standby, user_id, waip_id, wachen_nr, waip_id, wachen_nr, waip_id], function(err, row) {
+          [app_cfg.global.default_time_for_standby, user_id, waip_id, wachen_nr, waip_id, wachen_nr, waip_id],
+          function (err, row) {
             if (err == null && row) {
               callback && callback(row);
             } else {
@@ -893,6 +914,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     db_einsatz_laden: db_einsatz_laden,
     db_einsatz_ermitteln: db_einsatz_ermitteln,
     db_wache_vorhanden: db_wache_vorhanden,
+    db_einsatz_uuid_vorhanden: db_einsatz_uuid_vorhanden,
     db_wache_id_ermitteln: db_wache_id_ermitteln,
     db_wache_nr_ermitteln: db_wache_nr_ermitteln,
     db_get_einsatzdaten: db_get_einsatzdaten,
@@ -924,7 +946,8 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     db_get_response_for_wache: db_get_response_for_wache,
     db_get_einsatzdaten_by_uuid: db_get_einsatzdaten_by_uuid,
     db_get_waipid_by_uuid: db_get_waipid_by_uuid,
-    db_get_single_response_by_rmlduuid, db_get_single_response_by_rmlduuid,
+    db_get_single_response_by_rmlduuid,
+    db_get_single_response_by_rmlduuid,
     db_get_twitter_list: db_get_twitter_list
   };
 

views/dbrd.pug

@@ -4,8 +4,7 @@ append head
   link(rel='stylesheet', href='/css/leaflet.css')
 
 block content
-  //include includes/modal_info
+  include includes/modal_info
-  //include includes/modal_rmld
   .container-fluid
     include includes/master_dashboard
   //script.

views/overview.pug

@@ -14,14 +14,14 @@ block content
                   when 'Hilfeleistungseinsatz'
                     h5.font-weight-bold.text-info.ion-md-construct= ' ' + val.einsatzart + ' - ' + val.stichwort
                   when 'Rettungseinsatz'
-                    h5.font-weight-bold.text-warning.ion-md-midikit= ' ' + val.einsatzart + ' - ' + val.stichwort
+                    h5.font-weight-bold.text-warning.ion-md-medkit= ' ' + val.einsatzart + ' - ' + val.stichwort
                   when 'Krankentransport'
                     h5.font-weight-bold.text-success.ion-md-medical= ' ' + val.einsatzart + ' - ' + val.stichwort                    
                   default
                     h5.font-weight-bold.ion-md-information-circle= ' ' + val.einsatzart + ' - ' + val.stichwort
               .card-body.d-flex.justify-content-between
                 if val.ortsteil
-                  p= val.ort + ', ' + val.ortsteil
+                  a= val.ort + ', ' + val.ortsteil
                 else
                   p= val.ort
-                p.btn.btn-primary.mx-2.ion-md-arrow-round-forward(href='/dbrd/' + val.uuid, role='button')  Dashboard aufrufen
+                a.btn.btn-primary.btn-lg.mx-2.ion-md-arrow-round-forward(href='/dbrd/' + val.uuid, role='button')  Dashboard aufrufen