Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mcoxp

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-27 12:21:09 +01:00
parent 5e078f6412
commit 7e0e9d5f21
9 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
@@ -17100,6 +17100,8 @@ ADisDB.on("ready", () => {
ADis_UpdateOwnMissionsToDone(MissionID).then(() => { ADis_UpdateOwnMissionsToDone(MissionID).then(() => {
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
console.log('call ADis_OpenNextOwnMissions()');
ADis_OpenNextOwnMissions();
}); });
} else if (['adis-verbandmission'].indexOf(WindowName) !== -1) { } else if (['adis-verbandmission'].indexOf(WindowName) !== -1) {
$("#adis-verbandmission-frame").attr("src", ""); $("#adis-verbandmission-frame").attr("src", "");
@@ -17518,6 +17520,7 @@ ADisDB.on("ready", () => {
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) { window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, { return ADisDB.ADisMissionsOwn.update(MissionID, {
last_check: Math.floor(new Date().getTime() / 1000),
next_check: Math.floor(new Date().getTime() / 1000) + 300 next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {console.error(err)}) }).catch((err) => {console.error(err)})
} }
@@ -17648,11 +17651,9 @@ ADisDB.on("ready", () => {
window.ADis_UpdateKrankentransportToDone = function ADis_UpdateKrankentransportToDone(MissionID) { window.ADis_UpdateKrankentransportToDone = function ADis_UpdateKrankentransportToDone(MissionID) {
return ADisDB.ADisKrankentransport.update(MissionID, { return ADisDB.ADisKrankentransport.update(MissionID, {
missionID: MissionID, last_check: Math.floor(new Date().getTime() / 1000),
done: 'true' next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => { }).catch((err) => {console.error(err)})
console.error(err)
});
} }
window.ADis_RemoveKrankentransportFromQueue = function ADis_RemoveKrankentransportFromQueue(MissionID) { window.ADis_RemoveKrankentransportFromQueue = function ADis_RemoveKrankentransportFromQueue(MissionID) {
@@ -17684,18 +17685,19 @@ ADisDB.on("ready", () => {
console.log("MissionType", MissionType); console.log("MissionType", MissionType);
console.log("CurrentTime", CurrentTime); console.log("CurrentTime", CurrentTime);
if (MissionType !== null) { 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) { 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") console.log("SEND");
return ADis_MissionUpdateDone(MissionID); // update Mission here as updated or full 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 { } 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.')) {
console.log("DONE!") console.log("DONE!")
@@ -17806,6 +17808,7 @@ ADisDB.on("ready", () => {
}).then((availableMission) => { }).then((availableMission) => {
if (availableMission != undefined && availableMission.jsondata) { if (availableMission != undefined && availableMission.jsondata) {
MissionConfig = availableMission.jsondata; MissionConfig = availableMission.jsondata;
console.log('MissionConfig: ', JSON.stringify(MissionConfig,null,2))
AD_StartAlarmProcess(); AD_StartAlarmProcess();
} else { } else {
var updateData = { var updateData = {
@@ -17853,7 +17856,7 @@ ADisDB.on("ready", () => {
console.log("WILL KLICK SEND") console.log("WILL KLICK SEND")
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#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); }, 250);
} }
}) })
@@ -18175,12 +18178,12 @@ ADisDB.on("ready", () => {
// - 49: AB-Öl // - 49: AB-Öl
// - 54: AB-Dekon-P // - 54: AB-Dekon-P
// - 62: AB-Schlauch // - 62: AB-Schlauch
// - // -
// - 75: FLF // - 75: FLF
// - 76: Rettungstreppe // - 76: Rettungstreppe
// - 77: AB-Gefahrgut // - 77: AB-Gefahrgut
// - 78: AB-Einsatzleitung // - 78: AB-Einsatzleitung
// - // -
// - 83: GW-Werkfeuerwehr // - 83: GW-Werkfeuerwehr
// - 84: ULF mit Löscharm // - 84: ULF mit Löscharm
// - 85: TM 50 // - 85: TM 50
@@ -18348,7 +18351,7 @@ ADisDB.on("ready", () => {
{ {
$("#vehicle_checkbox_" + VehicleID).click(); $("#vehicle_checkbox_" + VehicleID).click();
ADis_VehiclesNeed["85"]--; ADis_VehiclesNeed["85"]--;
} }
*/ */
else if (VehicleType == "Turbolöscher" && else if (VehicleType == "Turbolöscher" &&
ADis_VehiclesNeed["86"] > 0) // 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) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }

2
script/mission.js
View File

@@ -53,6 +53,8 @@ window.ADis_MissionUpdateDone = function ADis_MissionUpdateDone(WindowName, Miss
ADis_UpdateOwnMissionsToDone(MissionID).then(() => { ADis_UpdateOwnMissionsToDone(MissionID).then(() => {
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
console.log('call ADis_OpenNextOwnMissions()');
ADis_OpenNextOwnMissions();
}); });
} else if (['adis-verbandmission'].indexOf(WindowName) !== -1) { } else if (['adis-verbandmission'].indexOf(WindowName) !== -1) {
$("#adis-verbandmission-frame").attr("src", ""); $("#adis-verbandmission-frame").attr("src", "");

30
script/mission/handler.js
View File

@@ -13,18 +13,19 @@ $(document).ready(function () {
console.log("MissionType", MissionType); console.log("MissionType", MissionType);
console.log("CurrentTime", CurrentTime); console.log("CurrentTime", CurrentTime);
if (MissionType !== null) { 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) { 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") console.log("SEND");
return ADis_MissionUpdateDone(MissionID); // update Mission here as updated or full 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 { } 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.')) {
console.log("DONE!") console.log("DONE!")
@@ -135,6 +136,7 @@ function AD_GetMissionConfiguration(MissionType) {
}).then((availableMission) => { }).then((availableMission) => {
if (availableMission != undefined && availableMission.jsondata) { if (availableMission != undefined && availableMission.jsondata) {
MissionConfig = availableMission.jsondata; MissionConfig = availableMission.jsondata;
console.log('MissionConfig: ', JSON.stringify(MissionConfig,null,2))
AD_StartAlarmProcess(); AD_StartAlarmProcess();
} else { } else {
var updateData = { var updateData = {
@@ -182,7 +184,7 @@ function AD_StartAlarmProcess() {
console.log("WILL KLICK SEND") console.log("WILL KLICK SEND")
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#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); }, 250);
} }
}) })
@@ -504,12 +506,12 @@ function ADis_ProcessFireDepartment() {
// - 49: AB-Öl // - 49: AB-Öl
// - 54: AB-Dekon-P // - 54: AB-Dekon-P
// - 62: AB-Schlauch // - 62: AB-Schlauch
// - // -
// - 75: FLF // - 75: FLF
// - 76: Rettungstreppe // - 76: Rettungstreppe
// - 77: AB-Gefahrgut // - 77: AB-Gefahrgut
// - 78: AB-Einsatzleitung // - 78: AB-Einsatzleitung
// - // -
// - 83: GW-Werkfeuerwehr // - 83: GW-Werkfeuerwehr
// - 84: ULF mit Löscharm // - 84: ULF mit Löscharm
// - 85: TM 50 // - 85: TM 50
@@ -677,7 +679,7 @@ function ADis_ProcessFireDepartment() {
{ {
$("#vehicle_checkbox_" + VehicleID).click(); $("#vehicle_checkbox_" + VehicleID).click();
ADis_VehiclesNeed["85"]--; ADis_VehiclesNeed["85"]--;
} }
*/ */
else if (VehicleType == "Turbolöscher" && else if (VehicleType == "Turbolöscher" &&
ADis_VehiclesNeed["86"] > 0) // Turbolöscher ADis_VehiclesNeed["86"] > 0) // Turbolöscher

8
script/mission/opener-krankentransporte.js
View File

@@ -119,11 +119,9 @@ window.ADis_UpdateKrankentransport = function ADis_UpdateKrankentransport(Missio
window.ADis_UpdateKrankentransportToDone = function ADis_UpdateKrankentransportToDone(MissionID) { window.ADis_UpdateKrankentransportToDone = function ADis_UpdateKrankentransportToDone(MissionID) {
return ADisDB.ADisKrankentransport.update(MissionID, { return ADisDB.ADisKrankentransport.update(MissionID, {
missionID: MissionID, last_check: Math.floor(new Date().getTime() / 1000),
done: 'true' next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => { }).catch((err) => {console.error(err)})
console.error(err)
});
} }
window.ADis_RemoveKrankentransportFromQueue = function ADis_RemoveKrankentransportFromQueue(MissionID) { window.ADis_RemoveKrankentransportFromQueue = function ADis_RemoveKrankentransportFromQueue(MissionID) {

1
script/mission/opener-ownmission.js
View File

@@ -188,6 +188,7 @@ window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) { window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, { return ADisDB.ADisMissionsOwn.update(MissionID, {
last_check: Math.floor(new Date().getTime() / 1000),
next_check: Math.floor(new Date().getTime() / 1000) + 300 next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {console.error(err)}) }).catch((err) => {console.error(err)})
} }

6
script/mission/opener-plannedevents.js
View File

@@ -112,9 +112,9 @@ window.ADis_UpdatePlannedEvents = function ADis_UpdatePlannedEvents(Mission) {
window.ADis_UpdatePlannedEventsToDone = function ADis_UpdatePlannedEventsToDone(MissionID) { window.ADis_UpdatePlannedEventsToDone = function ADis_UpdatePlannedEventsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, { return ADisDB.ADisMissionsOwn.update(MissionID, {
missionID: MissionID, last_check: Math.floor(new Date().getTime() / 1000),
done: 'true' next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {}) }).catch((err) => {console.error(err)})
} }
window.ADis_RemovePlannedEventsFromQueue = function ADis_RemovePlannedEventsFromQueue(MissionID) { window.ADis_RemovePlannedEventsFromQueue = function ADis_RemovePlannedEventsFromQueue(MissionID) {

6
script/mission/opener-verbandevents.js
View File

@@ -108,9 +108,9 @@ window.ADis_UpdateVerbandEvents = function ADis_UpdateVerbandEvents(Mission) {
window.ADis_UpdateVerbandEventsToDone = function ADis_UpdateVerbandEventsToDone(MissionID) { window.ADis_UpdateVerbandEventsToDone = function ADis_UpdateVerbandEventsToDone(MissionID) {
return ADisDB.ADisMissionsVerbandEvent.update(MissionID, { return ADisDB.ADisMissionsVerbandEvent.update(MissionID, {
missionID: MissionID, last_check: Math.floor(new Date().getTime() / 1000),
done: 'true' next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {}) }).catch((err) => {console.error(err)})
} }
window.ADis_RemoveVerbandEventsFromQueue = function ADis_RemoveVerbandEventsFromQueue(MissionID) { window.ADis_RemoveVerbandEventsFromQueue = function ADis_RemoveVerbandEventsFromQueue(MissionID) {

6
script/mission/opener-verbandmissions.js
View File

@@ -108,9 +108,9 @@ window.ADis_UpdateVerbandMissions = function ADis_UpdateVerbandMissions(Mission)
window.ADis_UpdateVerbandMissionsToDone = function ADis_UpdateVerbandMissionsToDone(MissionID) { window.ADis_UpdateVerbandMissionsToDone = function ADis_UpdateVerbandMissionsToDone(MissionID) {
return ADisDB.ADisMissionsVerband.update(MissionID, { return ADisDB.ADisMissionsVerband.update(MissionID, {
missionID: MissionID, last_check: Math.floor(new Date().getTime() / 1000),
done: 'true' next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {}) }).catch((err) => {console.error(err)})
} }
window.ADis_RemoveVerbandMissionsFromQueue = function ADis_RemoveVerbandMissionsFromQueue(MissionID) { window.ADis_RemoveVerbandMissionsFromQueue = function ADis_RemoveVerbandMissionsFromQueue(MissionID) {