Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v2 up handler remove finish missions

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-02 10:10:38 +01:00
parent ab826a50e1
commit c395794da9
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 09:58:27 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 10:10:37 GMT+0100 (CET)*/
var AutomaticDispose_Branch = "master"; var AutomaticDispose_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
dist/autoloaderV2.js
Vendored
+20 -6
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 09:58:27 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 10:10:37 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18171,6 +18171,15 @@ class AutomaticDispose {
}) })
} }
FreeIframe(Runner){
const self = this;
const runnerID = self.ADisSettings.runner.indexOf(Runner)
const runnerIframe = self.ADisSettings.runner_iframes[runnerID];
$('#' + runnerIframe).attr("src", '');
$('#' + runnerIframe).attr("mission_id", 'empty');
setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}
UpdateMissionsToDone(MissionID) { UpdateMissionsToDone(MissionID) {
const self = this; const self = this;
return self.ADisDB.ADisMissions.update(MissionID, { return self.ADisDB.ADisMissions.update(MissionID, {
@@ -18294,10 +18303,12 @@ class AutomaticDispose {
return self.MainHandler() return self.MainHandler()
}); });
} }
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}); });
} }
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}) })
}, 1500); }, 1500);
} }
@@ -18307,11 +18318,13 @@ class AutomaticDispose {
const self = this; const self = this;
if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
console.log("DONE!"); console.log("DONE!");
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); // delete Mission here as completed self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
} }
if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
console.log("SEND"); console.log("SEND");
return tellParent(`console.log('update:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');`); // update Mission here as updated or full self.UpdateMissionsToDone(self.MissionID);
return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
} else { } else {
setTimeout(function () { setTimeout(function () {
if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {
@@ -18472,7 +18485,8 @@ class AutomaticDispose {
console.log("WILL KLICK SEND") console.log("WILL KLICK SEND")
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');},500);`); self.UpdateMissionsToDone(self.MissionID);
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`);
}, 250); }, 250);
} }
}) })
src/autoloaderV2.js
+19 -5
View File
@@ -1001,6 +1001,15 @@ class AutomaticDispose {
}) })
} }
FreeIframe(Runner){
const self = this;
const runnerID = self.ADisSettings.runner.indexOf(Runner)
const runnerIframe = self.ADisSettings.runner_iframes[runnerID];
$('#' + runnerIframe).attr("src", '');
$('#' + runnerIframe).attr("mission_id", 'empty');
setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}
UpdateMissionsToDone(MissionID) { UpdateMissionsToDone(MissionID) {
const self = this; const self = this;
return self.ADisDB.ADisMissions.update(MissionID, { return self.ADisDB.ADisMissions.update(MissionID, {
@@ -1124,10 +1133,12 @@ class AutomaticDispose {
return self.MainHandler() return self.MainHandler()
}); });
} }
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}); });
} }
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}) })
}, 1500); }, 1500);
} }
@@ -1137,11 +1148,13 @@ class AutomaticDispose {
const self = this; const self = this;
if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
console.log("DONE!"); console.log("DONE!");
return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); // delete Mission here as completed self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
} }
if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
console.log("SEND"); console.log("SEND");
return tellParent(`console.log('update:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');`); // update Mission here as updated or full self.UpdateMissionsToDone(self.MissionID);
return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full
} else { } else {
setTimeout(function () { setTimeout(function () {
if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {
@@ -1302,7 +1315,8 @@ class AutomaticDispose {
console.log("WILL KLICK SEND") console.log("WILL KLICK SEND")
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');},500);`); self.UpdateMissionsToDone(self.MissionID);
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`);
}, 250); }, 250);
} }
}) })