diff --git a/dist/autoloader.js b/dist/autoloader.js index 40f8931..0e0607c 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 20:12:54 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 20:20:50 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(); @@ -5296,12 +5296,12 @@ ADisDB.on("ready", () => { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { ADis_CheckMissionAutomatic(); - } else if (['adis-verbandmission','adis-verbandmission-event'].indexOf(window.name) != -1) { + } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { ADis_WorkVerbandMission(); } }, 400); } else { - 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.')) { return ADis_MissionDelete(MissionID); // delete Mission here as completed } } @@ -5319,9 +5319,9 @@ ADisDB.on("ready", () => { var title = document.getElementById('missionH1'); var isVerband = title.innerText.toLowerCase().includes("[verband]"); if (setting['Alliance-Automatic'] == 'true' && isVerband) { - if ([52,55,129,203].indexOf(MissionType) !== -1 && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { + if ([52, 55, 129, 203].indexOf(MissionType) !== -1 && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]')[0].click(); - } else if ([53,130,202].indexOf(MissionType) !== -1){ + } else if ([53, 130, 202].indexOf(MissionType) !== -1) { if ($('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]')[0].click(); } else if ($('#vehicle_show_table_all tr[vehicle_type="GW-A"] input[type="checkbox"]').size() > 0) { @@ -5331,7 +5331,7 @@ ADisDB.on("ready", () => { } else if ($('#vehicle_show_table_all tr[vehicle_type="NEF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="NEF"] input[type="checkbox"]')[0].click(); } - } else if ([54,56].indexOf(MissionType) !== -1){ + } else if ([54, 56].indexOf(MissionType) !== -1) { if ($('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]')[0].click(); } else if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { @@ -5447,7 +5447,7 @@ ADisDB.on("ready", () => { last_check: CurrentTime, next_check: CurrentTime + 60 }; - ADis_MissionUpdateDone(window.name, MissionID, updateData); + tellParent(`ADis_MissionUpdateDone("${window.name}", '${MissionID}');`); if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) { setTimeout(() => { $('#mission_alarm_btn').click(); @@ -5595,11 +5595,11 @@ ADisDB.on("ready", () => { if (typeof MissionConfig.emergency_medical_service == "object") // Wenn der EMS-Block in der Config definiert ist { if (Object.keys(AD_Patients).length >= 5) { // need LNA - ADis_VehiclesNeed["55"]=1; + ADis_VehiclesNeed["55"] = 1; } if (Object.keys(AD_Patients).length >= 10) { // need OrgL - ADis_VehiclesNeed["56"]=1; + ADis_VehiclesNeed["56"] = 1; } //$.each(AD_Patients, function (Key, Patient) { @@ -5614,7 +5614,7 @@ ADisDB.on("ready", () => { ADis_VehiclesNeed["55"] = 1; if (Patient.need_OrgL && ADis_VehiclesNeed["56"] < 1) - ADis_VehiclesNeed["56"]=1; + ADis_VehiclesNeed["56"] = 1; if (Patient.need_Tragehilfe == true) ADis_VehiclesNeed["0"]++; @@ -5653,7 +5653,7 @@ ADisDB.on("ready", () => { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -5816,19 +5816,19 @@ ADisDB.on("ready", () => { var dangerText = $('#iframe-inside-container > div.alert.alert-danger').text(); - if (includesString(dangerText, "Wir benötigen min.") && includesString(dangerText, "Feuerwehrleute.") ) { + if (includesString(dangerText, "Wir benötigen min.") && includesString(dangerText, "Feuerwehrleute.")) { const weNeed = ADis_VehiclesNeed["0"]; const regex = /(\d+) Feuerwehrleute/gm; const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) - weNeed; ADis_VehiclesNeed["0"] = newNeed; } - + $("#vehicle_show_table_body_all").find(".vehicle_select_table_tr").each(function () { var VehicleID = $(this).attr("id").replace("vehicle_element_content_", ""); // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -6021,7 +6021,7 @@ ADisDB.on("ready", () => { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -6112,7 +6112,7 @@ ADisDB.on("ready", () => { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -6183,7 +6183,7 @@ ADisDB.on("ready", () => { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -6301,7 +6301,7 @@ ADisDB.on("ready", () => { ADis_VehiclesNeed["36"]--; } else if ([57].indexOf(VehicleTypeID) != -1) { ADis_VehiclesNeed["57"]--; - } else if ([4,39].indexOf(VehicleTypeID) != -1) { + } else if ([4, 39].indexOf(VehicleTypeID) != -1) { ADis_VehiclesNeed["4"]--; ADis_VehiclesNeed["39"]--; } else if ([4, 47].indexOf(VehicleTypeID) != -1) { diff --git a/dist/standalone.js b/dist/standalone.js index a39dbad..5de930a 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 20:12:54 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 20:20:50 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/mission/handler.js b/script/mission/handler.js index a176500..b713984 100755 --- a/script/mission/handler.js +++ b/script/mission/handler.js @@ -19,12 +19,12 @@ $(document).ready(function () { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { ADis_CheckMissionAutomatic(); - } else if (['adis-verbandmission','adis-verbandmission-event'].indexOf(window.name) != -1) { + } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { ADis_WorkVerbandMission(); } }, 400); } else { - 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.')) { return ADis_MissionDelete(MissionID); // delete Mission here as completed } } @@ -42,9 +42,9 @@ function ADis_WorkVerbandMission() { var title = document.getElementById('missionH1'); var isVerband = title.innerText.toLowerCase().includes("[verband]"); if (setting['Alliance-Automatic'] == 'true' && isVerband) { - if ([52,55,129,203].indexOf(MissionType) !== -1 && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { + if ([52, 55, 129, 203].indexOf(MissionType) !== -1 && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]')[0].click(); - } else if ([53,130,202].indexOf(MissionType) !== -1){ + } else if ([53, 130, 202].indexOf(MissionType) !== -1) { if ($('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]')[0].click(); } else if ($('#vehicle_show_table_all tr[vehicle_type="GW-A"] input[type="checkbox"]').size() > 0) { @@ -54,7 +54,7 @@ function ADis_WorkVerbandMission() { } else if ($('#vehicle_show_table_all tr[vehicle_type="NEF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="NEF"] input[type="checkbox"]')[0].click(); } - } else if ([54,56].indexOf(MissionType) !== -1){ + } else if ([54, 56].indexOf(MissionType) !== -1) { if ($('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]').size() > 0) { $('#vehicle_show_table_all tr[vehicle_type="FLF"] input[type="checkbox"]')[0].click(); } else if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0) { @@ -170,7 +170,7 @@ function AD_StartAlarmProcess() { last_check: CurrentTime, next_check: CurrentTime + 60 }; - ADis_MissionUpdateDone(window.name, MissionID, updateData); + tellParent(`ADis_MissionUpdateDone("${window.name}", '${MissionID}');`); if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) { setTimeout(() => { $('#mission_alarm_btn').click(); @@ -318,11 +318,11 @@ function ADis_ProcessEmergencyMedicalService() { if (typeof MissionConfig.emergency_medical_service == "object") // Wenn der EMS-Block in der Config definiert ist { if (Object.keys(AD_Patients).length >= 5) { // need LNA - ADis_VehiclesNeed["55"]=1; + ADis_VehiclesNeed["55"] = 1; } if (Object.keys(AD_Patients).length >= 10) { // need OrgL - ADis_VehiclesNeed["56"]=1; + ADis_VehiclesNeed["56"] = 1; } //$.each(AD_Patients, function (Key, Patient) { @@ -337,7 +337,7 @@ function ADis_ProcessEmergencyMedicalService() { ADis_VehiclesNeed["55"] = 1; if (Patient.need_OrgL && ADis_VehiclesNeed["56"] < 1) - ADis_VehiclesNeed["56"]=1; + ADis_VehiclesNeed["56"] = 1; if (Patient.need_Tragehilfe == true) ADis_VehiclesNeed["0"]++; @@ -376,7 +376,7 @@ function ADis_ProcessEmergencyMedicalService() { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -539,19 +539,19 @@ function ADis_ProcessFireDepartment() { var dangerText = $('#iframe-inside-container > div.alert.alert-danger').text(); - if (includesString(dangerText, "Wir benötigen min.") && includesString(dangerText, "Feuerwehrleute.") ) { + if (includesString(dangerText, "Wir benötigen min.") && includesString(dangerText, "Feuerwehrleute.")) { const weNeed = ADis_VehiclesNeed["0"]; const regex = /(\d+) Feuerwehrleute/gm; const newNeed = Math.ceil(Number(parseInt(dangerText.match(regex))) / 6) - weNeed; ADis_VehiclesNeed["0"] = newNeed; } - + $("#vehicle_show_table_body_all").find(".vehicle_select_table_tr").each(function () { var VehicleID = $(this).attr("id").replace("vehicle_element_content_", ""); // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -744,7 +744,7 @@ function ADis_ProcessPoliceDepartment() { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -835,7 +835,7 @@ function ADis_ProcessWaterRescue() { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -906,7 +906,7 @@ function ADis_ProcessTechnicalEmergencyService() { // var VehicleDistanceTime = $("#vehicle_sort_" + VehicleID).attr("sortvalue"); var VehicleType = $(this).attr("vehicle_type"); - if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0){ + if ($("#vehicle_checkbox_" + VehicleID + ":enabled").length === 0) { return; } @@ -1024,7 +1024,7 @@ function ADis_SelectCountVehicles(VehicleTypeID) { ADis_VehiclesNeed["36"]--; } else if ([57].indexOf(VehicleTypeID) != -1) { ADis_VehiclesNeed["57"]--; - } else if ([4,39].indexOf(VehicleTypeID) != -1) { + } else if ([4, 39].indexOf(VehicleTypeID) != -1) { ADis_VehiclesNeed["4"]--; ADis_VehiclesNeed["39"]--; } else if ([4, 47].indexOf(VehicleTypeID) != -1) {