diff --git a/dist/autoloader.js b/dist/autoloader.js index 18d0608..ddda9ab 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 16:12:04 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:13:48 GMT+0100 (CET)*/ var AutomaticDispose_Branch = "master"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 5f56b06..b644252 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 16:12:04 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:13:48 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18453,28 +18453,28 @@ class AutomaticDispose { const self = this; if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { - console.log("DONE!"); - console.log("DONE: ", self.MissionID); - return self.RemoveMissionsFromQueue(self.MissionID).then(() => { - return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed - }) + console.log("DONE!"); + console.log("DONE: ", self.MissionID); + return self.RemoveMissionsFromQueue(self.MissionID).then(() => { + return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed + }) } else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) { - - console.log("SEND"); - console.log("SEND: ", self.MissionID); - return self.UpdateMissionsToDone(self.MissionID).then(() => { - return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full - }); + + console.log("SEND"); + console.log("SEND: ", self.MissionID); + return self.UpdateMissionsToDone(self.MissionID).then(() => { + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full + }); } else { - if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { - console.log("WILL SEND?") - self.CheckMissionAutomatic(); - } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { - self.WorkVerbandMission(); - } + if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { + console.log("WILL SEND?") + return self.CheckMissionAutomatic(); + } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { + return self.WorkVerbandMission(); + } } } @@ -18547,13 +18547,14 @@ class AutomaticDispose { CheckMissionAutomatic() { const self = this; - + const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name); self.MyRunner = self.ADisSettings.runner[runnerID]; self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID]; if (self.MyRunnerSettings && self.MyRunner) { - self.ADSettings().then((setting) => { - if (setting[self.MyRunnerSettings] === 'true') { + console.log("debug 1"); + self.ADSettings().then((setting) => { + if (setting[self.MyRunnerSettings] === 'true') { let where = { missionID: self.MissionID, runner: self.MyRunner, @@ -18568,6 +18569,7 @@ class AutomaticDispose { return coll.limit(1).toArray() } }).then((Missions) => { + console.log("debug 2", Missions); if (Missions.length > 0) { var Mission = Missions[0]; if (self.MyRunner == 'os') { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index d11872b..6bf3751 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1212,28 +1212,28 @@ class AutomaticDispose { const self = this; if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { - console.log("DONE!"); - console.log("DONE: ", self.MissionID); - return self.RemoveMissionsFromQueue(self.MissionID).then(() => { - return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed - }) + console.log("DONE!"); + console.log("DONE: ", self.MissionID); + return self.RemoveMissionsFromQueue(self.MissionID).then(() => { + return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed + }) } else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) { - - console.log("SEND"); - console.log("SEND: ", self.MissionID); - return self.UpdateMissionsToDone(self.MissionID).then(() => { - return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full - }); + + console.log("SEND"); + console.log("SEND: ", self.MissionID); + return self.UpdateMissionsToDone(self.MissionID).then(() => { + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full + }); } else { - if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { - console.log("WILL SEND?") - self.CheckMissionAutomatic(); - } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { - self.WorkVerbandMission(); - } + if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { + console.log("WILL SEND?") + return self.CheckMissionAutomatic(); + } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { + return self.WorkVerbandMission(); + } } } @@ -1306,13 +1306,14 @@ class AutomaticDispose { CheckMissionAutomatic() { const self = this; - + const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name); self.MyRunner = self.ADisSettings.runner[runnerID]; self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID]; if (self.MyRunnerSettings && self.MyRunner) { - self.ADSettings().then((setting) => { - if (setting[self.MyRunnerSettings] === 'true') { + console.log("debug 1"); + self.ADSettings().then((setting) => { + if (setting[self.MyRunnerSettings] === 'true') { let where = { missionID: self.MissionID, runner: self.MyRunner, @@ -1327,6 +1328,7 @@ class AutomaticDispose { return coll.limit(1).toArray() } }).then((Missions) => { + console.log("debug 2", Missions); if (Missions.length > 0) { var Mission = Missions[0]; if (self.MyRunner == 'os') {