This commit is contained in:
2018-11-24 19:32:20 +01:00
parent c115d12e78
commit 36f8a8c8b4
3 changed files with 172 additions and 16 deletions

94
dist/autoloader.js vendored
View File

@@ -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_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();
@@ -4966,7 +4966,7 @@ ADisDB.on("ready", () => {
function ADis_ReadAndAddOwnMissions(MissionID) { function ADis_ReadAndAddOwnMissions(MissionID) {
if (typeof MissionID != "undefined") { if (typeof MissionID != "undefined") {
ADis_AddOwnMissionsToQueue(MissionID); ADis_AddMission(MissionID);
} else { } else {
$("#mission_list").find(".missionSideBarEntry").each(function () { $("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id"); MissionID = $(this).attr("mission_id");
@@ -4976,7 +4976,7 @@ ADisDB.on("ready", () => {
// - Ambulance Service | Full-Automatic // - 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) { window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {

2
dist/standalone.js vendored
View File

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

View File

@@ -40,7 +40,7 @@ function ADis_CollectOwnMissions() {
function ADis_ReadAndAddOwnMissions(MissionID) { function ADis_ReadAndAddOwnMissions(MissionID) {
if (typeof MissionID != "undefined") { if (typeof MissionID != "undefined") {
ADis_AddOwnMissionsToQueue(MissionID); ADis_AddMission(MissionID);
} else { } else {
$("#mission_list").find(".missionSideBarEntry").each(function () { $("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id"); MissionID = $(this).attr("mission_id");
@@ -50,7 +50,7 @@ function ADis_ReadAndAddOwnMissions(MissionID) {
// - Ambulance Service | Full-Automatic // - 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) { window.ADis_UpdateOwnMissions = function ADis_UpdateOwnMissions(Mission) {