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

sg4w

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 19:55:14 +01:00
parent 49a30c11fb
commit c763a585f4
3 changed files with 208 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
dist/autoloader.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 19:41:38 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 19:55:13 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();
@@ -4965,116 +4965,92 @@ ADisDB.on("ready", () => {
} }
function ADis_ReadAndAddOwnMissions(MissionID) { function ADis_ReadAndAddOwnMissions(MissionID) {
if (typeof MissionID != "undefined") { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
ADis_AddMission(MissionID); if (typeof MissionID != "undefined") {
} else {
$("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id");
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
// -
// - Ambulance Service | Full-Automatic
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
ADis_AddMission(MissionID); ADis_AddMission(MissionID);
}); } else {
} $("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id");
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
// -
// - Ambulance Service | Full-Automatic
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
ADis_AddMission(MissionID);
});
}
});
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open') console.log('ADis_OpenNextOwnMissions: open')
ADisSettings().then((setting) => { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
console.log('ADis_OpenNextOwnMissions: load settings') ADisSettings().then((setting) => {
if (setting['MissionsOwn-Automatic'] == 'true') { console.log('ADis_OpenNextOwnMissions: load settings')
console.log('ADis_OpenNextOwnMissions: load mission') if (setting['MissionsOwn-Automatic'] == 'true') {
return ADisDB.ADisMissionsOwn.where({ console.log('ADis_OpenNextOwnMissions: load mission')
done: 'false' return ADisDB.ADisMissionsOwn.where({
}).and(function (item) { done: 'false'
return item.next_check <= Math.floor(new Date().getTime() / 1000) }).and(function (item) {
}).limit(1) return item.next_check <= Math.floor(new Date().getTime() / 1000)
} }).limit(1)
}).then((Wunsch) => { }
if (Wunsch !== undefined) { }).then((Wunsch) => {
return Wunsch.count(function (count) { if (Wunsch !== undefined) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count) return Wunsch.count(function (count) {
if (count > 0) { console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
return Wunsch.each((myWunsch) => { if (count > 0) {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch) return Wunsch.each((myWunsch) => {
let MissionID = myWunsch.missionID; console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission') console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") {
console.log('ADis_OpenNextOwnMissions: free slot for mission') console.log('ADis_OpenNextOwnMissions: free slot for mission')
$("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(function () { OwnMissionsFrameWatchDog = setTimeout(function () {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions, 100); setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission') console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
});
}); });
}); }
} return setTimeout(ADis_OpenNextOwnMissions, 5000);
return setTimeout(ADis_OpenNextOwnMissions, 5000); });
}); }
} return setTimeout(ADis_OpenNextOwnMissions, 5000);
return setTimeout(ADis_OpenNextOwnMissions, 5000); });
}); });
} }
window.ADis_AddMission = function ADis_AddMission(ID) { window.ADis_AddMission = function ADis_AddMission(ID) {
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { return ADisSettings().then((setting) => {
return ADisSettings().then((setting) => { if (setting['MissionsOwn-Automatic'] == 'true') {
if (setting['MissionsOwn-Automatic'] == 'true') { return ADisDB.ADisMissionsOwn.where({
return ADisDB.ADisMissionsOwn.where({ missionID: ID
missionID: ID }).limit(1)
}).limit(1) }
} }).then((Missions) => {
}).then((Missions) => { if (Missions === undefined) {
if (Missions === undefined) { return;
return; }
} return Missions.count(function (count) {
return Missions.count(function (count) { if (count > 0) {
if (count > 0) { return Missions.each(() => {
return Missions.each(() => {
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 MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id");
var MissionID = MissionElement.attr("mission_id"); var _MissionType = MissionElement.attr("mission_type_id");
var MissionType = MissionElement.attr("mission_type_id");
var addr = MissionElement.find(".map_position_mover").text().split(",") var addr = MissionElement.find(".map_position_mover").text().split(",")
var MissionName = addr[0]; var MissionName = addr[0];
var MissionStreet = addr[1]; var MissionStreet = addr[1];
@@ -5084,8 +5060,8 @@ ADisDB.on("ready", () => {
type: MissionType type: MissionType
}).then((available) => { }).then((available) => {
return ADis_AddMissionToQueue({ return ADis_AddMissionToQueue({
"id": MissionID, "id": _MissionID,
"type": MissionType, "type": _MissionType,
"name": MissionName, "name": MissionName,
"street": MissionStreet, "street": MissionStreet,
"village": MissionVillage, "village": MissionVillage,
@@ -5095,8 +5071,34 @@ ADisDB.on("ready", () => {
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "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
});
});
}
}); });
}); });
} }

2
dist/standalone.js vendored
View File

@@ -1,4 +1,4 @@
/*Generated on:Sat Nov 24 2018 19:41:38 GMT+0100 (CET)*/ /*Generated on:Sat Nov 24 2018 19:55:13 GMT+0100 (CET)*/
function includesString(string1, string2) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }

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

@@ -39,116 +39,92 @@ function ADis_CollectOwnMissions() {
} }
function ADis_ReadAndAddOwnMissions(MissionID) { function ADis_ReadAndAddOwnMissions(MissionID) {
if (typeof MissionID != "undefined") { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
ADis_AddMission(MissionID); if (typeof MissionID != "undefined") {
} else {
$("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id");
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
// -
// - Ambulance Service | Full-Automatic
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
ADis_AddMission(MissionID); ADis_AddMission(MissionID);
}); } else {
} $("#mission_list").find(".missionSideBarEntry").each(function () {
MissionID = $(this).attr("mission_id");
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
// -
// - Ambulance Service | Full-Automatic
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
ADis_AddMission(MissionID);
});
}
});
} }
function ADis_OpenNextOwnMissions() { function ADis_OpenNextOwnMissions() {
console.log('ADis_OpenNextOwnMissions: open') console.log('ADis_OpenNextOwnMissions: open')
ADisSettings().then((setting) => { return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
console.log('ADis_OpenNextOwnMissions: load settings') ADisSettings().then((setting) => {
if (setting['MissionsOwn-Automatic'] == 'true') { console.log('ADis_OpenNextOwnMissions: load settings')
console.log('ADis_OpenNextOwnMissions: load mission') if (setting['MissionsOwn-Automatic'] == 'true') {
return ADisDB.ADisMissionsOwn.where({ console.log('ADis_OpenNextOwnMissions: load mission')
done: 'false' return ADisDB.ADisMissionsOwn.where({
}).and(function (item) { done: 'false'
return item.next_check <= Math.floor(new Date().getTime() / 1000) }).and(function (item) {
}).limit(1) return item.next_check <= Math.floor(new Date().getTime() / 1000)
} }).limit(1)
}).then((Wunsch) => { }
if (Wunsch !== undefined) { }).then((Wunsch) => {
return Wunsch.count(function (count) { if (Wunsch !== undefined) {
console.log('ADis_OpenNextOwnMissions: load mission: %d', count) return Wunsch.count(function (count) {
if (count > 0) { console.log('ADis_OpenNextOwnMissions: load mission: %d', count)
return Wunsch.each((myWunsch) => { if (count > 0) {
console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch) return Wunsch.each((myWunsch) => {
let MissionID = myWunsch.missionID; console.log('ADis_OpenNextOwnMissions: load mission:', myWunsch)
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300; let MissionID = myWunsch.missionID;
myWunsch.next_check = Math.floor(new Date().getTime() / 1000) + 300;
return ADis_UpdateOwnMissions(myWunsch).then(() => { return ADis_UpdateOwnMissions(myWunsch).then(() => {
console.log('ADis_OpenNextOwnMissions: check free slot for mission') console.log('ADis_OpenNextOwnMissions: check free slot for mission')
if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") { if ($("#adis-ownmissions-frame").attr("mission_id") == "empty") {
console.log('ADis_OpenNextOwnMissions: free slot for mission') console.log('ADis_OpenNextOwnMissions: free slot for mission')
$("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-ownmissions-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$("#adis-ownmissions-frame").attr("mission_id", MissionID); $("#adis-ownmissions-frame").attr("mission_id", MissionID);
OwnMissionsFrameWatchDog = setTimeout(function () { OwnMissionsFrameWatchDog = setTimeout(function () {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions, 100); setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission') console.log('ADis_OpenNextOwnMissions: no free slot for mission')
setTimeout(ADis_OpenNextOwnMissions, 5000); setTimeout(ADis_OpenNextOwnMissions, 5000);
} }
});
}); });
}); }
} return setTimeout(ADis_OpenNextOwnMissions, 5000);
return setTimeout(ADis_OpenNextOwnMissions, 5000); });
}); }
} return setTimeout(ADis_OpenNextOwnMissions, 5000);
return setTimeout(ADis_OpenNextOwnMissions, 5000); });
}); });
} }
window.ADis_AddMission = function ADis_AddMission(ID) { window.ADis_AddMission = function ADis_AddMission(ID) {
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { return ADisSettings().then((setting) => {
return ADisSettings().then((setting) => { if (setting['MissionsOwn-Automatic'] == 'true') {
if (setting['MissionsOwn-Automatic'] == 'true') { return ADisDB.ADisMissionsOwn.where({
return ADisDB.ADisMissionsOwn.where({ missionID: ID
missionID: ID }).limit(1)
}).limit(1) }
} }).then((Missions) => {
}).then((Missions) => { if (Missions === undefined) {
if (Missions === undefined) { return;
return; }
} return Missions.count(function (count) {
return Missions.count(function (count) { if (count > 0) {
if (count > 0) { return Missions.each(() => {
return Missions.each(() => {
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 MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id");
var MissionID = MissionElement.attr("mission_id"); var _MissionType = MissionElement.attr("mission_type_id");
var MissionType = MissionElement.attr("mission_type_id");
var addr = MissionElement.find(".map_position_mover").text().split(",") var addr = MissionElement.find(".map_position_mover").text().split(",")
var MissionName = addr[0]; var MissionName = addr[0];
var MissionStreet = addr[1]; var MissionStreet = addr[1];
@@ -158,8 +134,8 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
type: MissionType type: MissionType
}).then((available) => { }).then((available) => {
return ADis_AddMissionToQueue({ return ADis_AddMissionToQueue({
"id": MissionID, "id": _MissionID,
"type": MissionType, "type": _MissionType,
"name": MissionName, "name": MissionName,
"street": MissionStreet, "street": MissionStreet,
"village": MissionVillage, "village": MissionVillage,
@@ -169,8 +145,34 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "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
});
});
}
}); });
}); });
} }