This commit is contained in:
2018-11-27 12:21:09 +01:00
parent 5e078f6412
commit 7e0e9d5f21
9 changed files with 55 additions and 49 deletions

43
dist/autoloader.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Mon Nov 26 2018 07:56:34 GMT+0100 (CET)*/
/*Generated on:Tue Nov 27 2018 12:21:08 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();
@@ -17100,6 +17100,8 @@ ADisDB.on("ready", () => {
ADis_UpdateOwnMissionsToDone(MissionID).then(() => {
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
console.log('call ADis_OpenNextOwnMissions()');
ADis_OpenNextOwnMissions();
});
} else if (['adis-verbandmission'].indexOf(WindowName) !== -1) {
$("#adis-verbandmission-frame").attr("src", "");
@@ -17518,6 +17520,7 @@ ADisDB.on("ready", () => {
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, {
last_check: Math.floor(new Date().getTime() / 1000),
next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {console.error(err)})
}
@@ -17648,11 +17651,9 @@ ADisDB.on("ready", () => {
window.ADis_UpdateKrankentransportToDone = function ADis_UpdateKrankentransportToDone(MissionID) {
return ADisDB.ADisKrankentransport.update(MissionID, {
missionID: MissionID,
done: 'true'
}).catch((err) => {
console.error(err)
});
last_check: Math.floor(new Date().getTime() / 1000),
next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {console.error(err)})
}
window.ADis_RemoveKrankentransportFromQueue = function ADis_RemoveKrankentransportFromQueue(MissionID) {
@@ -17684,18 +17685,19 @@ ADisDB.on("ready", () => {
console.log("MissionType", MissionType);
console.log("CurrentTime", CurrentTime);
if (MissionType !== null) {
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")
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");
return ADis_MissionUpdateDone(MissionID); // update Mission here as updated or full
} else {
setTimeout(function () {
if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {
console.log("WILL SEND?")
ADis_CheckMissionAutomatic();
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {
ADis_WorkVerbandMission();
}
}, 250);
}
setTimeout(function () {
if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {
console.log("WILL SEND?")
ADis_CheckMissionAutomatic();
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {
ADis_WorkVerbandMission();
}
}, 250);
} else {
if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
console.log("DONE!")
@@ -17806,6 +17808,7 @@ ADisDB.on("ready", () => {
}).then((availableMission) => {
if (availableMission != undefined && availableMission.jsondata) {
MissionConfig = availableMission.jsondata;
console.log('MissionConfig: ', JSON.stringify(MissionConfig,null,2))
AD_StartAlarmProcess();
} else {
var updateData = {
@@ -17853,7 +17856,7 @@ ADisDB.on("ready", () => {
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);`);
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${MissionID}');ADis_MissionUpdateDone('${window.name}', '${MissionID}');},500);`);
}, 250);
}
})
@@ -18175,12 +18178,12 @@ ADisDB.on("ready", () => {
// - 49: AB-Öl
// - 54: AB-Dekon-P
// - 62: AB-Schlauch
// -
// -
// - 75: FLF
// - 76: Rettungstreppe
// - 77: AB-Gefahrgut
// - 78: AB-Einsatzleitung
// -
// -
// - 83: GW-Werkfeuerwehr
// - 84: ULF mit Löscharm
// - 85: TM 50
@@ -18348,7 +18351,7 @@ ADisDB.on("ready", () => {
{
$("#vehicle_checkbox_" + VehicleID).click();
ADis_VehiclesNeed["85"]--;
}
}
*/
else if (VehicleType == "Turbolöscher" &&
ADis_VehiclesNeed["86"] > 0) // Turbolöscher

2
dist/standalone.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Mon Nov 26 2018 07:56:34 GMT+0100 (CET)*/
/*Generated on:Tue Nov 27 2018 12:21:08 GMT+0100 (CET)*/
function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase());
}