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

v2 up handler myRunner

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-02 09:56:37 +01:00
parent 74a1be28de
commit 7773e51285
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 09:52:21 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 09:56:36 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();
dist/autoloaderV2.js
Vendored
+5 -6
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 09:52:21 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 09:56:36 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18277,7 +18277,7 @@ class AutomaticDispose {
console.log("MissionID", self.MissionID); console.log("MissionID", self.MissionID);
console.log("MissionType", self.MissionType); console.log("MissionType", self.MissionType);
self.ADSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[runnerSettings] != 'true') { if (setting[self.MyRunnerSettings] != 'true') {
return self.ADisDB.ADisMissionsOwn.where({ return self.ADisDB.ADisMissionsOwn.where({
missionID: self.MissionID, missionID: self.MissionID,
runner: MyRunner, runner: MyRunner,
@@ -18390,19 +18390,18 @@ class AutomaticDispose {
CheckMissionAutomatic() { CheckMissionAutomatic() {
const self = this; const self = this;
var setOpt; var setOpt;
var missionLoad;
if (window.name == 'adis-ownmissions') { if (window.name == 'adis-ownmissions') {
setOpt = 'MissionsOwn-Automatic'; setOpt = 'MissionsOwn-Automatic';
} else if (window.name == 'adis-krankentransporte') { } else if (window.name == 'adis-krankentransporte') {
setOpt = 'Krankentransport-Automatic'; setOpt = 'Krankentransport-Automatic';
} }
if (setOpt && missionLoad) { if (setOpt && self.MyRunner) {
self.ADSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[setOpt] == 'true') { if (setting[setOpt] == 'true') {
var coll = self.ADisDB.ADisMissions.where({ var coll = self.ADisDB.ADisMissions.where({
done: 'false' done: 'false'
}) })
if (missionLoad != "ADisKrankentransport") { if (self.MyRunner != "kt") {
coll = coll.and(function (item) { coll = coll.and(function (item) {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}); });
@@ -18412,7 +18411,7 @@ class AutomaticDispose {
}).then((Missions) => { }).then((Missions) => {
if (Missions.length > 0) { if (Missions.length > 0) {
var Mission = Missions[0]; var Mission = Missions[0];
self.GetMissionConfiguration(missionLoad == 'ADisKrankentransport' ? 147 : Mission.type); self.GetMissionConfiguration(self.MyRunner == 'kt' ? 147 : Mission.type);
} }
}); });
} }
src/autoloaderV2.js
+4 -5
View File
@@ -1107,7 +1107,7 @@ class AutomaticDispose {
console.log("MissionID", self.MissionID); console.log("MissionID", self.MissionID);
console.log("MissionType", self.MissionType); console.log("MissionType", self.MissionType);
self.ADSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[runnerSettings] != 'true') { if (setting[self.MyRunnerSettings] != 'true') {
return self.ADisDB.ADisMissionsOwn.where({ return self.ADisDB.ADisMissionsOwn.where({
missionID: self.MissionID, missionID: self.MissionID,
runner: MyRunner, runner: MyRunner,
@@ -1220,19 +1220,18 @@ class AutomaticDispose {
CheckMissionAutomatic() { CheckMissionAutomatic() {
const self = this; const self = this;
var setOpt; var setOpt;
var missionLoad;
if (window.name == 'adis-ownmissions') { if (window.name == 'adis-ownmissions') {
setOpt = 'MissionsOwn-Automatic'; setOpt = 'MissionsOwn-Automatic';
} else if (window.name == 'adis-krankentransporte') { } else if (window.name == 'adis-krankentransporte') {
setOpt = 'Krankentransport-Automatic'; setOpt = 'Krankentransport-Automatic';
} }
if (setOpt && missionLoad) { if (setOpt && self.MyRunner) {
self.ADSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[setOpt] == 'true') { if (setting[setOpt] == 'true') {
var coll = self.ADisDB.ADisMissions.where({ var coll = self.ADisDB.ADisMissions.where({
done: 'false' done: 'false'
}) })
if (missionLoad != "ADisKrankentransport") { if (self.MyRunner != "kt") {
coll = coll.and(function (item) { coll = coll.and(function (item) {
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}); });
@@ -1242,7 +1241,7 @@ class AutomaticDispose {
}).then((Missions) => { }).then((Missions) => {
if (Missions.length > 0) { if (Missions.length > 0) {
var Mission = Missions[0]; var Mission = Missions[0];
self.GetMissionConfiguration(missionLoad == 'ADisKrankentransport' ? 147 : Mission.type); self.GetMissionConfiguration(self.MyRunner == 'kt' ? 147 : Mission.type);
} }
}); });
} }