From 36f8a8c8b442cd8eb2f931c29384adba5ab46cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sat, 24 Nov 2018 19:32:20 +0100 Subject: [PATCH] Pnaixa --- dist/autoloader.js | 94 ++++++++++++++++++++++++++--- dist/standalone.js | 2 +- script/mission/opener-ownmission.js | 92 +++++++++++++++++++++++++--- 3 files changed, 172 insertions(+), 16 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 1de6249..0bd9ec1 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 19:25:12 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19:32:19 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(); @@ -4966,7 +4966,7 @@ ADisDB.on("ready", () => { function ADis_ReadAndAddOwnMissions(MissionID) { if (typeof MissionID != "undefined") { - ADis_AddOwnMissionsToQueue(MissionID); + ADis_AddMission(MissionID); } else { $("#mission_list").find(".missionSideBarEntry").each(function () { MissionID = $(this).attr("mission_id"); @@ -4976,7 +4976,7 @@ ADisDB.on("ready", () => { // - Ambulance Service | Full-Automatic // - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ADis_AddOwnMissionsToQueue(MissionID); + ADis_AddMission(MissionID); }); } } @@ -5031,12 +5031,90 @@ ADisDB.on("ready", () => { }); } + window.ADis_AddMission = function ADis_AddMission(ID) { + return ADisSettings().then((setting) => { + if (setting['MissionsOwn-Automatic'] == 'true') { + return ADisDB.ADisMissionsOwn.where({ + missionID: ID + }).limit(1) + } + }).then((Missions) => { + if (Missions === undefined) { + return; + } + return Missions.count(function (count) { + if (count > 0) { + return Missions.each((Mission) => { + var MissionElement = $("#mission_" + ID); + + var _MissionID = MissionElement.attr("mission_id"); + var _MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": _MissionID, + "type": _MissionType, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + }); + } else { + var MissionElement = $("#mission_" + ID); + + var MissionID = MissionElement.attr("mission_id"); + var MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": MissionID, + "type": MissionType, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + } + }); + }); + } + + window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(Mission) { + return ADisDB.ADisMissionsOwn.put({ + missionID: Mission.id, + type: Mission.type, + name: Mission.name, + available: Mission.available ? 'true' : 'false', + done: Mission.done ? 'true' : 'false', + street: Mission.street, + village: Mission.village, + last_check: Mission.last_check, + next_check: Mission.next_check + }).catch((err) => { + console.error(err) + }); - window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(MissionID) { - return ADisDB.ADisMissionsOwn.add({ - missionID: MissionID, - done: 'false' - }).catch((err) => {}) } window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) { diff --git a/dist/standalone.js b/dist/standalone.js index db1cfcb..d1be32b 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 19:25:12 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19:32:19 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 4782b57..81ddd9d 100644 --- a/script/mission/opener-ownmission.js +++ b/script/mission/opener-ownmission.js @@ -40,7 +40,7 @@ function ADis_CollectOwnMissions() { function ADis_ReadAndAddOwnMissions(MissionID) { if (typeof MissionID != "undefined") { - ADis_AddOwnMissionsToQueue(MissionID); + ADis_AddMission(MissionID); } else { $("#mission_list").find(".missionSideBarEntry").each(function () { MissionID = $(this).attr("mission_id"); @@ -50,7 +50,7 @@ function ADis_ReadAndAddOwnMissions(MissionID) { // - Ambulance Service | Full-Automatic // - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - ADis_AddOwnMissionsToQueue(MissionID); + ADis_AddMission(MissionID); }); } } @@ -105,12 +105,90 @@ function ADis_OpenNextOwnMissions() { }); } +window.ADis_AddMission = function ADis_AddMission(ID) { + return ADisSettings().then((setting) => { + if (setting['MissionsOwn-Automatic'] == 'true') { + return ADisDB.ADisMissionsOwn.where({ + missionID: ID + }).limit(1) + } + }).then((Missions) => { + if (Missions === undefined) { + return; + } + return Missions.count(function (count) { + if (count > 0) { + return Missions.each((Mission) => { + var MissionElement = $("#mission_" + ID); + + var _MissionID = MissionElement.attr("mission_id"); + var _MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": _MissionID, + "type": _MissionType, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + }); + } else { + var MissionElement = $("#mission_" + ID); + + var MissionID = MissionElement.attr("mission_id"); + var MissionType = MissionElement.attr("mission_type_id"); + var addr = MissionElement.find(".map_position_mover").text().split(",") + var MissionName = addr[0]; + var MissionStreet = addr[1]; + var MissionVillage = addr[2]; + + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": MissionID, + "type": MissionType, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); + }); + } + }); + }); +} + +window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(Mission) { + return ADisDB.ADisMissionsOwn.put({ + missionID: Mission.id, + type: Mission.type, + name: Mission.name, + available: Mission.available ? 'true' : 'false', + done: Mission.done ? 'true' : 'false', + street: Mission.street, + village: Mission.village, + last_check: Mission.last_check, + next_check: Mission.next_check + }).catch((err) => { + console.error(err) + }); -window.ADis_AddOwnMissionsToQueue = function ADis_AddOwnMissionsToQueue(MissionID) { - return ADisDB.ADisMissionsOwn.add({ - missionID: MissionID, - done: 'false' - }).catch((err) => {}) } window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {