From 4463fa302decea6cef5364f67d29363167530ae7 Mon Sep 17 00:00:00 2001
From: Robert Richter <robertrichter87@web.de>
Date: Tue, 16 Jun 2020 22:31:01 +0200
Subject: [PATCH] update Di 16. Jun 22:31:01 CEST 2020

---
 server/broker.js  | 7 +++----
 server/sql_cfg.js | 2 +-
 server/sql_qry.js | 8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/broker.js b/server/broker.js
index f9220f7..37984c3 100755
--- a/server/broker.js
+++ b/server/broker.js
@@ -10,7 +10,7 @@ module.exports = function (app_cfg, sql, uuidv4) {
       console.log('Liste Vermittlung: ' + JSON.stringify(list_data));
     };
 
-    if (list_data.vmlt_typ == 'twitter') {
+    if (list_data.vmtl_typ == 'twitter') {
       // wenn es sich um eine Twitter-Liste/Gruppe handelt, Account-Zugangsdaten ermitteln
       sql.db_vmtl_get_tw_account(list_data, function (vmtl_data) {
 
@@ -52,7 +52,7 @@ module.exports = function (app_cfg, sql, uuidv4) {
                   var arrayLength = members.users.length;
                   for (var i = 0; i < arrayLength; i++) {
                     // Mitteilungstext festelgen
-                    var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + vmtl_data.einsatzart + ' für ' + vmtl_data.name_wache + ', bitte um Rückmeldung: ' +
+                    var tw_text = String.fromCodePoint(0x1F4DF) + ' ' + String.fromCodePoint(0x1F6A8) + String.fromCodePoint(0x0A) + 'Einsatz für ' + vmtl_data.name_wache + ' ' +String.fromCodePoint(0x27A1) + ' ' + vmtl_data.einsatzart + String.fromCodePoint(0x0A) + 'jetzt Rückmeldung senden: ' +
                       app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4();
                     // Parameter der Mitteilung
                     var msg_params = {
@@ -74,7 +74,7 @@ module.exports = function (app_cfg, sql, uuidv4) {
                         sql.db_log('VMTL', 'Einsatz-Link an ' + members.users[i].screen_name + ' gesendet.');
                         callback && callback(members);
                       } else {
-                        sql.db_log('VMTL', 'Fehler beim senden des Einsatz-Links an ' + members.users[i].screen_name + ': ' + error);
+                        sql.db_log('VMTL', 'Fehler beim senden eines Einsatz-Links: ' + error);
                         callback && callback(null);
                       };
                     });
@@ -85,7 +85,6 @@ module.exports = function (app_cfg, sql, uuidv4) {
                 };
               });
             } else {
-              console.log(error);
               sql.db_log('VMTL', 'Fehler beim lesen der Twitter-Liste: ' + error);
               callback && callback(null);
             };
diff --git a/server/sql_cfg.js b/server/sql_cfg.js
index b9c8d60..873cbd1 100644
--- a/server/sql_cfg.js
+++ b/server/sql_cfg.js
@@ -129,7 +129,7 @@ module.exports = function (fs, bcrypt, app_cfg) {
       // Vermittlungs-Tabelle erstellen
       db.run(`CREATE TABLE waip_vmtl (
         id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
-        waip_wachen_id INTEGER,
+        waip_wachenname TEXT,
         vmtl_typ TEXT,
         vmtl_account_name TEXT,
         vmtl_account_group TEXT,
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 3ed19e1..128c91c 100755
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -815,7 +815,7 @@ module.exports = function (db, app_cfg) {
 
   function db_vmtl_get_list(waip_id, callback) {
     // Pruefen ob fuer eine Wache im Einsatz ein Verteilerliste hinterlegt ist
-    db.get(`select v.waip_wachen_id, v.vmlt_typ, v.vmlt_account_name, v.vmtl_account_group from waip_vmtl v 
+    db.get(`select v.waip_wachen_id, v.vmtl_typ, v.vmtl_account_name, v.vmtl_account_group from waip_vmtl v 
       where v.waip_wachen_id = (select distinct w.id wachen_id from waip_wachen w left join waip_einsatzmittel em on em.wachenname = w.name_wache 
       where em.waip_einsaetze_ID = ?)`, [waip_id], function (err, liste) {
       if (err == null && liste) {
@@ -832,7 +832,11 @@ module.exports = function (db, app_cfg) {
     // falls Liste für Wache hinterlegt, dann hier die Twitter-Account-Daten, Einsatz-UUID, Einsatzart und Wachenname auslesen
     db.get(`select tw.tw_screen_name, tw.tw_consumer_key, tw.tw_consumer_secret, tw.tw_access_token_key, tw.tw_access_token_secret, we.uuid, we.einsatzart, wa.name_wache 
     from waip_tw_accounts tw, waip_einsaetze we, waip_wachen wa
-    where tw.tw_screen_name = ? AND we.id = ? AND wa.id = ?`, [list_data.vmlt_account_name, list_data.waip_id, list_data.waip_wachen_id], function (err, vmtl_daten) {
+    where tw.tw_screen_name = ? AND we.id = ? AND wa.id = ?`, [list_data.vmtl_account_name, list_data.waip_id, list_data.waip_wachen_id], function (err, vmtl_daten) {
+      console.log(vmtl_daten);
+      console.log('vmtl_daten');
+
+      
       if (err == null && vmtl_daten) {
         // Listen-Name zu Daten hinzufuegen
         vmtl_daten.list = list_data.vmtl_account_group;