mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Di 16. Jun 23:01:02 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-16 23:01:02 +02:00
parent 4463fa302d
commit 2161446f72
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/broker.js
View File

@ -52,8 +52,9 @@ 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) + ' ' + 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();
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 + ': ' + vmtl_data.stichwort + String.fromCodePoint(0x0A) +
'jetzt Rückmeldung senden: ' + app_cfg.public.url + '/rmld/' + vmtl_data.uuid + '/' + uuidv4();
// Parameter der Mitteilung
var msg_params = {
event: {
@ -71,11 +72,10 @@ module.exports = function (app_cfg, sql, uuidv4) {
// Mitteilung senden
T.post('direct_messages/events/new', msg_params, function (error, members, response) {
if (!error) {
sql.db_log('VMTL', 'Einsatz-Link an ' + members.users[i].screen_name + ' gesendet.');
callback && callback(members);
sql.db_log('VMTL', 'Einsatz-Link gesendet: ' + JSON.stringify(members));
callback && callback(vmtl_data.list);
} else {
sql.db_log('VMTL', 'Fehler beim senden eines Einsatz-Links: ' + error);
callback && callback(null);
};
});
};
@ -91,7 +91,7 @@ module.exports = function (app_cfg, sql, uuidv4) {
});
} else {
sql.db_log('VMTL', 'Zugangsdaten für Twitter-Account ' + vmtl_data.tw_screen_name + ' konnten nicht ermittelt werden.');
sql.db_log('VMTL', 'Zugangsdaten für Twitter-Account ' + list_data.vmtl_account_name + ' konnten nicht ermittelt werden.');
};
});

3
server/sql_cfg.js
View File

@ -132,8 +132,7 @@ module.exports = function (fs, bcrypt, app_cfg) {
waip_wachenname TEXT,
vmtl_typ TEXT,
vmtl_account_name TEXT,
vmtl_account_group TEXT,
FOREIGN KEY(waip_wachen_id) REFERENCES waip_wachen(id))`);
vmtl_account_group TEXT)`);
// Twitter-Account-Tabelle erstellen
db.run(`CREATE TABLE waip_tw_accounts (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,

12
server/sql_qry.js
View File

@ -815,8 +815,8 @@ 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.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
db.get(`select v.waip_wachenname, v.vmtl_typ, v.vmtl_account_name, v.vmtl_account_group from waip_vmtl v
where v.waip_wachenname = (select distinct w.name_wache waip_wachenname 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) {
// waip_id zu Daten hinzufuegen
@ -830,13 +830,9 @@ module.exports = function (db, app_cfg) {
function db_vmtl_get_tw_account(list_data, callback) {
// 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
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, we.stichwort, 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.vmtl_account_name, list_data.waip_id, list_data.waip_wachen_id], function (err, vmtl_daten) {
console.log(vmtl_daten);
console.log('vmtl_daten');
where tw.tw_screen_name = ? AND we.id = ? AND wa.name_wache like ?`, [list_data.vmtl_account_name, list_data.waip_id, list_data.waip_wachenname], function (err, vmtl_daten) {
if (err == null && vmtl_daten) {
// Listen-Name zu Daten hinzufuegen
vmtl_daten.list = list_data.vmtl_account_group;

2
server/waip.js
View File

@ -35,7 +35,7 @@ module.exports = function (io, sql, fs, brk, async, app_cfg) {
if (list) {
brk.alert_vmtl_list(list, function (result) {
if (!result) {
sql.db_log('VMTL', 'Link zur Einsatz-Rückmeldung erfolgreichen an Vermittler-Liste gesendet. ' + result);
sql.db_log('VMTL', 'Link zur Einsatz-Rückmeldung erfolgreich an Vermittler-Liste gesendet. ' + result);
} else {
sql.db_log('VMTL', 'Fehler beim senden des Links zur Einsatz-Rueckmeldung an die Vermittler-Liste: ' + result);
};