diff --git a/dist/autoloader.js b/dist/autoloader.js index 667816e..342e6f7 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 16:55:37 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19: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(); @@ -4982,8 +4982,11 @@ ADisDB.on("ready", () => { } function ADis_OpenNextOwnMissions() { + console.log('ADis_OpenNextOwnMissions: open') ADisSettings().then((setting) => { + console.log('ADis_OpenNextOwnMissions: load settings') if (setting['MissionsOwn-Automatic'] == 'true') { + console.log('ADis_OpenNextOwnMissions: load mission') return ADisDB.ADisMissionsOwn.where({ done: 'false' }).and(function (item) { @@ -4993,25 +4996,28 @@ ADisDB.on("ready", () => { }).then((Wunsch) => { if (Wunsch !== undefined) { return Wunsch.count(function (count) { + console.log('ADis_OpenNextOwnMissions: load mission: %d', count) if (count > 0) { return Wunsch.each((myWunsch) => { + console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch) let MissionID = myWunsch.missionID; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; - + return ADis_UpdateOwnMissions(myWunsch).then(() => { + console.log('ADis_OpenNextOwnMissions: check free slot for mission') if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { + console.log('ADis_OpenNextOwnMissions: free slot for mission') $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID); - OwnMissionsFrameWatchDog = setTimeout(async function () { - ADis_RemoveOwnMissionsFromQueue(MissionID).then((deleteCount) => { - // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); - $("#adis-ownmissions-frame").attr("src", ""); - $("#adis-ownmissions-frame").attr("mission_id", "empty"); - setTimeout(ADis_OpenNextOwnMissions, 1000); - }); + 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); } else { + console.log('ADis_OpenNextOwnMissions: no free slot for mission') setTimeout(ADis_OpenNextOwnMissions, 5000); } }); diff --git a/dist/standalone.js b/dist/standalone.js index e2199c7..935470d 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 16:55:37 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19:21:08 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/mission/opener-ownmission.js b/script/mission/opener-ownmission.js index 8c9dd31..fb5d547 100644 --- a/script/mission/opener-ownmission.js +++ b/script/mission/opener-ownmission.js @@ -56,8 +56,11 @@ function ADis_ReadAndAddOwnMissions(MissionID) { } function ADis_OpenNextOwnMissions() { + console.log('ADis_OpenNextOwnMissions: open') ADisSettings().then((setting) => { + console.log('ADis_OpenNextOwnMissions: load settings') if (setting['MissionsOwn-Automatic'] == 'true') { + console.log('ADis_OpenNextOwnMissions: load mission') return ADisDB.ADisMissionsOwn.where({ done: 'false' }).and(function (item) { @@ -67,25 +70,28 @@ function ADis_OpenNextOwnMissions() { }).then((Wunsch) => { if (Wunsch !== undefined) { return Wunsch.count(function (count) { + console.log('ADis_OpenNextOwnMissions: load mission: %d', count) if (count > 0) { return Wunsch.each((myWunsch) => { + console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch) let MissionID = myWunsch.missionID; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; - + return ADis_UpdateOwnMissions(myWunsch).then(() => { + console.log('ADis_OpenNextOwnMissions: check free slot for mission') if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { + console.log('ADis_OpenNextOwnMissions: free slot for mission') $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID); - OwnMissionsFrameWatchDog = setTimeout(async function () { - ADis_RemoveOwnMissionsFromQueue(MissionID).then((deleteCount) => { - // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); - $("#adis-ownmissions-frame").attr("src", ""); - $("#adis-ownmissions-frame").attr("mission_id", "empty"); - setTimeout(ADis_OpenNextOwnMissions, 1000); - }); + 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); } else { + console.log('ADis_OpenNextOwnMissions: no free slot for mission') setTimeout(ADis_OpenNextOwnMissions, 5000); } });