v2 up a9gfua09gu93oihgiu

This commit is contained in:
2018-12-17 23:07:05 +01:00
parent a4659dc6fe
commit aaa439a134
5 changed files with 343 additions and 44 deletions

View File

@@ -916,11 +916,36 @@ class AutomaticDispose {
}
}).then((Missions) => {
if (typeof Missions === "undefined") {
return;
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({
"missionID": MissionID,
"type": MissionType,
"runner": runnerOpt,
"name": MissionName,
"street": MissionStreet,
"village": MissionVillage,
"available": (available !== undefined) ? 'true' : 'false',
"done": 'false',
"last_check": Math.floor(new Date().getTime() / 1000),
"next_check": Math.floor(new Date().getTime() / 1000) + 1
});
});
}
return Missions.count((count) => {
if (count > 0) {
return Missions.each(() => {
return Missions.each((Mission) => {
var MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id");
var _MissionType = MissionElement.attr("mission_type_id");
@@ -932,22 +957,24 @@ class AutomaticDispose {
return self.ADisDB.ADisAvailabelMissions.get({
type: MissionType
}).then((available) => {
return self.AddMissionsToQueue({
"id": _MissionID,
return self.UpdateMissions({
"missionID": _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
"available": (available !== undefined) ? 'true' : 'false',
"done": "false",
"last_check": Mission.last_check,
"next_check": Mission.next_check
});
});
});
} else {
}
/*
else {
var MissionElement = $("#mission_" + ID);
var MissionID = MissionElement.attr("mission_id");
@@ -974,24 +1001,14 @@ class AutomaticDispose {
});
});
}
*/
});
});
}
AddMissionsToQueue(Mission) {
const self = this;
return self.ADisDB.ADisMissions.put({
missionID: Mission.id,
type: Mission.type,
runner: Mission.runner,
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) => {
return self.ADisDB.ADisMissions.put(Mission).catch((err) => {
console.error(err)
});