From 0edf21fa248a8297cfba4c5498dd1b05c24230a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Tue, 19 Feb 2019 00:47:20 +0100 Subject: [PATCH] fix loop... police cars send to verband mission --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 53 ++++++++++++++++++++++++++------------------ src/autoloaderV2.js | 51 ++++++++++++++++++++++++------------------ 3 files changed, 62 insertions(+), 44 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 09e7787..8949fb1 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 00:29:30 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 00:47:18 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 3e58367..3371981 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 00:29:30 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 00:47:18 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -4591,7 +4591,7 @@ "last_check": Math.floor(new Date().getTime() / 1000), "next_check": Math.floor(new Date().getTime() / 1000) + 1 } - if (data.vehicle_state === 0 && (data.missing_text===null || (data.missing_text && data.missing_text.includes('Zusätzlich benötigte Fahrzeuge')))) { + if (data.vehicle_state === 0 && (data.missing_text === null || (data.missing_text && data.missing_text.includes('Zusätzlich benötigte Fahrzeuge')))) { window.AutomaticDisposeCall.AddMissionsToQueue(missionData) } else if (data.missing_text === 'Gefangene sollen abtransportiert werden.') { window.AutomaticDisposeCall.AddPoliceSprechwunschToQueue(String(data.id)); @@ -18431,7 +18431,7 @@ Check_Call_Police_Active() { let self = this; - if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/) { + if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/ ) { //TODO: check if Verband or Event and // Maybe done with //__FIXX__20192 self.Collect_Jails(); @@ -18462,6 +18462,7 @@ let self = this; self.Jails = []; var CountGefangene = Number(parseInt($('#h2_prisoners').text())); + let ImThere = $('#mission_vehicle_at_mission tr > td:nth-child(5) > a:contains("Jomaar"),#mission_vehicle_driving tr > td:nth-child(7) > a:contains("Jomaar")').length; var parentNode = $('#mission_vehicle_at_mission tr > td:nth-child(5) > a:contains("Jomaar")').parent().parent(); var GefKw = parentNode.find('td:nth-child(2) > a[vehicle_type_id="52"]'); var FuStW = parentNode.find('td:nth-child(2) > a[vehicle_type_id="32"]'); @@ -18610,37 +18611,45 @@ //__FIXX__20192 let me = $(elem).find('td:nth-child(5) > a:contains("Jomaar")').length; if (me > 0) { - //__FIXX__20192 + //__FIXX__20192 var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id")); if (CalledVehicleID == 52) { CountGefangene -= 5; } else if (CalledVehicleID == 32) { CountGefangene -= 1; } - //__FIXX__20192 + //__FIXX__20192 } //__FIXX__20192 }); - if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').length > 0 && CountGefangene >= 5) { - $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => { - if (CountGefangene > 0) { - $(elem).click() - CountGefangene -= 5; - } + if (ImThere > 0) { + if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').length > 0 && CountGefangene >= 5) { + $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => { + if (CountGefangene > 0) { + $(elem).click() + CountGefangene -= 5; + } + }); + } + if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').length > 0 && CountGefangene > 0) { + $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => { + if (CountGefangene > 0) { + $(elem).click() + CountGefangene -= 1; + } + }); + } + + if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { + $('#mission_alarm_btn').click(); + } + } else { + let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); }); } - if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').length > 0 && CountGefangene > 0) { - $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => { - if (CountGefangene > 0) { - $(elem).click() - CountGefangene -= 1; - } - }); - } - if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { - $('#mission_alarm_btn').click(); - } } } diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index df46be5..9a8261d 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -116,7 +116,7 @@ "last_check": Math.floor(new Date().getTime() / 1000), "next_check": Math.floor(new Date().getTime() / 1000) + 1 } - if (data.vehicle_state === 0 && (data.missing_text===null || (data.missing_text && data.missing_text.includes('Zusätzlich benötigte Fahrzeuge')))) { + if (data.vehicle_state === 0 && (data.missing_text === null || (data.missing_text && data.missing_text.includes('Zusätzlich benötigte Fahrzeuge')))) { window.AutomaticDisposeCall.AddMissionsToQueue(missionData) } else if (data.missing_text === 'Gefangene sollen abtransportiert werden.') { window.AutomaticDisposeCall.AddPoliceSprechwunschToQueue(String(data.id)); @@ -632,7 +632,7 @@ Check_Call_Police_Active() { let self = this; - if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/) { + if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/ ) { //TODO: check if Verband or Event and // Maybe done with //__FIXX__20192 self.Collect_Jails(); @@ -663,6 +663,7 @@ let self = this; self.Jails = []; var CountGefangene = Number(parseInt($('#h2_prisoners').text())); + let ImThere = $('#mission_vehicle_at_mission tr > td:nth-child(5) > a:contains("Jomaar"),#mission_vehicle_driving tr > td:nth-child(7) > a:contains("Jomaar")').length; var parentNode = $('#mission_vehicle_at_mission tr > td:nth-child(5) > a:contains("Jomaar")').parent().parent(); var GefKw = parentNode.find('td:nth-child(2) > a[vehicle_type_id="52"]'); var FuStW = parentNode.find('td:nth-child(2) > a[vehicle_type_id="32"]'); @@ -811,37 +812,45 @@ //__FIXX__20192 let me = $(elem).find('td:nth-child(5) > a:contains("Jomaar")').length; if (me > 0) { - //__FIXX__20192 + //__FIXX__20192 var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id")); if (CalledVehicleID == 52) { CountGefangene -= 5; } else if (CalledVehicleID == 32) { CountGefangene -= 1; } - //__FIXX__20192 + //__FIXX__20192 } //__FIXX__20192 }); - if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').length > 0 && CountGefangene >= 5) { - $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => { - if (CountGefangene > 0) { - $(elem).click() - CountGefangene -= 5; - } + if (ImThere > 0) { + if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').length > 0 && CountGefangene >= 5) { + $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => { + if (CountGefangene > 0) { + $(elem).click() + CountGefangene -= 5; + } + }); + } + if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').length > 0 && CountGefangene > 0) { + $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => { + if (CountGefangene > 0) { + $(elem).click() + CountGefangene -= 1; + } + }); + } + + if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { + $('#mission_alarm_btn').click(); + } + } else { + let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); }); } - if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').length > 0 && CountGefangene > 0) { - $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => { - if (CountGefangene > 0) { - $(elem).click() - CountGefangene -= 1; - } - }); - } - if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { - $('#mission_alarm_btn').click(); - } } }