Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f03ad6cc3 | |||
| 88b26a7f91 | |||
| d52137df95 | |||
| 7852149694 | |||
| 3bce16eff7 | |||
| 1817977520 | |||
| e48b0a7bdd | |||
| efd95eacab | |||
| fdffe19a11 | |||
| cb049224dd | |||
| b33313eed9 | |||
| b4fb131c9b | |||
| 98002ae853 | |||
| 31f147ee6d | |||
| 18acbc9a01 | |||
| 0a1fb871ed | |||
| 78b72223f8 | |||
| b7067520bc | |||
| f142e57e18 | |||
| 4ae5c26754 | |||
| 01acb126a4 | |||
| 4b691b54c8 | |||
| 9ca42c9210 | |||
| 25397f17eb | |||
| 4e591be16b | |||
| 16838dae86 | |||
| 72d3566254 | |||
| c137f47e4a | |||
| 579facabbc | |||
| 5c619f622c | |||
| a6e68ebb82 |
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
/*Generated on:Tue Dec 18 2018 02:47:49 GMT+0100 (CET)*/
|
||||
/*Generated on:Wed Dec 19 2018 18:06:36 GMT+0100 (CET)*/
|
||||
var AutomaticDispose_Branch = "master";
|
||||
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
|
||||
var da_lss_adis_time = new Date().getTime();
|
||||
|
||||
Vendored
+210
-108
@@ -1,4 +1,4 @@
|
||||
/*Generated on:Tue Dec 18 2018 02:47:49 GMT+0100 (CET)*/
|
||||
/*Generated on:Wed Dec 19 2018 18:06:36 GMT+0100 (CET)*/
|
||||
/*
|
||||
* Dexie.js - a minimalistic wrapper for IndexedDB
|
||||
* ===============================================
|
||||
@@ -4479,6 +4479,7 @@ class AutomaticDispose {
|
||||
|
||||
// Variablen
|
||||
get ADisSettings() {
|
||||
let self = this
|
||||
return {
|
||||
url: "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/",
|
||||
branch: "master",
|
||||
@@ -17015,7 +17016,7 @@ class AutomaticDispose {
|
||||
}
|
||||
}
|
||||
}`),
|
||||
name: this.name,
|
||||
name: self.name,
|
||||
runner: ['kt', 'om', 'os', 'vm', 've'],
|
||||
runner_divs: ['mission_list_krankentransporte', 'mission_list', /*'mission_list_sicherheitswache',*/ 'mission_list_alliance', 'mission_list_alliance_event'],
|
||||
runner_settings: ['Krankentransport-Automatic', 'MissionsOwn-Automatic', /*'MissionsOwn-Automatic',*/ 'Alliance-Automatic', 'AllianceEvent-Automatic'],
|
||||
@@ -17038,20 +17039,20 @@ class AutomaticDispose {
|
||||
self.Vehicles = {}
|
||||
self.Patients = {}
|
||||
|
||||
this.ADis_MyHead = document.getElementsByTagName('head')[0];
|
||||
this.ADis_MyBody = document.getElementsByTagName('body')[0];
|
||||
self.ADis_MyHead = document.getElementsByTagName('head')[0];
|
||||
self.ADis_MyBody = document.getElementsByTagName('body')[0];
|
||||
|
||||
// -
|
||||
// - Sprechwunsch Variablen
|
||||
// -
|
||||
this.Jails = [];
|
||||
this.JailRegEx = /\(Freie Zellen\:\s+(\d)\,\s+Entfernung\:\s+(\d+\,\d+)\s+km(?:\,\s+Abgabe an Besitzer\:\s+(\d+)%)?\)/g;
|
||||
this.Hospitals = [];
|
||||
this.RescueVehicleFrameWatchDog = null;
|
||||
this.PoliceVehicleFrameWatchDog = null;
|
||||
self.Jails = [];
|
||||
self.JailRegEx = /\(Freie Zellen\:\s+(\d)\,\s+Entfernung\:\s+(\d+\,\d+)\s+km(?:\,\s+Abgabe an Besitzer\:\s+(\d+)%)?\)/g;
|
||||
self.Hospitals = [];
|
||||
self.RescueVehicleFrameWatchDog = null;
|
||||
self.PoliceVehicleFrameWatchDog = null;
|
||||
|
||||
this.ADisDB = new Dexie('LSS_AutomaticDispo');
|
||||
this.ADisDB.version(1).stores({
|
||||
self.ADisDB = new Dexie('LSS_AutomaticDispo');
|
||||
self.ADisDB.version(1).stores({
|
||||
/**
|
||||
* AvailabelMissions
|
||||
* - missionID
|
||||
@@ -17096,7 +17097,7 @@ class AutomaticDispose {
|
||||
*/
|
||||
ADisMissions: "++missionID,runner,available,done,[missionID+available+done],[missionID+runner],[missionID+runner+done],[runner+available+done]"
|
||||
});
|
||||
this.ADisDB.on("populate", () => {
|
||||
self.ADisDB.on("populate", () => {
|
||||
self.ADisDB.ADisSettings.add({
|
||||
name: "Krankentransport-Automatic",
|
||||
value: 'true'
|
||||
@@ -17118,10 +17119,10 @@ class AutomaticDispose {
|
||||
value: 'false'
|
||||
});
|
||||
});
|
||||
this.ADisDB.open().catch((err) => {
|
||||
self.ADisDB.open().catch((err) => {
|
||||
console.error(err.stack || err);
|
||||
});
|
||||
this.ADisDB.on("ready", async () => {
|
||||
self.ADisDB.on("ready", async () => {
|
||||
self.adis_settings = {
|
||||
'Krankentransport-Automatic': false,
|
||||
'Sprechwunsch-Automatic': false,
|
||||
@@ -17201,14 +17202,26 @@ class AutomaticDispose {
|
||||
// - Sprechwunsch Queue
|
||||
// -
|
||||
RemovePoliceSprechwunschFromQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.where({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.where({
|
||||
missionID: WunschID
|
||||
}).delete();
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
RemoveRescueSprechwunschFromQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.where({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.where({
|
||||
vehicleID: WunschID
|
||||
}).delete();
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
||||
@@ -17219,6 +17232,7 @@ class AutomaticDispose {
|
||||
|
||||
CollectRescueSprechwuensche() {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
new Promise(async (resolve, reject) => {
|
||||
await self.ADisDB.ADisSprechwunsch.where({
|
||||
done: 'false'
|
||||
@@ -17237,12 +17251,16 @@ class AutomaticDispose {
|
||||
self.AddRescueSprechwunschToQueue(VehicleID);
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
OpenNextRescueSprechwunsch() {
|
||||
let self = this;
|
||||
this.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADSettings().then((setting) => {
|
||||
if (setting['Sprechwunsch-Automatic'] == 'true') {
|
||||
return self.ADisDB.ADisSprechwunsch.where({
|
||||
done: 'false'
|
||||
@@ -17250,39 +17268,55 @@ class AutomaticDispose {
|
||||
}
|
||||
}).then((Wunsch) => {
|
||||
if (Wunsch !== undefined) {
|
||||
Wunsch.each((myWunsch) => {
|
||||
Wunsch.each(async (myWunsch) => {
|
||||
let VehicleID = myWunsch.vehicleID;
|
||||
self.UpdateRescueSprechwunschToDone(VehicleID).then(() => {
|
||||
await self.UpdateRescueSprechwunschToDone(VehicleID).then(() => {
|
||||
if ($("#adis-sprechwunsch-rescue-frame").attr("vehicle_id") == "empty") {
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("src", "https://www.leitstellenspiel.de/vehicles/" + VehicleID);
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", VehicleID);
|
||||
|
||||
self.RescueVehicleFrameWatchDog = setTimeout(async () => {
|
||||
self.RescueVehicleFrameWatchDog = setTimeout(async function () {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
self.RemoveRescueSprechwunschFromQueue(VehicleID).then((deleteCount) => {
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("src", "");
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", "empty");
|
||||
});
|
||||
}, 1500);
|
||||
});
|
||||
}.bind(self), 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
AddRescueSprechwunschToQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.put({
|
||||
let self = this
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.put({
|
||||
vehicleID: WunschID,
|
||||
done: 'false'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
UpdateRescueSprechwunschToDone(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.put({
|
||||
let self = this
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.put({
|
||||
vehicleID: WunschID,
|
||||
done: 'true'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -17372,7 +17406,7 @@ class AutomaticDispose {
|
||||
});
|
||||
|
||||
self.Hospitals.reverse();
|
||||
this.Send_Vehicle_To_Hospital()
|
||||
self.Send_Vehicle_To_Hospital()
|
||||
}
|
||||
|
||||
// Krankenhaus einlieferung
|
||||
@@ -17393,7 +17427,8 @@ class AutomaticDispose {
|
||||
|
||||
CollectPoliceSprechwuensche() {
|
||||
let self = this;
|
||||
new Promise(async (resolve, reject) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
await new Promise(async (resolve, reject) => {
|
||||
await self.ADisDB.ADisSprechwunschPolice.where({
|
||||
done: 'false'
|
||||
}).each((myWunsch) => {
|
||||
@@ -17405,14 +17440,14 @@ class AutomaticDispose {
|
||||
return resolve();
|
||||
}).then(() => {
|
||||
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
|
||||
return MOIODOS.each((_, elem) => {
|
||||
return MOIODOS.each(async (_, elem) => {
|
||||
if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
|
||||
var MissionID = $(elem).attr("mission_id");
|
||||
self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
await self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
}
|
||||
});
|
||||
}).then(() => {
|
||||
$("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
|
||||
$("#building_list").find(".building_list_vehicle_element").each(async (_, elem) => {
|
||||
var VehicleStatus = $(elem).find(".building_list_fms").text();
|
||||
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
|
||||
var VehicleID = $(elem).attr("vehicle_id");
|
||||
@@ -17422,17 +17457,21 @@ class AutomaticDispose {
|
||||
var _meap = String(map2.attr('href'));
|
||||
var MissionID = _meap.substr(_meap.lastIndexOf("/") + 1);
|
||||
if (MissionID) {
|
||||
self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
await self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
OpenNextPoliceSprechwunsch() {
|
||||
let self = this;
|
||||
this.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADSettings().then((setting) => {
|
||||
if (setting['Sprechwunsch-Automatic'] == 'true') {
|
||||
return self.ADisDB.ADisSprechwunschPolice.where({
|
||||
done: 'false'
|
||||
@@ -17440,38 +17479,54 @@ class AutomaticDispose {
|
||||
}
|
||||
}).then((Wunsch) => {
|
||||
if (Wunsch !== undefined) {
|
||||
Wunsch.each((myWunsch) => {
|
||||
Wunsch.each(async (myWunsch) => {
|
||||
let MissionID = myWunsch.missionID;
|
||||
self.UpdatePoliceSprechwunschToDone(MissionID).then(() => {
|
||||
await self.UpdatePoliceSprechwunschToDone(MissionID).then(() => {
|
||||
if ($("#adis-sprechwunsch-police-frame").attr("mission_id") == "empty") {
|
||||
$("#adis-sprechwunsch-police-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
|
||||
$("#adis-sprechwunsch-police-frame").attr("mission_id", MissionID);
|
||||
|
||||
self.PoliceVehicleFrameWatchDog = setTimeout(async (MissionID) => {
|
||||
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
|
||||
self.PoliceVehicleFrameWatchDog = setTimeout(async function (MissionID) {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
await self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
|
||||
$("#adis-sprechwunsch-police-frame").attr("src", "");
|
||||
$("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
|
||||
});
|
||||
}, 1500, MissionID);
|
||||
});
|
||||
}.bind(self), 1500, MissionID);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
AddPoliceSprechwunschToQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.put({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.put({
|
||||
missionID: WunschID,
|
||||
done: 'false'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
UpdatePoliceSprechwunschToDone(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.add({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.put({
|
||||
missionID: WunschID,
|
||||
done: 'true'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -17635,7 +17690,7 @@ class AutomaticDispose {
|
||||
|
||||
self.Jails.reverse();
|
||||
if (self.Jails.length > 0) {
|
||||
this.Send_Vehicle_To_Jail()
|
||||
self.Send_Vehicle_To_Jail()
|
||||
} else {
|
||||
$("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_, elem) => {
|
||||
var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
|
||||
@@ -18080,11 +18135,14 @@ class AutomaticDispose {
|
||||
}
|
||||
|
||||
AddAvailableMissions(Mission) {
|
||||
return this.ADisDB.ADisAvailabelMissions.put({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADisDB.ADisAvailabelMissions.put({
|
||||
missionID: Mission.id,
|
||||
type: Mission.type,
|
||||
name: Mission.name,
|
||||
jsondata: Mission
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
@@ -18126,9 +18184,8 @@ class AutomaticDispose {
|
||||
ReadAndAddMissions(MissionID, Runner) {
|
||||
const self = this;
|
||||
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
|
||||
self.ADSettings().then(() => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADSettings().then(async () => {
|
||||
return self.ADisDB.ADisMissions.toCollection()
|
||||
}).then((Missions) => {
|
||||
if (typeof Missions !== "undefined") {
|
||||
@@ -18139,7 +18196,7 @@ class AutomaticDispose {
|
||||
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
|
||||
// remove
|
||||
console.log("Remove :", MyMission)
|
||||
self.RemoveMissionsFromQueue(MyMission.missionID)
|
||||
return self.RemoveMissionsFromQueue(MyMission.missionID)
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -18157,8 +18214,10 @@ class AutomaticDispose {
|
||||
});
|
||||
})
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});;
|
||||
}
|
||||
|
||||
AddMission(ID, Runner) {
|
||||
@@ -18167,7 +18226,7 @@ class AutomaticDispose {
|
||||
const runnerID = self.ADisSettings.runner_divs.indexOf(Runner);
|
||||
const settingOpt = self.ADisSettings.runner_settings[runnerID];
|
||||
const runnerOpt = self.ADisSettings.runner[runnerID];
|
||||
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADSettings().then((setting) => {
|
||||
if (setting[settingOpt] == 'true') {
|
||||
let where = {
|
||||
@@ -18221,7 +18280,7 @@ class AutomaticDispose {
|
||||
var MissionVillage = addr[2];
|
||||
console.log('update mission', MissionID)
|
||||
return self.ADisDB.ADisAvailabelMissions.get({
|
||||
type: MissionType
|
||||
type: _MissionType
|
||||
}).then((available) => {
|
||||
return self.UpdateMissions({
|
||||
"missionID": _MissionID,
|
||||
@@ -18268,21 +18327,30 @@ class AutomaticDispose {
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
AddMissionsToQueue(Mission) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.put(Mission).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
UpdateMissions(Mission) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.put(Mission).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}
|
||||
|
||||
FreeIframe(Runner) {
|
||||
@@ -18296,9 +18364,11 @@ class AutomaticDispose {
|
||||
|
||||
UpdateMissionsToDone(MissionID) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.update(MissionID, {
|
||||
last_check: Math.floor(new Date().getTime() / 1000),
|
||||
next_check: Math.floor(new Date().getTime() / 1000) + 120
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
@@ -18306,9 +18376,11 @@ class AutomaticDispose {
|
||||
|
||||
RemoveMissionsFromQueue(MissionID) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.where({
|
||||
missionID: MissionID
|
||||
}).delete().catch((err) => {
|
||||
}).delete()
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
@@ -18328,10 +18400,10 @@ class AutomaticDispose {
|
||||
// runnerIframe:runnerIframe
|
||||
// })
|
||||
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
self.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return await self.ADSettings().then(async (setting) => {
|
||||
if (setting[runnerSettings] == 'true') {
|
||||
return self.ADisDB.ADisMissions.where({
|
||||
return await self.ADisDB.ADisMissions.where({
|
||||
runner: Runner,
|
||||
available: 'true',
|
||||
done: 'false'
|
||||
@@ -18339,6 +18411,7 @@ class AutomaticDispose {
|
||||
return item.next_check <= Math.floor(new Date().getTime() / 1000)
|
||||
}).limit(1)
|
||||
}
|
||||
})
|
||||
}).then((Wunsch) => {
|
||||
// console.table(Wunsch);
|
||||
if (Wunsch !== undefined) {
|
||||
@@ -18363,12 +18436,13 @@ class AutomaticDispose {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
|
||||
return setTimeout(Dexie.ignoreTransaction(function () {self.OpenNextMission.bind(self, Runner)}), 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
|
||||
});
|
||||
return setTimeout(Dexie.ignoreTransaction(function () {self.OpenNextMission.bind(self, Runner)}), 1000);
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18409,8 +18483,8 @@ class AutomaticDispose {
|
||||
// return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
|
||||
// })
|
||||
// } else {
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
|
||||
self.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, ], async () => {
|
||||
return self.ADSettings().then(async (setting) => {
|
||||
if (setting[self.MyRunnerSettings] === 'true') {
|
||||
|
||||
let where = {
|
||||
@@ -18443,6 +18517,8 @@ class AutomaticDispose {
|
||||
})
|
||||
}
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
// }
|
||||
}, 500);
|
||||
@@ -18451,27 +18527,31 @@ class AutomaticDispose {
|
||||
|
||||
MainHandler() {
|
||||
const self = this;
|
||||
if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
|
||||
if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
|
||||
|
||||
console.log("DONE!");
|
||||
console.log("DONE: ", self.MissionID);
|
||||
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
|
||||
return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
|
||||
})
|
||||
} else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0*/ ) {
|
||||
|
||||
} else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) {
|
||||
|
||||
console.log("SEND");
|
||||
console.log("SEND: ", self.MissionID);
|
||||
return self.UpdateMissionsToDone(self.MissionID).then(() => {
|
||||
return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
});
|
||||
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
|
||||
if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) {
|
||||
console.log("WILL SEND?")
|
||||
self.CheckMissionAutomatic();
|
||||
return self.CheckMissionAutomatic();
|
||||
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {
|
||||
self.WorkVerbandMission();
|
||||
return self.WorkVerbandMission();
|
||||
}
|
||||
}, 250);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18483,6 +18563,9 @@ class AutomaticDispose {
|
||||
|
||||
WorkVerbandMission() {
|
||||
const self = this;
|
||||
const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
|
||||
self.MyRunner = self.ADisSettings.runner[runnerID];
|
||||
self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
|
||||
self.ADSettings().then((setting) => {
|
||||
var title = document.getElementById('missionH1');
|
||||
var isVerband = title.innerText.toLowerCase().includes("[verband]");
|
||||
@@ -18540,15 +18623,14 @@ class AutomaticDispose {
|
||||
|
||||
CheckMissionAutomatic() {
|
||||
const self = this;
|
||||
var setOpt;
|
||||
if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedevents') {
|
||||
setOpt = 'MissionsOwn-Automatic';
|
||||
} else if (window.name == 'adis-krankentransporte') {
|
||||
setOpt = 'Krankentransport-Automatic';
|
||||
}
|
||||
if (setOpt && self.MyRunner) {
|
||||
|
||||
const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
|
||||
self.MyRunner = self.ADisSettings.runner[runnerID];
|
||||
self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
|
||||
if (self.MyRunnerSettings && self.MyRunner) {
|
||||
console.log("debug 1");
|
||||
self.ADSettings().then((setting) => {
|
||||
if (setting[setOpt] == 'true') {
|
||||
if (setting[self.MyRunnerSettings] === 'true') {
|
||||
let where = {
|
||||
missionID: self.MissionID,
|
||||
runner: self.MyRunner,
|
||||
@@ -18563,14 +18645,21 @@ class AutomaticDispose {
|
||||
return coll.limit(1).toArray()
|
||||
}
|
||||
}).then((Missions) => {
|
||||
console.log("debug 2", Missions);
|
||||
if (Missions.length > 0) {
|
||||
var Mission = Missions[0];
|
||||
if (self.MyRunner == 'os') {
|
||||
self.OweSecure = true;
|
||||
}
|
||||
self.GetMissionConfiguration(Mission.type);
|
||||
} else {
|
||||
tellParent(`console.log('config:1000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
} else {
|
||||
tellParent(`console.log('config:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18578,10 +18667,14 @@ class AutomaticDispose {
|
||||
|
||||
GetMissionConfiguration(MissionType) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
console.log("debug 3")
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], function () {
|
||||
console.log("debug 3", MissionType, MissionType.toString())
|
||||
return self.ADisDB.ADisAvailabelMissions.get({
|
||||
type: MissionType.toString()
|
||||
})
|
||||
}).then((availableMission) => {
|
||||
console.log("debug 3", availableMission)
|
||||
if (availableMission != undefined && availableMission.jsondata) {
|
||||
self.MissionConfig = availableMission.jsondata;
|
||||
// console.log('MissionConfig: ', MissionType.toString(), JSON.stringify(self.MissionConfig, null, 2))
|
||||
@@ -18591,17 +18684,19 @@ class AutomaticDispose {
|
||||
available: false,
|
||||
next_check: CurrentTime + 60
|
||||
};
|
||||
self.UpdateOwnMissionsToDone(self.MissionID, updateData);
|
||||
self.UpdateMissionsToDone(self.MissionID);
|
||||
tellParent(`console.log('config:3000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
});
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});;
|
||||
|
||||
}
|
||||
|
||||
|
||||
StartAlarmProcess() {
|
||||
const self = this;
|
||||
const alarming = function alarming(self) {
|
||||
|
||||
Promise.resolve().then(async () => {
|
||||
return await self.PrepareVehicleNeedList();
|
||||
}).then(async () => {
|
||||
@@ -18654,38 +18749,22 @@ class AutomaticDispose {
|
||||
setTimeout(() => {
|
||||
|
||||
self.UpdateMissionsToDone(self.MissionID).then(() => {
|
||||
if ($('#vehicle_show_table_all tr input[type="checkbox"]:checked').length > 0) {
|
||||
tellParent(`console.log('ok:${window.name}:${self.MissionID}');`);
|
||||
window.$('#mission_alarm_btn').click();
|
||||
} else {
|
||||
tellParent(`window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
|
||||
}
|
||||
});
|
||||
}, 250);
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
var $div = $("#mission-form > div:nth-child(7) > a");
|
||||
var isShow = $div.is(':hidden');
|
||||
//console.log($div, isShow);
|
||||
if ($div.length && isShow && 1 == 0) {
|
||||
var observer = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if (mutation.attributeName === "style") {
|
||||
setTimeout(function () {
|
||||
alarming(self)
|
||||
}, 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
observer.observe($div[0], {
|
||||
attributes: true
|
||||
});
|
||||
|
||||
$div.click();
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
alarming(self)
|
||||
}, 500);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -19637,5 +19716,28 @@ class AutomaticDispose {
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
var $div = $("a:contains('Fahrzeuganzeige begrenzt! Fehlende Fahrzeuge laden!')");
|
||||
var isShow = $div.is(':hidden');
|
||||
//console.log($div, isShow);
|
||||
if ($div.length && isShow && 1 == 0) {
|
||||
var observer = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if (mutation.attributeName === "style") {
|
||||
setTimeout(function () {
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
}, 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
observer.observe($div[0], {
|
||||
attributes: true
|
||||
});
|
||||
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
$div.click();
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
}, 500);
|
||||
}
|
||||
});
|
||||
+209
-107
@@ -4,11 +4,12 @@ class AutomaticDispose {
|
||||
|
||||
// Variablen
|
||||
get ADisSettings() {
|
||||
let self = this
|
||||
return {
|
||||
url: "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/",
|
||||
branch: "master",
|
||||
all_missions: /***ADis_AllMissions***/ 0,
|
||||
name: this.name,
|
||||
name: self.name,
|
||||
runner: ['kt', 'om', 'os', 'vm', 've'],
|
||||
runner_divs: ['mission_list_krankentransporte', 'mission_list', /*'mission_list_sicherheitswache',*/ 'mission_list_alliance', 'mission_list_alliance_event'],
|
||||
runner_settings: ['Krankentransport-Automatic', 'MissionsOwn-Automatic', /*'MissionsOwn-Automatic',*/ 'Alliance-Automatic', 'AllianceEvent-Automatic'],
|
||||
@@ -31,20 +32,20 @@ class AutomaticDispose {
|
||||
self.Vehicles = {}
|
||||
self.Patients = {}
|
||||
|
||||
this.ADis_MyHead = document.getElementsByTagName('head')[0];
|
||||
this.ADis_MyBody = document.getElementsByTagName('body')[0];
|
||||
self.ADis_MyHead = document.getElementsByTagName('head')[0];
|
||||
self.ADis_MyBody = document.getElementsByTagName('body')[0];
|
||||
|
||||
// -
|
||||
// - Sprechwunsch Variablen
|
||||
// -
|
||||
this.Jails = [];
|
||||
this.JailRegEx = /\(Freie Zellen\:\s+(\d)\,\s+Entfernung\:\s+(\d+\,\d+)\s+km(?:\,\s+Abgabe an Besitzer\:\s+(\d+)%)?\)/g;
|
||||
this.Hospitals = [];
|
||||
this.RescueVehicleFrameWatchDog = null;
|
||||
this.PoliceVehicleFrameWatchDog = null;
|
||||
self.Jails = [];
|
||||
self.JailRegEx = /\(Freie Zellen\:\s+(\d)\,\s+Entfernung\:\s+(\d+\,\d+)\s+km(?:\,\s+Abgabe an Besitzer\:\s+(\d+)%)?\)/g;
|
||||
self.Hospitals = [];
|
||||
self.RescueVehicleFrameWatchDog = null;
|
||||
self.PoliceVehicleFrameWatchDog = null;
|
||||
|
||||
this.ADisDB = new Dexie('LSS_AutomaticDispo');
|
||||
this.ADisDB.version(1).stores({
|
||||
self.ADisDB = new Dexie('LSS_AutomaticDispo');
|
||||
self.ADisDB.version(1).stores({
|
||||
/**
|
||||
* AvailabelMissions
|
||||
* - missionID
|
||||
@@ -89,7 +90,7 @@ class AutomaticDispose {
|
||||
*/
|
||||
ADisMissions: "++missionID,runner,available,done,[missionID+available+done],[missionID+runner],[missionID+runner+done],[runner+available+done]"
|
||||
});
|
||||
this.ADisDB.on("populate", () => {
|
||||
self.ADisDB.on("populate", () => {
|
||||
self.ADisDB.ADisSettings.add({
|
||||
name: "Krankentransport-Automatic",
|
||||
value: 'true'
|
||||
@@ -111,10 +112,10 @@ class AutomaticDispose {
|
||||
value: 'false'
|
||||
});
|
||||
});
|
||||
this.ADisDB.open().catch((err) => {
|
||||
self.ADisDB.open().catch((err) => {
|
||||
console.error(err.stack || err);
|
||||
});
|
||||
this.ADisDB.on("ready", async () => {
|
||||
self.ADisDB.on("ready", async () => {
|
||||
self.adis_settings = {
|
||||
'Krankentransport-Automatic': false,
|
||||
'Sprechwunsch-Automatic': false,
|
||||
@@ -194,14 +195,26 @@ class AutomaticDispose {
|
||||
// - Sprechwunsch Queue
|
||||
// -
|
||||
RemovePoliceSprechwunschFromQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.where({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.where({
|
||||
missionID: WunschID
|
||||
}).delete();
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
RemoveRescueSprechwunschFromQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.where({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.where({
|
||||
vehicleID: WunschID
|
||||
}).delete();
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
// - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
|
||||
@@ -212,6 +225,7 @@ class AutomaticDispose {
|
||||
|
||||
CollectRescueSprechwuensche() {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
new Promise(async (resolve, reject) => {
|
||||
await self.ADisDB.ADisSprechwunsch.where({
|
||||
done: 'false'
|
||||
@@ -230,12 +244,16 @@ class AutomaticDispose {
|
||||
self.AddRescueSprechwunschToQueue(VehicleID);
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
OpenNextRescueSprechwunsch() {
|
||||
let self = this;
|
||||
this.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADSettings().then((setting) => {
|
||||
if (setting['Sprechwunsch-Automatic'] == 'true') {
|
||||
return self.ADisDB.ADisSprechwunsch.where({
|
||||
done: 'false'
|
||||
@@ -243,39 +261,55 @@ class AutomaticDispose {
|
||||
}
|
||||
}).then((Wunsch) => {
|
||||
if (Wunsch !== undefined) {
|
||||
Wunsch.each((myWunsch) => {
|
||||
Wunsch.each(async (myWunsch) => {
|
||||
let VehicleID = myWunsch.vehicleID;
|
||||
self.UpdateRescueSprechwunschToDone(VehicleID).then(() => {
|
||||
await self.UpdateRescueSprechwunschToDone(VehicleID).then(() => {
|
||||
if ($("#adis-sprechwunsch-rescue-frame").attr("vehicle_id") == "empty") {
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("src", "https://www.leitstellenspiel.de/vehicles/" + VehicleID);
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", VehicleID);
|
||||
|
||||
self.RescueVehicleFrameWatchDog = setTimeout(async () => {
|
||||
self.RescueVehicleFrameWatchDog = setTimeout(async function () {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
self.RemoveRescueSprechwunschFromQueue(VehicleID).then((deleteCount) => {
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("src", "");
|
||||
$("#adis-sprechwunsch-rescue-frame").attr("vehicle_id", "empty");
|
||||
});
|
||||
}, 1500);
|
||||
});
|
||||
}.bind(self), 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
AddRescueSprechwunschToQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.put({
|
||||
let self = this
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.put({
|
||||
vehicleID: WunschID,
|
||||
done: 'false'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
UpdateRescueSprechwunschToDone(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunsch.put({
|
||||
let self = this
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunsch], async () => {
|
||||
return await self.ADisDB.ADisSprechwunsch.put({
|
||||
vehicleID: WunschID,
|
||||
done: 'true'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -365,7 +399,7 @@ class AutomaticDispose {
|
||||
});
|
||||
|
||||
self.Hospitals.reverse();
|
||||
this.Send_Vehicle_To_Hospital()
|
||||
self.Send_Vehicle_To_Hospital()
|
||||
}
|
||||
|
||||
// Krankenhaus einlieferung
|
||||
@@ -386,7 +420,8 @@ class AutomaticDispose {
|
||||
|
||||
CollectPoliceSprechwuensche() {
|
||||
let self = this;
|
||||
new Promise(async (resolve, reject) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
await new Promise(async (resolve, reject) => {
|
||||
await self.ADisDB.ADisSprechwunschPolice.where({
|
||||
done: 'false'
|
||||
}).each((myWunsch) => {
|
||||
@@ -398,14 +433,14 @@ class AutomaticDispose {
|
||||
return resolve();
|
||||
}).then(() => {
|
||||
var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
|
||||
return MOIODOS.each((_, elem) => {
|
||||
return MOIODOS.each(async (_, elem) => {
|
||||
if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
|
||||
var MissionID = $(elem).attr("mission_id");
|
||||
self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
await self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
}
|
||||
});
|
||||
}).then(() => {
|
||||
$("#building_list").find(".building_list_vehicle_element").each((_, elem) => {
|
||||
$("#building_list").find(".building_list_vehicle_element").each(async (_, elem) => {
|
||||
var VehicleStatus = $(elem).find(".building_list_fms").text();
|
||||
var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
|
||||
var VehicleID = $(elem).attr("vehicle_id");
|
||||
@@ -415,17 +450,21 @@ class AutomaticDispose {
|
||||
var _meap = String(map2.attr('href'));
|
||||
var MissionID = _meap.substr(_meap.lastIndexOf("/") + 1);
|
||||
if (MissionID) {
|
||||
self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
await self.AddPoliceSprechwunschToQueue(MissionID);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
OpenNextPoliceSprechwunsch() {
|
||||
let self = this;
|
||||
this.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADSettings().then((setting) => {
|
||||
if (setting['Sprechwunsch-Automatic'] == 'true') {
|
||||
return self.ADisDB.ADisSprechwunschPolice.where({
|
||||
done: 'false'
|
||||
@@ -433,38 +472,54 @@ class AutomaticDispose {
|
||||
}
|
||||
}).then((Wunsch) => {
|
||||
if (Wunsch !== undefined) {
|
||||
Wunsch.each((myWunsch) => {
|
||||
Wunsch.each(async (myWunsch) => {
|
||||
let MissionID = myWunsch.missionID;
|
||||
self.UpdatePoliceSprechwunschToDone(MissionID).then(() => {
|
||||
await self.UpdatePoliceSprechwunschToDone(MissionID).then(() => {
|
||||
if ($("#adis-sprechwunsch-police-frame").attr("mission_id") == "empty") {
|
||||
$("#adis-sprechwunsch-police-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID);
|
||||
$("#adis-sprechwunsch-police-frame").attr("mission_id", MissionID);
|
||||
|
||||
self.PoliceVehicleFrameWatchDog = setTimeout(async (MissionID) => {
|
||||
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
|
||||
self.PoliceVehicleFrameWatchDog = setTimeout(async function (MissionID) {
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
await self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
|
||||
$("#adis-sprechwunsch-police-frame").attr("src", "");
|
||||
$("#adis-sprechwunsch-police-frame").attr("mission_id", "empty");
|
||||
});
|
||||
}, 1500, MissionID);
|
||||
});
|
||||
}.bind(self), 1500, MissionID);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
AddPoliceSprechwunschToQueue(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.put({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.put({
|
||||
missionID: WunschID,
|
||||
done: 'false'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
UpdatePoliceSprechwunschToDone(WunschID) {
|
||||
return this.ADisDB.ADisSprechwunschPolice.add({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisSprechwunschPolice], async () => {
|
||||
return await self.ADisDB.ADisSprechwunschPolice.put({
|
||||
missionID: WunschID,
|
||||
done: 'true'
|
||||
}).catch((err) => {})
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -628,7 +683,7 @@ class AutomaticDispose {
|
||||
|
||||
self.Jails.reverse();
|
||||
if (self.Jails.length > 0) {
|
||||
this.Send_Vehicle_To_Jail()
|
||||
self.Send_Vehicle_To_Jail()
|
||||
} else {
|
||||
$("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_, elem) => {
|
||||
var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
|
||||
@@ -839,11 +894,14 @@ class AutomaticDispose {
|
||||
}
|
||||
|
||||
AddAvailableMissions(Mission) {
|
||||
return this.ADisDB.ADisAvailabelMissions.put({
|
||||
let self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADisDB.ADisAvailabelMissions.put({
|
||||
missionID: Mission.id,
|
||||
type: Mission.type,
|
||||
name: Mission.name,
|
||||
jsondata: Mission
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
@@ -885,9 +943,8 @@ class AutomaticDispose {
|
||||
ReadAndAddMissions(MissionID, Runner) {
|
||||
const self = this;
|
||||
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
|
||||
self.ADSettings().then(() => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADSettings().then(async () => {
|
||||
return self.ADisDB.ADisMissions.toCollection()
|
||||
}).then((Missions) => {
|
||||
if (typeof Missions !== "undefined") {
|
||||
@@ -898,7 +955,7 @@ class AutomaticDispose {
|
||||
if (MissionElement.length == 0 || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green')) {
|
||||
// remove
|
||||
console.log("Remove :", MyMission)
|
||||
self.RemoveMissionsFromQueue(MyMission.missionID)
|
||||
return self.RemoveMissionsFromQueue(MyMission.missionID)
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -916,8 +973,10 @@ class AutomaticDispose {
|
||||
});
|
||||
})
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});;
|
||||
}
|
||||
|
||||
AddMission(ID, Runner) {
|
||||
@@ -926,7 +985,7 @@ class AutomaticDispose {
|
||||
const runnerID = self.ADisSettings.runner_divs.indexOf(Runner);
|
||||
const settingOpt = self.ADisSettings.runner_settings[runnerID];
|
||||
const runnerOpt = self.ADisSettings.runner[runnerID];
|
||||
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return self.ADSettings().then((setting) => {
|
||||
if (setting[settingOpt] == 'true') {
|
||||
let where = {
|
||||
@@ -980,7 +1039,7 @@ class AutomaticDispose {
|
||||
var MissionVillage = addr[2];
|
||||
console.log('update mission', MissionID)
|
||||
return self.ADisDB.ADisAvailabelMissions.get({
|
||||
type: MissionType
|
||||
type: _MissionType
|
||||
}).then((available) => {
|
||||
return self.UpdateMissions({
|
||||
"missionID": _MissionID,
|
||||
@@ -1027,21 +1086,30 @@ class AutomaticDispose {
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
AddMissionsToQueue(Mission) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.put(Mission).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
UpdateMissions(Mission) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.put(Mission).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}
|
||||
|
||||
FreeIframe(Runner) {
|
||||
@@ -1055,9 +1123,11 @@ class AutomaticDispose {
|
||||
|
||||
UpdateMissionsToDone(MissionID) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.update(MissionID, {
|
||||
last_check: Math.floor(new Date().getTime() / 1000),
|
||||
next_check: Math.floor(new Date().getTime() / 1000) + 120
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
@@ -1065,9 +1135,11 @@ class AutomaticDispose {
|
||||
|
||||
RemoveMissionsFromQueue(MissionID) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions], async () => {
|
||||
return self.ADisDB.ADisMissions.where({
|
||||
missionID: MissionID
|
||||
}).delete().catch((err) => {
|
||||
}).delete()
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
}
|
||||
@@ -1087,10 +1159,10 @@ class AutomaticDispose {
|
||||
// runnerIframe:runnerIframe
|
||||
// })
|
||||
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
self.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], async () => {
|
||||
return await self.ADSettings().then(async (setting) => {
|
||||
if (setting[runnerSettings] == 'true') {
|
||||
return self.ADisDB.ADisMissions.where({
|
||||
return await self.ADisDB.ADisMissions.where({
|
||||
runner: Runner,
|
||||
available: 'true',
|
||||
done: 'false'
|
||||
@@ -1098,6 +1170,7 @@ class AutomaticDispose {
|
||||
return item.next_check <= Math.floor(new Date().getTime() / 1000)
|
||||
}).limit(1)
|
||||
}
|
||||
})
|
||||
}).then((Wunsch) => {
|
||||
// console.table(Wunsch);
|
||||
if (Wunsch !== undefined) {
|
||||
@@ -1122,12 +1195,13 @@ class AutomaticDispose {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
|
||||
return setTimeout(Dexie.ignoreTransaction(function () {self.OpenNextMission.bind(self, Runner)}), 1000);
|
||||
}
|
||||
});
|
||||
}
|
||||
return setTimeout(self.OpenNextMission.bind(self), 1000, Runner);
|
||||
});
|
||||
return setTimeout(Dexie.ignoreTransaction(function () {self.OpenNextMission.bind(self, Runner)}), 1000);
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1168,8 +1242,8 @@ class AutomaticDispose {
|
||||
// return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
|
||||
// })
|
||||
// } else {
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
|
||||
self.ADSettings().then((setting) => {
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, ], async () => {
|
||||
return self.ADSettings().then(async (setting) => {
|
||||
if (setting[self.MyRunnerSettings] === 'true') {
|
||||
|
||||
let where = {
|
||||
@@ -1202,6 +1276,8 @@ class AutomaticDispose {
|
||||
})
|
||||
}
|
||||
})
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
// }
|
||||
}, 500);
|
||||
@@ -1210,27 +1286,31 @@ class AutomaticDispose {
|
||||
|
||||
MainHandler() {
|
||||
const self = this;
|
||||
if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
|
||||
if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
|
||||
|
||||
console.log("DONE!");
|
||||
console.log("DONE: ", self.MissionID);
|
||||
return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
|
||||
return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
|
||||
})
|
||||
} else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0*/ ) {
|
||||
|
||||
} else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) {
|
||||
|
||||
console.log("SEND");
|
||||
console.log("SEND: ", self.MissionID);
|
||||
return self.UpdateMissionsToDone(self.MissionID).then(() => {
|
||||
return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
});
|
||||
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
|
||||
if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) {
|
||||
console.log("WILL SEND?")
|
||||
self.CheckMissionAutomatic();
|
||||
return self.CheckMissionAutomatic();
|
||||
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {
|
||||
self.WorkVerbandMission();
|
||||
return self.WorkVerbandMission();
|
||||
}
|
||||
}, 250);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1242,6 +1322,9 @@ class AutomaticDispose {
|
||||
|
||||
WorkVerbandMission() {
|
||||
const self = this;
|
||||
const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
|
||||
self.MyRunner = self.ADisSettings.runner[runnerID];
|
||||
self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
|
||||
self.ADSettings().then((setting) => {
|
||||
var title = document.getElementById('missionH1');
|
||||
var isVerband = title.innerText.toLowerCase().includes("[verband]");
|
||||
@@ -1299,15 +1382,14 @@ class AutomaticDispose {
|
||||
|
||||
CheckMissionAutomatic() {
|
||||
const self = this;
|
||||
var setOpt;
|
||||
if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedevents') {
|
||||
setOpt = 'MissionsOwn-Automatic';
|
||||
} else if (window.name == 'adis-krankentransporte') {
|
||||
setOpt = 'Krankentransport-Automatic';
|
||||
}
|
||||
if (setOpt && self.MyRunner) {
|
||||
|
||||
const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name);
|
||||
self.MyRunner = self.ADisSettings.runner[runnerID];
|
||||
self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID];
|
||||
if (self.MyRunnerSettings && self.MyRunner) {
|
||||
console.log("debug 1");
|
||||
self.ADSettings().then((setting) => {
|
||||
if (setting[setOpt] == 'true') {
|
||||
if (setting[self.MyRunnerSettings] === 'true') {
|
||||
let where = {
|
||||
missionID: self.MissionID,
|
||||
runner: self.MyRunner,
|
||||
@@ -1322,14 +1404,21 @@ class AutomaticDispose {
|
||||
return coll.limit(1).toArray()
|
||||
}
|
||||
}).then((Missions) => {
|
||||
console.log("debug 2", Missions);
|
||||
if (Missions.length > 0) {
|
||||
var Mission = Missions[0];
|
||||
if (self.MyRunner == 'os') {
|
||||
self.OweSecure = true;
|
||||
}
|
||||
self.GetMissionConfiguration(Mission.type);
|
||||
} else {
|
||||
tellParent(`console.log('config:1000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});
|
||||
} else {
|
||||
tellParent(`console.log('config:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1337,10 +1426,14 @@ class AutomaticDispose {
|
||||
|
||||
GetMissionConfiguration(MissionType) {
|
||||
const self = this;
|
||||
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], () => {
|
||||
console.log("debug 3")
|
||||
return self.ADisDB.transaction('rw!', [self.ADisDB.ADisMissions, self.ADisDB.ADisAvailabelMissions], function () {
|
||||
console.log("debug 3", MissionType, MissionType.toString())
|
||||
return self.ADisDB.ADisAvailabelMissions.get({
|
||||
type: MissionType.toString()
|
||||
})
|
||||
}).then((availableMission) => {
|
||||
console.log("debug 3", availableMission)
|
||||
if (availableMission != undefined && availableMission.jsondata) {
|
||||
self.MissionConfig = availableMission.jsondata;
|
||||
// console.log('MissionConfig: ', MissionType.toString(), JSON.stringify(self.MissionConfig, null, 2))
|
||||
@@ -1350,17 +1443,19 @@ class AutomaticDispose {
|
||||
available: false,
|
||||
next_check: CurrentTime + 60
|
||||
};
|
||||
self.UpdateOwnMissionsToDone(self.MissionID, updateData);
|
||||
self.UpdateMissionsToDone(self.MissionID);
|
||||
tellParent(`console.log('config:3000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
|
||||
}
|
||||
});
|
||||
});
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
});;
|
||||
|
||||
}
|
||||
|
||||
|
||||
StartAlarmProcess() {
|
||||
const self = this;
|
||||
const alarming = function alarming(self) {
|
||||
|
||||
Promise.resolve().then(async () => {
|
||||
return await self.PrepareVehicleNeedList();
|
||||
}).then(async () => {
|
||||
@@ -1413,38 +1508,22 @@ class AutomaticDispose {
|
||||
setTimeout(() => {
|
||||
|
||||
self.UpdateMissionsToDone(self.MissionID).then(() => {
|
||||
if ($('#vehicle_show_table_all tr input[type="checkbox"]:checked').length > 0) {
|
||||
tellParent(`console.log('ok:${window.name}:${self.MissionID}');`);
|
||||
window.$('#mission_alarm_btn').click();
|
||||
} else {
|
||||
tellParent(`window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
|
||||
}
|
||||
});
|
||||
}, 250);
|
||||
|
||||
}).catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
var $div = $("#mission-form > div:nth-child(7) > a");
|
||||
var isShow = $div.is(':hidden');
|
||||
//console.log($div, isShow);
|
||||
if ($div.length && isShow && 1 == 0) {
|
||||
var observer = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if (mutation.attributeName === "style") {
|
||||
setTimeout(function () {
|
||||
alarming(self)
|
||||
}, 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
observer.observe($div[0], {
|
||||
attributes: true
|
||||
});
|
||||
|
||||
$div.click();
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
alarming(self)
|
||||
}, 500);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -2396,5 +2475,28 @@ class AutomaticDispose {
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
var $div = $("a:contains('Fahrzeuganzeige begrenzt! Fehlende Fahrzeuge laden!')");
|
||||
var isShow = $div.is(':hidden');
|
||||
//console.log($div, isShow);
|
||||
if ($div.length && isShow && 1 == 0) {
|
||||
var observer = new MutationObserver(function (mutations) {
|
||||
mutations.forEach(function (mutation) {
|
||||
if (mutation.attributeName === "style") {
|
||||
setTimeout(function () {
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
}, 1500);
|
||||
}
|
||||
});
|
||||
});
|
||||
observer.observe($div[0], {
|
||||
attributes: true
|
||||
});
|
||||
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
$div.click();
|
||||
} else {
|
||||
setTimeout(function () {
|
||||
window.AutomaticDisposeCall = new AutomaticDispose();
|
||||
}, 500);
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user