diff --git a/dist/autoloader.js b/dist/autoloader.js index 1e823c2..12133d0 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 21:42:55 GMT+0100 (CET)*/ +/*Generated on:Mon Nov 26 2018 07:50:44 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(); @@ -17827,29 +17827,34 @@ ADisDB.on("ready", () => { return await ADis_CollectPatients(); }) .then(async () => { - return await Promise.all([ - ADis_ProcessEmergencyMedicalService(), - ADis_ProcessFireDepartment(), - ADis_ProcessPoliceDepartment(), - ADis_ProcessTechnicalEmergencyService(), - ADis_ProcessWaterRescue(), - ]).then((result) => { - var updateData = { - last_check: CurrentTime, - next_check: CurrentTime + 60 - }; - - console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked')); - if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) { - console.log("WILL KLICK SEND") - setTimeout(() => { - $('#mission_alarm_btn').click(); - tellParent(`setTimeout(function(){console.log('ok:${window.name}:${MissionID}');ADis_MissionUpdateDone('${window.name}', '${MissionID}');},1000);`); - }, 250); - } - }) - }); + return await ADis_ProcessEmergencyMedicalService() + }) + .then(async () => { + return await ADis_ProcessFireDepartment() + }) + .then(async () => { + return await ADis_ProcessPoliceDepartment() + }) + .then(async () => { + return await ADis_ProcessTechnicalEmergencyService() + }) + .then(async () => { + return await ADis_ProcessWaterRescue() + }).then(() => { + var updateData = { + last_check: CurrentTime, + next_check: CurrentTime + 60 + }; + console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked')); + if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) { + console.log("WILL KLICK SEND") + setTimeout(() => { + $('#mission_alarm_btn').click(); + tellParent(`setTimeout(function(){console.log('ok:${window.name}:${MissionID}');ADis_MissionUpdateDone('${window.name}', '${MissionID}');},1000);`); + }, 250); + } + }) }, 500); } diff --git a/dist/standalone.js b/dist/standalone.js index 0a2278c..e4f0135 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 21:42:55 GMT+0100 (CET)*/ +/*Generated on:Mon Nov 26 2018 07:50:44 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/gulpfile.js b/gulpfile.js index 5ce819d..6088436 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -68,4 +68,4 @@ gulp.task("minify2", ["scripts2"], function (cb) { ); }); -gulp.task("default", ["minify"]); \ No newline at end of file +gulp.task("default", ["scripts"]); \ No newline at end of file diff --git a/script/mission/handler.js b/script/mission/handler.js index 7f1dd88..3a69c3b 100755 --- a/script/mission/handler.js +++ b/script/mission/handler.js @@ -158,29 +158,34 @@ function AD_StartAlarmProcess() { return await ADis_CollectPatients(); }) .then(async () => { - return await Promise.all([ - ADis_ProcessEmergencyMedicalService(), - ADis_ProcessFireDepartment(), - ADis_ProcessPoliceDepartment(), - ADis_ProcessTechnicalEmergencyService(), - ADis_ProcessWaterRescue(), - ]).then((result) => { - var updateData = { - last_check: CurrentTime, - next_check: CurrentTime + 60 - }; - - console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked')); - if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) { - console.log("WILL KLICK SEND") - setTimeout(() => { - $('#mission_alarm_btn').click(); - tellParent(`setTimeout(function(){console.log('ok:${window.name}:${MissionID}');ADis_MissionUpdateDone('${window.name}', '${MissionID}');},1000);`); - }, 250); - } - }) - }); + return await ADis_ProcessEmergencyMedicalService() + }) + .then(async () => { + return await ADis_ProcessFireDepartment() + }) + .then(async () => { + return await ADis_ProcessPoliceDepartment() + }) + .then(async () => { + return await ADis_ProcessTechnicalEmergencyService() + }) + .then(async () => { + return await ADis_ProcessWaterRescue() + }).then(() => { + var updateData = { + last_check: CurrentTime, + next_check: CurrentTime + 60 + }; + console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked')); + if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) !== -1) { + console.log("WILL KLICK SEND") + setTimeout(() => { + $('#mission_alarm_btn').click(); + tellParent(`setTimeout(function(){console.log('ok:${window.name}:${MissionID}');ADis_MissionUpdateDone('${window.name}', '${MissionID}');},1000);`); + }, 250); + } + }) }, 500); }