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

e903quß

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 19:37:46 +01:00
parent 36f8a8c8b4
commit e64cc11f6d
3 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
script/mission/opener-ownmission.js
View File

@@ -64,7 +64,6 @@ function ADis_OpenNextOwnMissions() {
return ADisDB.ADisMissionsOwn.where({
done: 'false'
}).and(function (item) {
console.log('ADis_OpenNextOwnMissions: filter', item);
return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1)
}
@@ -89,7 +88,7 @@ function ADis_OpenNextOwnMissions() {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions,100);
setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000);
} else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission')
@@ -118,7 +117,7 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
}
return Missions.count(function (count) {
if (count > 0) {
return Missions.each((Mission) => {
return Missions.each(() => {
var MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id");
@@ -127,20 +126,21 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
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
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
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
});
});
});
});
@@ -154,19 +154,21 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
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
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
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
});
});
});
}