From a3ebb706d9931e1c57bcc8eb4131a82e3ef4197d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sat, 24 Nov 2018 20:12:55 +0100 Subject: [PATCH] agoka09 --- dist/autoloader.js | 22 +++++++++------------- dist/standalone.js | 2 +- script/mission.js | 8 +++++--- script/mission/handler.js | 2 +- script/mission/opener-ownmission.js | 10 ++-------- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 48a7e7d..40f8931 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 20:06:12 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 20:12:54 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(); @@ -4685,7 +4685,7 @@ ADisDB.on("ready", () => { 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"); }); @@ -4694,9 +4694,11 @@ ADisDB.on("ready", () => { $("#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"); @@ -5013,12 +5015,7 @@ ADisDB.on("ready", () => { $("#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); @@ -5127,8 +5124,7 @@ ADisDB.on("ready", () => { 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) => {}) } @@ -5451,7 +5447,7 @@ ADisDB.on("ready", () => { 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(); diff --git a/dist/standalone.js b/dist/standalone.js index 6d68785..a39dbad 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 20:06:12 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 20:12:54 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/mission.js b/script/mission.js index 1ece813..a22b057 100644 --- a/script/mission.js +++ b/script/mission.js @@ -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"); diff --git a/script/mission/handler.js b/script/mission/handler.js index 8f34825..a176500 100755 --- a/script/mission/handler.js +++ b/script/mission/handler.js @@ -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(); diff --git a/script/mission/opener-ownmission.js b/script/mission/opener-ownmission.js index 10766fa..c72c34a 100644 --- a/script/mission/opener-ownmission.js +++ b/script/mission/opener-ownmission.js @@ -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) => {}) }