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

fapocv9

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 20:47:10 +01:00
parent 6df1a30681
commit 5e5f7c7018
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+5 -12
View File
@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 20:40:34 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 20:47:09 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();
@@ -4986,12 +4986,9 @@ ADisDB.on("ready", () => {
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open')
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
ADisSettings().then((setting) => { ADisSettings().then((setting) => {
console.log('ADis_OpenNextOwnMissions: load settings')
if (setting['MissionsOwn-Automatic'] == 'true') { if (setting['MissionsOwn-Automatic'] == 'true') {
console.log('ADis_OpenNextOwnMissions: load mission')
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
@@ -5001,23 +4998,18 @@ ADisDB.on("ready", () => {
}).then((Wunsch) => { }).then((Wunsch) => {
if (Wunsch !== undefined) { if (Wunsch !== undefined) {
return Wunsch.count(function (count) { return Wunsch.count(function (count) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
if (count > 0) { if (count > 0) {
return Wunsch.each((myWunsch) => { return Wunsch.each((myWunsch) => {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
let MissionID = myWunsch.missionID; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { 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("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
}); });
@@ -5119,19 +5111,19 @@ ADisDB.on("ready", () => {
} }
window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) { window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {
return ADisDB.ADisMissionsOwn.put(Mission).catch((err) => {}) return ADisDB.ADisMissionsOwn.put(Mission).catch((err) => {console.error(err)})
} }
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) { window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, { return ADisDB.ADisMissionsOwn.update(MissionID, {
next_check: Math.floor(new Date().getTime() / 1000) + 300 next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {}) }).catch((err) => {console.error(err)})
} }
window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) { window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) {
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
missionID: MissionID missionID: MissionID
}).delete(); }).delete(console.error(err));
} }
$(document).ready(function () { $(document).ready(function () {
console.log('Krankentransporte geladen!'); console.log('Krankentransporte geladen!');
@@ -5447,6 +5439,7 @@ ADisDB.on("ready", () => {
console.log('ok:${window.name}:${MissionID}'); console.log('ok:${window.name}:${MissionID}');
ADis_MissionUpdateDone('${window.name}', '${MissionID}'); ADis_MissionUpdateDone('${window.name}', '${MissionID}');
`); `);
console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked'));
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();
dist/standalone.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 20:40:34 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 20:47:09 GMT+0100 (CET)*/
function includesString(string1, string2) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }
script/mission/handler.js
+1
View File
@@ -170,6 +170,7 @@ function AD_StartAlarmProcess() {
console.log('ok:${window.name}:${MissionID}'); console.log('ok:${window.name}:${MissionID}');
ADis_MissionUpdateDone('${window.name}', '${MissionID}'); ADis_MissionUpdateDone('${window.name}', '${MissionID}');
`); `);
console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').size(), $('#vehicle_show_table_all input[type="checkbox"]:checked'));
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();
script/mission/opener-ownmission.js
+3 -11
View File
@@ -58,12 +58,9 @@ function ADis_ReadAndAddOwnMissions(MissionID) {
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open')
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
ADisSettings().then((setting) => { ADisSettings().then((setting) => {
console.log('ADis_OpenNextOwnMissions: load settings')
if (setting['MissionsOwn-Automatic'] == 'true') { if (setting['MissionsOwn-Automatic'] == 'true') {
console.log('ADis_OpenNextOwnMissions: load mission')
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
@@ -73,23 +70,18 @@ function ADis_OpenNextOwnMissions() {
}).then((Wunsch) => { }).then((Wunsch) => {
if (Wunsch !== undefined) { if (Wunsch !== undefined) {
return Wunsch.count(function (count) { return Wunsch.count(function (count) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
if (count > 0) { if (count > 0) {
return Wunsch.each((myWunsch) => { return Wunsch.each((myWunsch) => {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
let MissionID = myWunsch.missionID; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { 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("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
}); });
@@ -191,17 +183,17 @@ window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(Mission)
} }
window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) { window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {
return ADisDB.ADisMissionsOwn.put(Mission).catch((err) => {}) return ADisDB.ADisMissionsOwn.put(Mission).catch((err) => {console.error(err)})
} }
window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) { window.ADis_UpdateOwnMissionsToDone = function ADis_UpdateOwnMissionsToDone(MissionID) {
return ADisDB.ADisMissionsOwn.update(MissionID, { return ADisDB.ADisMissionsOwn.update(MissionID, {
next_check: Math.floor(new Date().getTime() / 1000) + 300 next_check: Math.floor(new Date().getTime() / 1000) + 300
}).catch((err) => {}) }).catch((err) => {console.error(err)})
} }
window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) { window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) {
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
missionID: MissionID missionID: MissionID
}).delete(); }).delete(console.error(err));
} }