From ea290015ef8ca4bdd48b9efe1c7c5a840f5a555d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Mon, 3 Dec 2018 12:00:44 +0100 Subject: [PATCH] v2 up aiogja80a --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 19 +++++++++++++++---- src/autoloaderV2.js | 17 ++++++++++++++--- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index bf934f2..3c9d29f 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 03 2018 11:55:48 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 03 2018 12:00: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(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 6c3e7ba..5147257 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 03 2018 11:55:48 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 03 2018 12:00:44 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18871,7 +18871,7 @@ class AutomaticDispose { if (self.MyRunner == 'os') { self.OweSecure = true; } - self.GetMissionConfiguration(self.MyRunner == 'kt' ? 147 : Mission.type); + self.GetMissionConfiguration(Mission.type); } }); } @@ -18905,35 +18905,45 @@ class AutomaticDispose { StartAlarmProcess() { const self = this; setTimeout(function () { + console.log('StartAlarmProcess') Promise.resolve().then(async () => { + console.log('PrepareVehicleNeedList') return await self.PrepareVehicleNeedList(); }).then(async () => { + console.log('CollectInvolvedVehicles') return await self.CollectInvolvedVehicles(); }).then(async () => { + console.log('CollectPatients') return await self.CollectPatients(); }) .then(async () => { + console.log('ProcessEmergencyMedicalService') return await self.ProcessEmergencyMedicalService() }) .then(async () => { + console.log('ProcessFireDepartment') return await self.ProcessFireDepartment() }) .then(async () => { + console.log('ProcessPoliceDepartment') return await self.ProcessPoliceDepartment() }) .then(async () => { + console.log('ProcessTechnicalEmergencyService') return await self.ProcessTechnicalEmergencyService() }) .then(async () => { + console.log('ProcessWaterRescue') return await self.ProcessWaterRescue() }).then(() => { + console.log('OweSecure?') if (self.OweSecure) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)').length > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)')[0].click(); } } - + console.log('MissionConfig.share?') // TODO check cars driving or already there if (self.MissionConfig.share){ console.log('self.MissionConfig.share',self.MissionConfig.share) @@ -18944,10 +18954,11 @@ class AutomaticDispose { continue; } elems[i].click(); - } } + console.log('MissionConfig.share - after') + console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').length, $('#vehicle_show_table_all input[type="checkbox"]:checked')); console.log("WILL KLICK SEND") setTimeout(() => { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 2d0df38..53ecfd3 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1279,7 +1279,7 @@ class AutomaticDispose { if (self.MyRunner == 'os') { self.OweSecure = true; } - self.GetMissionConfiguration(self.MyRunner == 'kt' ? 147 : Mission.type); + self.GetMissionConfiguration(Mission.type); } }); } @@ -1313,35 +1313,45 @@ class AutomaticDispose { StartAlarmProcess() { const self = this; setTimeout(function () { + console.log('StartAlarmProcess') Promise.resolve().then(async () => { + console.log('PrepareVehicleNeedList') return await self.PrepareVehicleNeedList(); }).then(async () => { + console.log('CollectInvolvedVehicles') return await self.CollectInvolvedVehicles(); }).then(async () => { + console.log('CollectPatients') return await self.CollectPatients(); }) .then(async () => { + console.log('ProcessEmergencyMedicalService') return await self.ProcessEmergencyMedicalService() }) .then(async () => { + console.log('ProcessFireDepartment') return await self.ProcessFireDepartment() }) .then(async () => { + console.log('ProcessPoliceDepartment') return await self.ProcessPoliceDepartment() }) .then(async () => { + console.log('ProcessTechnicalEmergencyService') return await self.ProcessTechnicalEmergencyService() }) .then(async () => { + console.log('ProcessWaterRescue') return await self.ProcessWaterRescue() }).then(() => { + console.log('OweSecure?') if (self.OweSecure) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)').length > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)')[0].click(); } } - + console.log('MissionConfig.share?') // TODO check cars driving or already there if (self.MissionConfig.share){ console.log('self.MissionConfig.share',self.MissionConfig.share) @@ -1352,10 +1362,11 @@ class AutomaticDispose { continue; } elems[i].click(); - } } + console.log('MissionConfig.share - after') + console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').length, $('#vehicle_show_table_all input[type="checkbox"]:checked')); console.log("WILL KLICK SEND") setTimeout(() => {