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

v2 up 8d0ua98f

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-17 15:21:41 +01:00
parent c25c4fe5e9
commit 9d3dd45181
3 changed files with 148 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/autoloaderV2.js
View File

@@ -913,67 +913,94 @@ class AutomaticDispose {
return self.ADisDB.ADisMissions.where(where).limit(1)
}
}).then((Missions) => {
if (typeof Missions === "undefined") {
return;
}
return Missions.count((count) => {
if (count > 0) {
return Missions.each((MyMission) => {
if (typeof Missions !== "undefined") {
return Missions.count((count) => {
if (count > 0) {
return Missions.each((MyMission) => {
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 self.ADisDB.ADisAvailabelMissions.get({
type: _MissionType
}).then((available) => {
return self.AddMissionsToQueue({
"id": _MissionID,
"type": _MissionType,
"runner": MyMission.runner,
"name": MissionName,
"street": MissionStreet,
"village": MissionVillage,
"available": MyMission.available,
"done": MyMission.done,
"last_check": MyMission.last_check,
"next_check": MyMission.next_check
});
});
});
} else {
var MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id");
var _MissionType = MissionElement.attr("mission_type_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 self.ADisDB.ADisAvailabelMissions.get({
type: _MissionType
type: MissionType
}).then((available) => {
return self.AddMissionsToQueue({
"id": _MissionID,
"type": _MissionType,
"runner": MyMission.runner,
"id": MissionID,
"type": MissionType,
"runner": runnerOpt,
"name": MissionName,
"street": MissionStreet,
"village": MissionVillage,
"available": MyMission.available,
"done": MyMission.done,
"last_check": MyMission.last_check,
"next_check": MyMission.next_check
"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 self.ADisDB.ADisAvailabelMissions.get({
type: MissionType
}).then((available) => {
return self.AddMissionsToQueue({
"id": MissionID,
"type": MissionType,
"runner": runnerOpt,
"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 self.ADisDB.ADisAvailabelMissions.get({
type: MissionType
}).then((available) => {
return self.AddMissionsToQueue({
"id": MissionID,
"type": MissionType,
"runner": runnerOpt,
"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
});
});
}
});
});
}
});
}
@@ -1004,7 +1031,7 @@ class AutomaticDispose {
}
FreeIframe(Runner) {
console.log('FreeIframe',Runner);
console.log('FreeIframe', Runner);
const self = this;
const runnerID = self.ADisSettings.runner.indexOf(Runner)
const runnerIframe = self.ADisSettings.runner_iframes[runnerID];