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

agoka09

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 20:12:55 +01:00
parent 031719e741
commit a3ebb706d9
5 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dist/autoloader.js vendored
View File

@@ -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_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();
@@ -4685,7 +4685,7 @@ ADisDB.on("ready", () => {
window.ADis_MissionUpdateDone = function ADis_MissionUpdateDone(WindowName, MissionID) { window.ADis_MissionUpdateDone = function ADis_MissionUpdateDone(WindowName, MissionID) {
if (['adis-krankentransporte'].indexOf(WindowName) !== -1) { if (['adis-krankentransporte'].indexOf(WindowName) !== -1) {
clearTimeout(KrankentransportFrameWatchDog); clearTimeout(KrankentransportFrameWatchDog);
ADis_UpdateKrankentransportToDone(MissionID).then(()=>{ ADis_UpdateKrankentransportToDone(MissionID).then(() => {
$("#adis-krankentransporte-frame").attr("src", ""); $("#adis-krankentransporte-frame").attr("src", "");
$("#adis-krankentransporte-frame").attr("mission_id", "empty"); $("#adis-krankentransporte-frame").attr("mission_id", "empty");
}); });
@@ -4694,9 +4694,11 @@ ADisDB.on("ready", () => {
$("#adis-plannedevents-frame").attr("mission_id", "empty"); $("#adis-plannedevents-frame").attr("mission_id", "empty");
clearTimeout(PlannedEventsFrameWatchDog); clearTimeout(PlannedEventsFrameWatchDog);
} else if (['adis-ownmissions'].indexOf(WindowName) !== -1) { } else if (['adis-ownmissions'].indexOf(WindowName) !== -1) {
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
clearTimeout(OwnMissionsFrameWatchDog); 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) { } else if (['adis-verbandmission'].indexOf(WindowName) !== -1) {
$("#adis-verbandmission-frame").attr("src", ""); $("#adis-verbandmission-frame").attr("src", "");
$("#adis-verbandmission-frame").attr("mission_id", "empty"); $("#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("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(function () { OwnMissionsFrameWatchDog = setTimeout(ADis_OpenNextOwnMissions, 5000);
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission') console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
@@ -5127,8 +5124,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, {
missionID: MissionID, next_check: Math.floor(new Date().getTime() / 1000) + 300
done: 'true'
}).catch((err) => {}) }).catch((err) => {})
} }
@@ -5451,7 +5447,7 @@ ADisDB.on("ready", () => {
last_check: CurrentTime, last_check: CurrentTime,
next_check: CurrentTime + 60 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) { if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) {
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();

2
dist/standalone.js vendored
View File

@@ -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) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }

8
script/mission.js
View File

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

2
script/mission/handler.js
View File

@@ -170,7 +170,7 @@ function AD_StartAlarmProcess() {
last_check: CurrentTime, last_check: CurrentTime,
next_check: CurrentTime + 60 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) { if (['adis-ownmissions', 'adis-krankentransporte', 'adis-verbandmission'].indexOf(window.name) != -1) {
setTimeout(() => { setTimeout(() => {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();

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

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