From 5e5f7c7018e3d035fc311e9cb2ee6bd1cc7c7604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sat, 24 Nov 2018 20:47:10 +0100 Subject: [PATCH] fapocv9 --- dist/autoloader.js | 17 +++++------------ dist/standalone.js | 2 +- script/mission/handler.js | 1 + script/mission/opener-ownmission.js | 14 +++----------- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 0811120..3f838e4 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -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_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); @@ -4986,12 +4986,9 @@ ADisDB.on("ready", () => { } function ADis_OpenNextOwnMissions() { - console.log('ADis_OpenNextOwnMissions: open') return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { 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) { @@ -5001,23 +4998,18 @@ 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); setTimeout(ADis_OpenNextOwnMissions, 5000); } else { - console.log('ADis_OpenNextOwnMissions: no free slot for mission') setTimeout(ADis_OpenNextOwnMissions, 5000); } }); @@ -5119,19 +5111,19 @@ ADisDB.on("ready", () => { } 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) { return ADisDB.ADisMissionsOwn.update(MissionID, { next_check: Math.floor(new Date().getTime() / 1000) + 300 - }).catch((err) => {}) + }).catch((err) => {console.error(err)}) } window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) { return ADisDB.ADisMissionsOwn.where({ missionID: MissionID - }).delete(); + }).delete(console.error(err)); } $(document).ready(function () { console.log('Krankentransporte geladen!'); @@ -5447,6 +5439,7 @@ ADisDB.on("ready", () => { console.log('ok:${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) { setTimeout(() => { $('#mission_alarm_btn').click(); diff --git a/dist/standalone.js b/dist/standalone.js index 2595e5f..fb0d143 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -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) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/mission/handler.js b/script/mission/handler.js index a5bcf8f..0c715e3 100755 --- a/script/mission/handler.js +++ b/script/mission/handler.js @@ -170,6 +170,7 @@ function AD_StartAlarmProcess() { console.log('ok:${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) { setTimeout(() => { $('#mission_alarm_btn').click(); diff --git a/script/mission/opener-ownmission.js b/script/mission/opener-ownmission.js index b7eb68d..e198cf4 100644 --- a/script/mission/opener-ownmission.js +++ b/script/mission/opener-ownmission.js @@ -58,12 +58,9 @@ function ADis_ReadAndAddOwnMissions(MissionID) { } function ADis_OpenNextOwnMissions() { - console.log('ADis_OpenNextOwnMissions: open') return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { 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) { @@ -73,23 +70,18 @@ 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); setTimeout(ADis_OpenNextOwnMissions, 5000); } else { - console.log('ADis_OpenNextOwnMissions: no free slot for mission') setTimeout(ADis_OpenNextOwnMissions, 5000); } }); @@ -191,17 +183,17 @@ window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(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) { return ADisDB.ADisMissionsOwn.update(MissionID, { next_check: Math.floor(new Date().getTime() / 1000) + 300 - }).catch((err) => {}) + }).catch((err) => {console.error(err)}) } window.ADis_RemoveOwnMissionsFromQueue = function ADis_RemoveOwnMissionsFromQueue(MissionID) { return ADisDB.ADisMissionsOwn.where({ missionID: MissionID - }).delete(); + }).delete(console.error(err)); } \ No newline at end of file