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

v2 iaofijaovijy

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-01 15:37:00 +01:00
parent 14f1f3a665
commit b32dc36ab5
3 changed files with 38 additions and 34 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:Sat Dec 01 2018 15:34:02 GMT+0100 (CET)*/ /*Generated on:Sat Dec 01 2018 15:37:00 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
+19 -17
View File
@@ -1,4 +1,4 @@
/*Generated on:Sat Dec 01 2018 15:34:02 GMT+0100 (CET)*/ /*Generated on:Sat Dec 01 2018 15:37:00 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -17102,7 +17102,7 @@ class AutomaticDispose {
}) })
return resolve(); return resolve();
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each((_,elem) => { $("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
var VehicleStatus = $(elem).find(".building_list_fms").text(); var VehicleStatus = $(elem).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
var VehicleID = $(elem).attr("vehicle_id"); var VehicleID = $(elem).attr("vehicle_id");
@@ -17176,7 +17176,7 @@ class AutomaticDispose {
let self = this; let self = this;
self.Hospitals = []; self.Hospitals = [];
if ($("h4:contains('Eigene Krankenhäuser')").length > 0) { if ($("h4:contains('Eigene Krankenhäuser')").length > 0) {
$("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => { $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_, elem) => {
var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href"); var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href");
var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", ""))); var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
var HospitalDistance = parseInt($(elem).find("td").eq("1").text()); var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
@@ -17200,7 +17200,7 @@ class AutomaticDispose {
} }
if ($("h4:contains('Verbandskrankenhäuser')").length > 0) { if ($("h4:contains('Verbandskrankenhäuser')").length > 0) {
$("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => { $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_, elem) => {
var HospitalHref = $(elem).find("a").attr("href") var HospitalHref = $(elem).find("a").attr("href")
var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1))); var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1)));
var HospitalDistance = parseInt($(elem).find("td").eq("1").text()); var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
@@ -17278,14 +17278,14 @@ class AutomaticDispose {
return resolve(); return resolve();
}).then(() => { }).then(() => {
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
return MOIODOS.each((_,elem) => { return MOIODOS.each((_, elem) => {
if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) { if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
var MissionID = $(elem).attr("mission_id"); var MissionID = $(elem).attr("mission_id");
self.AddPoliceSprechwunschToQueue(MissionID); self.AddPoliceSprechwunschToQueue(MissionID);
} }
}); });
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each((_,elem) => { $("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
var VehicleStatus = $(elem).find(".building_list_fms").text(); var VehicleStatus = $(elem).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
var VehicleID = $(elem).attr("vehicle_id"); var VehicleID = $(elem).attr("vehicle_id");
@@ -17370,7 +17370,7 @@ class AutomaticDispose {
var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr'); var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr');
var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr'); var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr');
GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => { GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_, elem) => {
var JailHref = $(elem).attr("href"); var JailHref = $(elem).attr("href");
var JailID = JailHref.split("/").pop(); var JailID = JailHref.split("/").pop();
var JailText = $(elem).text(); var JailText = $(elem).text();
@@ -17435,7 +17435,7 @@ class AutomaticDispose {
}); });
} }
}); });
FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => { FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_, elem) => {
var JailHref = $(elem).attr("href"); var JailHref = $(elem).attr("href");
var JailID = JailHref.split("/").pop(); var JailID = JailHref.split("/").pop();
var JailText = $(elem).text(); var JailText = $(elem).text();
@@ -17508,7 +17508,7 @@ class AutomaticDispose {
if (self.Jails.length > 0) { if (self.Jails.length > 0) {
this.Send_Vehicle_To_Jail() this.Send_Vehicle_To_Jail()
} else { } else {
$("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_,elem) => { $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_, elem) => {
var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id")); var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
if (CalledVehicleID == 52) { if (CalledVehicleID == 52) {
CountGefangene -= 5; CountGefangene -= 5;
@@ -17518,7 +17518,7 @@ class AutomaticDispose {
}); });
if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) { if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) {
$('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_,elem) => { $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => {
if (CountGefangene > 0) { if (CountGefangene > 0) {
$(elem).click() $(elem).click()
CountGefangene -= 5; CountGefangene -= 5;
@@ -17526,7 +17526,7 @@ class AutomaticDispose {
}); });
} }
if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) {
$('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_,elem) => { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => {
if (CountGefangene > 0) { if (CountGefangene > 0) {
$(elem).click() $(elem).click()
CountGefangene -= 1; CountGefangene -= 1;
@@ -18001,7 +18001,7 @@ class AutomaticDispose {
self.AddMission(MissionID, Runner); self.AddMission(MissionID, Runner);
} else { } else {
self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => { self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index,elem) => { await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id"); MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX); await self.AddMission(MissionID, RunnerX);
}); });
@@ -18027,7 +18027,7 @@ class AutomaticDispose {
return self.ADisDB.ADisMissions.where(where).limit(1) return self.ADisDB.ADisMissions.where(where).limit(1)
} }
}).then((Missions) => { }).then((Missions) => {
if (typeof Missions === "undefined"){ if (typeof Missions === "undefined") {
return; return;
} }
return Missions.count((count) => { return Missions.count((count) => {
@@ -18142,10 +18142,10 @@ class AutomaticDispose {
const runnerSettings = self.ADisSettings.runner_settings[runnerID]; const runnerSettings = self.ADisSettings.runner_settings[runnerID];
console.table({ console.table({
Runner:Runner, Runner: Runner,
runnerID:runnerID, runnerID: runnerID,
runnerSettings:runnerSettings, runnerSettings: runnerSettings,
runnerIframeName:runnerIframeName runnerIframeName: runnerIframeName
}) })
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
@@ -18172,11 +18172,13 @@ class AutomaticDispose {
$('#' + runnerIframeName).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $('#' + runnerIframeName).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$('#' + runnerIframeName).attr("mission_id", MissionID); $('#' + runnerIframeName).attr("mission_id", MissionID);
self.UpdateMissionsToDone(MissionID).then(() => { self.UpdateMissionsToDone(MissionID).then(() => {
console.log('done.... ' + Runner);
$('#' + runnerIframeName).attr("src", ''); $('#' + runnerIframeName).attr("src", '');
$('#' + runnerIframeName).attr("mission_id", 'empty'); $('#' + runnerIframeName).attr("mission_id", 'empty');
setTimeout(self.OpenNextMission.bind(self), 5000, Runner); setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}) })
} else { } else {
// only while
setTimeout(self.OpenNextMission.bind(self), 5000, Runner); setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
} }
}); });
src/autoloaderV2.js
+18 -16
View File
@@ -209,7 +209,7 @@ class AutomaticDispose {
}) })
return resolve(); return resolve();
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each((_,elem) => { $("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
var VehicleStatus = $(elem).find(".building_list_fms").text(); var VehicleStatus = $(elem).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
var VehicleID = $(elem).attr("vehicle_id"); var VehicleID = $(elem).attr("vehicle_id");
@@ -283,7 +283,7 @@ class AutomaticDispose {
let self = this; let self = this;
self.Hospitals = []; self.Hospitals = [];
if ($("h4:contains('Eigene Krankenhäuser')").length > 0) { if ($("h4:contains('Eigene Krankenhäuser')").length > 0) {
$("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => { $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_, elem) => {
var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href"); var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href");
var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", ""))); var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
var HospitalDistance = parseInt($(elem).find("td").eq("1").text()); var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
@@ -307,7 +307,7 @@ class AutomaticDispose {
} }
if ($("h4:contains('Verbandskrankenhäuser')").length > 0) { if ($("h4:contains('Verbandskrankenhäuser')").length > 0) {
$("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => { $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_, elem) => {
var HospitalHref = $(elem).find("a").attr("href") var HospitalHref = $(elem).find("a").attr("href")
var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1))); var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1)));
var HospitalDistance = parseInt($(elem).find("td").eq("1").text()); var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
@@ -385,14 +385,14 @@ class AutomaticDispose {
return resolve(); return resolve();
}).then(() => { }).then(() => {
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
return MOIODOS.each((_,elem) => { return MOIODOS.each((_, elem) => {
if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) { if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
var MissionID = $(elem).attr("mission_id"); var MissionID = $(elem).attr("mission_id");
self.AddPoliceSprechwunschToQueue(MissionID); self.AddPoliceSprechwunschToQueue(MissionID);
} }
}); });
}).then(() => { }).then(() => {
$("#building_list").find(".building_list_vehicle_element").each((_,elem) => { $("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
var VehicleStatus = $(elem).find(".building_list_fms").text(); var VehicleStatus = $(elem).find(".building_list_fms").text();
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id"))); var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
var VehicleID = $(elem).attr("vehicle_id"); var VehicleID = $(elem).attr("vehicle_id");
@@ -477,7 +477,7 @@ class AutomaticDispose {
var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr'); var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr');
var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr'); var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr');
GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => { GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_, elem) => {
var JailHref = $(elem).attr("href"); var JailHref = $(elem).attr("href");
var JailID = JailHref.split("/").pop(); var JailID = JailHref.split("/").pop();
var JailText = $(elem).text(); var JailText = $(elem).text();
@@ -542,7 +542,7 @@ class AutomaticDispose {
}); });
} }
}); });
FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => { FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_, elem) => {
var JailHref = $(elem).attr("href"); var JailHref = $(elem).attr("href");
var JailID = JailHref.split("/").pop(); var JailID = JailHref.split("/").pop();
var JailText = $(elem).text(); var JailText = $(elem).text();
@@ -615,7 +615,7 @@ class AutomaticDispose {
if (self.Jails.length > 0) { if (self.Jails.length > 0) {
this.Send_Vehicle_To_Jail() this.Send_Vehicle_To_Jail()
} else { } else {
$("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_,elem) => { $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_, elem) => {
var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id")); var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
if (CalledVehicleID == 52) { if (CalledVehicleID == 52) {
CountGefangene -= 5; CountGefangene -= 5;
@@ -625,7 +625,7 @@ class AutomaticDispose {
}); });
if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) { if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) {
$('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_,elem) => { $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_, elem) => {
if (CountGefangene > 0) { if (CountGefangene > 0) {
$(elem).click() $(elem).click()
CountGefangene -= 5; CountGefangene -= 5;
@@ -633,7 +633,7 @@ class AutomaticDispose {
}); });
} }
if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) {
$('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_,elem) => { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_, elem) => {
if (CountGefangene > 0) { if (CountGefangene > 0) {
$(elem).click() $(elem).click()
CountGefangene -= 1; CountGefangene -= 1;
@@ -874,7 +874,7 @@ class AutomaticDispose {
self.AddMission(MissionID, Runner); self.AddMission(MissionID, Runner);
} else { } else {
self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => { self.ADisSettings.runner_divs.forEach(async (RunnerX, index) => {
await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index,elem) => { await $("#" + RunnerX).find(".missionSideBarEntry").each(async (index, elem) => {
MissionID = $(elem).attr("mission_id"); MissionID = $(elem).attr("mission_id");
await self.AddMission(MissionID, RunnerX); await self.AddMission(MissionID, RunnerX);
}); });
@@ -900,7 +900,7 @@ class AutomaticDispose {
return self.ADisDB.ADisMissions.where(where).limit(1) return self.ADisDB.ADisMissions.where(where).limit(1)
} }
}).then((Missions) => { }).then((Missions) => {
if (typeof Missions === "undefined"){ if (typeof Missions === "undefined") {
return; return;
} }
return Missions.count((count) => { return Missions.count((count) => {
@@ -1015,10 +1015,10 @@ class AutomaticDispose {
const runnerSettings = self.ADisSettings.runner_settings[runnerID]; const runnerSettings = self.ADisSettings.runner_settings[runnerID];
console.table({ console.table({
Runner:Runner, Runner: Runner,
runnerID:runnerID, runnerID: runnerID,
runnerSettings:runnerSettings, runnerSettings: runnerSettings,
runnerIframeName:runnerIframeName runnerIframeName: runnerIframeName
}) })
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
@@ -1045,11 +1045,13 @@ class AutomaticDispose {
$('#' + runnerIframeName).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $('#' + runnerIframeName).attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
$('#' + runnerIframeName).attr("mission_id", MissionID); $('#' + runnerIframeName).attr("mission_id", MissionID);
self.UpdateMissionsToDone(MissionID).then(() => { self.UpdateMissionsToDone(MissionID).then(() => {
console.log('done.... ' + Runner);
$('#' + runnerIframeName).attr("src", ''); $('#' + runnerIframeName).attr("src", '');
$('#' + runnerIframeName).attr("mission_id", 'empty'); $('#' + runnerIframeName).attr("mission_id", 'empty');
setTimeout(self.OpenNextMission.bind(self), 5000, Runner); setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
}) })
} else { } else {
// only while
setTimeout(self.OpenNextMission.bind(self), 5000, Runner); setTimeout(self.OpenNextMission.bind(self), 5000, Runner);
} }
}); });