This commit is contained in:
2018-11-24 20:12:55 +01:00
parent 031719e741
commit a3ebb706d9
5 changed files with 18 additions and 26 deletions

View File

@@ -38,7 +38,7 @@ window.ADis_MissionDone = function ADis_MissionDone(WindowName) {
window.ADis_MissionUpdateDone = function ADis_MissionUpdateDone(WindowName, MissionID) {
if (['adis-krankentransporte'].indexOf(WindowName) !== -1) {
clearTimeout(KrankentransportFrameWatchDog);
ADis_UpdateKrankentransportToDone(MissionID).then(()=>{
ADis_UpdateKrankentransportToDone(MissionID).then(() => {
$("#adis-krankentransporte-frame").attr("src", "");
$("#adis-krankentransporte-frame").attr("mission_id", "empty");
});
@@ -47,9 +47,11 @@ window.ADis_MissionUpdateDone = function ADis_MissionUpdateDone(WindowName, Miss
$("#adis-plannedevents-frame").attr("mission_id", "empty");
clearTimeout(PlannedEventsFrameWatchDog);
} else if (['adis-ownmissions'].indexOf(WindowName) !== -1) {
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
clearTimeout(OwnMissionsFrameWatchDog);
ADis_UpdateOwnMissionsToDone(MissionID).then(() => {
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
});
} else if (['adis-verbandmission'].indexOf(WindowName) !== -1) {
$("#adis-verbandmission-frame").attr("src", "");
$("#adis-verbandmission-frame").attr("mission_id", "empty");

View File

@@ -170,7 +170,7 @@ function AD_StartAlarmProcess() {
last_check: CurrentTime,
next_check: CurrentTime + 60
};
ADis_UpdateOwnMissionsToDone(MissionID, updateData);
ADis_MissionUpdateDone(window.name, MissionID, updateData);
if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) {
setTimeout(() => {
$('#mission_alarm_btn').click();

View File

@@ -87,12 +87,7 @@ function ADis_OpenNextOwnMissions() {
$("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(function () {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000);
OwnMissionsFrameWatchDog = setTimeout(ADis_OpenNextOwnMissions, 5000);
} else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000);
@@ -201,8 +196,7 @@ window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, {
missionID: MissionID,
done: 'true'
next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {})
}