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

v2 up dau9u03292

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-04 20:06:20 +01:00
parent bb0db92ef9
commit 7fd6705513
6 changed files with 536 additions and 7292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
all_missions.json
+154 -2414
View File
File diff suppressed because it is too large Load Diff
all_missions2.json
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/autoloader.js
Vendored
+155 -2415
View File
File diff suppressed because it is too large Load Diff
dist/autoloaderV2.js
Vendored
+187 -2435
View File
File diff suppressed because it is too large Load Diff
server/gen_missionjs.php
+1 -1
View File
@@ -131,7 +131,7 @@ function emsDepartment($data)
} }
if ($key == "Benötigte GW-San") { if ($key == "Benötigte GW-San") {
$pd["use_SEG_FULL"] = true; $pd["use_SEG_FULL"] = true;
} elseif ($key == "Benötigte RTW" || "Wahrscheinlichkeit, dass ein Patient transportiert werden muss") { } elseif ($key == "Benötigte RTW" || $key == "Wahrscheinlichkeit, dass ein Patient transportiert werden muss") {
$pd["use_RTW"] = true; $pd["use_RTW"] = true;
} elseif ($key == "NEF Anforderungswahrscheinlichkeit") { } elseif ($key == "NEF Anforderungswahrscheinlichkeit") {
$pd["use_NEF"] = true; $pd["use_NEF"] = true;
src/autoloaderV2.js
+32 -20
View File
@@ -125,7 +125,7 @@ class AutomaticDispose {
await self.genSettings() await self.genSettings()
setInterval(self.genSettings.bind(self), 1000); setInterval(self.genSettings.bind(self), 1000);
if (window.location.pathname === "/" || window.location.pathname === "/#" || window.location.pathname === "/#_=_" ) { if (window.location.pathname === "/" || window.location.pathname === "/#" || window.location.pathname === "/#_=_") {
self.GetAvailableMissions() self.GetAvailableMissions()
self.IndexPage() self.IndexPage()
setInterval(self.CollectRescueSprechwuensche.bind(self), 2500); setInterval(self.CollectRescueSprechwuensche.bind(self), 2500);
@@ -1188,7 +1188,7 @@ class AutomaticDispose {
WorkVerbandMission(myself) { WorkVerbandMission(myself) {
if (typeof myself === 'undefined') { if (typeof myself === 'undefined') {
myself=false myself = false
} }
const self = this; const self = this;
return self.ADSettings().then((setting) => { return self.ADSettings().then((setting) => {
@@ -1340,7 +1340,7 @@ class AutomaticDispose {
} }
// TODO check cars driving or already there // TODO check cars driving or already there
if (self.MissionConfig.share){ if (self.MissionConfig.share) {
// console.log('self.MissionConfig.share',self.MissionConfig.share) // console.log('self.MissionConfig.share',self.MissionConfig.share)
const elems = $('#vehicle_show_table_all tr input[type="checkbox"]:checked') const elems = $('#vehicle_show_table_all tr input[type="checkbox"]:checked')
// console.log('elems', elems) // console.log('elems', elems)
@@ -1355,10 +1355,10 @@ class AutomaticDispose {
// console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').length, $('#vehicle_show_table_all input[type="checkbox"]:checked')); // console.log("Clicked Vehicles: ", $('#vehicle_show_table_all input[type="checkbox"]:checked').length, $('#vehicle_show_table_all input[type="checkbox"]:checked'));
// console.log("WILL KLICK SEND") // console.log("WILL KLICK SEND")
setTimeout(() => { setTimeout(() => {
self.UpdateMissionsToDone(self.MissionID).then( async () => { self.UpdateMissionsToDone(self.MissionID).then(async () => {
tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`); tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`);
if (window.$("a[title='Alarmieren, im Verband freigeben und nächsten Einsatz aufrufen']").length > 0 && self.MissionConfig.share) { if (window.$("a[title='Alarmieren, im Verband freigeben und nächsten Einsatz aufrufen']").length > 0 && self.MissionConfig.share) {
window.$('input[type=checkbox]').prop('checked',false); window.$('input[type=checkbox]').prop('checked', false);
await self.WorkVerbandMission(true); await self.WorkVerbandMission(true);
window.$("a[title='Alarmieren, im Verband freigeben und nächsten Einsatz aufrufen']")[0].click(); window.$("a[title='Alarmieren, im Verband freigeben und nächsten Einsatz aufrufen']")[0].click();
} else { } else {
@@ -1424,10 +1424,10 @@ class AutomaticDispose {
if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen einen RTW oder KTW Typ B") != -1) { if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen einen RTW oder KTW Typ B") != -1) {
PatientNeedSEGKTWB = true; PatientNeedSEGKTWB = true;
} else } else
// Wir benötigen einen RTW. // Wir benötigen einen RTW.
if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein RTW") != -1) { if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein RTW") != -1) {
PatientNeedRTW = true; PatientNeedRTW = true;
} }
// Wir benötigen einen NEF. // Wir benötigen einen NEF.
if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein NEF") != -1) { if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein NEF") != -1) {
@@ -1511,31 +1511,43 @@ class AutomaticDispose {
self._ADisVehiclesNeed["56"] = 1; self._ADisVehiclesNeed["56"] = 1;
} }
if (self.MissionConfig.emergency_medical_service.use_RTW == true)
self._ADisVehiclesNeed["28"]++;
if (self.MissionConfig.emergency_medical_service.use_NEF == true)
self._ADisVehiclesNeed["29"]++;
if (self.MissionConfig.emergency_medical_service.use_RTH == true)
self._ADisVehiclesNeed["31"]++;
//$.each(Patients, function (Key, Patient) { //$.each(Patients, function (Key, Patient) {
for (var Key in self.Patients) { for (var Key in self.Patients) {
var Patient = self.Patients[Key]; var Patient = self.Patients[Key];
if (self.MissionConfig.emergency_medical_service.use_KTW == true) { if (self.MissionConfig.emergency_medical_service.use_KTW == true) {
if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) {
self._ADisVehiclesNeed["38"]++; self._ADisVehiclesNeed["38"]++;
}
} }
if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) {
self._ADisVehiclesNeed["55"]++; self._ADisVehiclesNeed["55"]++;
}
if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) {
self._ADisVehiclesNeed["56"]++; self._ADisVehiclesNeed["56"]++;
}
if (Patient.need_Tragehilfe == true) if (Patient.need_Tragehilfe == true) {
self._ADisVehiclesNeed["0"]++; self._ADisVehiclesNeed["0"]++;
}
if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) {
self._ADisVehiclesNeed["28"]++; self._ADisVehiclesNeed["28"]++;
}
if (self.MissionConfig.emergency_medical_service.use_NEF || Patient.need_NEF == true) if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) {
self._ADisVehiclesNeed["29"]++; self._ADisVehiclesNeed["29"]++;
}
if (self.MissionConfig.emergency_medical_service.use_RTH || Patient.need_RTH == true) if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) {
self._ADisVehiclesNeed["31"]++; self._ADisVehiclesNeed["31"]++;
}
}; };