From e1db3e615fe74edf388b4f6fc6584b7cee2ed784 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 28 Apr 2020 10:01:01 +0200
Subject: [PATCH] update Di 28. Apr 10:01:01 CEST 2020

---
 server/socket.js  |  3 ++-
 server/sql_qry.js | 39 ++++++++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/server/socket.js b/server/socket.js
index 9cde42b..d4dfcb1 100755
--- a/server/socket.js
+++ b/server/socket.js
@@ -33,7 +33,8 @@ module.exports = function (io, sql, app_cfg, waip) {
           // Socket-Room beitreiten
           socket.join(wachen_id, function () {
             // Socket-ID und Client-IP in der Datenbank speichern
-            sql.db_client_save(socket.id, client_ip, wachen_id);
+            //sql.db_client_save(socket.id, client_ip, wachen_id);
+            //sql.db_update_client_status(socket, null);
             // prüfen ob für diese Wache Einsätze vorhanden sind
             sql.db_einsatz_ermitteln(wachen_id, socket.request.user.id, function (result_einsatz) {
               if (result_einsatz) {
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 0307dde..ff480d0 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -364,15 +364,6 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     };
   };
 
-  function db_client_save(client_id, client_ip, room_name) {
-    db.run('INSERT OR REPLACE INTO waip_clients (' +
-      'socket_id, client_ip, room_name) ' +
-      'VALUES (\'' +
-      client_id + '\', \'' +
-      client_ip + '\', \'' +
-      room_name + '\')');
-  };
-
   function db_client_delete(socket) {
     db.run('DELETE FROM waip_clients ' +
       'WHERE socket_id = ?', socket.id);
@@ -408,9 +399,18 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     });
   };
 
+  
+  /*function db_client_save(client_id, client_ip, room_name) {
+    db.run('INSERT OR REPLACE INTO waip_clients (' +
+      'socket_id, client_ip, room_name) ' +
+      'VALUES (\'' +
+      client_id + '\', \'' +
+      client_ip + '\', \'' +
+      room_name + '\')');
+  };*/
+
   function db_update_client_status(socket, client_status) {
     //console.log(socket);
-    var socket_id = socket.id;
     var user_name = socket.request.user.user;
     var user_permissions = socket.request.user.permissions;
     var user_agent = socket.request.headers['user-agent'];
@@ -428,14 +428,27 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     if ((typeof reset_timestamp === "undefined") || (reset_timestamp == null)) {
       reset_timestamp = app_cfg.global.default_time_for_standby;
     };
-    db.run(`UPDATE waip_clients
+    
+    db.run(`insert or replace into waip_clients 
+      (id, socket_id, client_ip, room_name, client_status, user_name, user_permissions, user_agent, reset_timestamp ) values (
+      (select id from waip_clients where socket_id = \'` + socket.id + `\'),
+      \'` + socket.id + `\',
+      \'` + client_ip + `\',
+      \'` + socket.rooms[Object.keys(socket.rooms)[0]] + `\',
+      \'` + client_status + `\',
+      \'` + user_name + `\',
+      \'` + user_permissions + `\',
+      \'` + user_agent + `\',
+      (select DATETIME(zeitstempel,\'+\' || ` + reset_timestamp + ` || \' minutes\') from waip_einsaetze where id =\'` + client_status + `\'));`);
+
+    /*db.run(`UPDATE waip_clients
       SET client_status=\'` + client_status + `\',
       client_ip=\'` + client_ip + `\',
       user_name=\'` + user_name + `\',
       user_permissions=\'` + user_permissions + `\',
       user_agent=\'` + user_agent + `\',
       reset_timestamp=(select DATETIME(zeitstempel,\'+\' || ` + reset_timestamp + ` || \' minutes\') from waip_einsaetze where id =\'` + client_status + `\')
-      WHERE socket_id=\'` + socket_id + `\'`);
+      WHERE socket_id=\'` + socket_id + `\'`);*/
   };
 
   function db_check_client_waipid(socketId, waip_id, callback) {
@@ -890,7 +903,7 @@ module.exports = function(db, uuidv4, turf, app_cfg) {
     db_letzten_einsatz_ermitteln: db_letzten_einsatz_ermitteln,
     db_einsatz_loeschen: db_einsatz_loeschen,
     db_get_alte_einsaetze: db_get_alte_einsaetze,
-    db_client_save: db_client_save,
+    //db_client_save: db_client_save,
     db_client_delete: db_client_delete,
     db_tts_einsatzmittel: db_tts_einsatzmittel,
     db_get_socket_by_id: db_get_socket_by_id,