diff --git a/dist/autoloader.js b/dist/autoloader.js index fd45385..156a419 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 21:20:07 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 21:56:48 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(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index d42a41b..255cacb 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 21:20:07 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 21:56:48 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18773,37 +18773,49 @@ class AutomaticDispose { self._ADisVehiclesNeed["56"] = 1; } - //$.each(Patients, function (Key, Patient) { - for (var Key in self.Patients) { - var Patient = self.Patients[Key]; - if (self.MissionConfig.emergency_medical_service.use_KTW == true) { - if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) - self._ADisVehiclesNeed["38"]++; + if (Object.keys(self.Patients).length == 0) { + if (self.MissionConfig.emergency_medical_service.use_RTW == true) { + self._ADisVehiclesNeed["28"]++; } - if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) - self._ADisVehiclesNeed["55"]++; - - if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) - self._ADisVehiclesNeed["56"]++; - - if (Patient.need_Tragehilfe == true) - self._ADisVehiclesNeed["0"]++; - - if (Patient.need_Tragehilfe == true) - self._ADisVehiclesNeed["0"]++; - - if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) - self._ADisVehiclesNeed["28"]++; - - if ((self.MissionConfig.emergency_medical_service.use_NEF == true && Patient.need_NEF == true) || Patient.need_NEF == true) + if (self.MissionConfig.emergency_medical_service.use_NEF == true) { self._ADisVehiclesNeed["29"]++; + } - if ((self.MissionConfig.emergency_medical_service.use_RTH == true && Patient.need_RTH == true) || Patient.need_RTH == true) + if (self.MissionConfig.emergency_medical_service.use_RTH == true) { self._ADisVehiclesNeed["31"]++; - }; + } + } else { + for (var Key in self.Patients) { + var Patient = self.Patients[Key]; + if (self.MissionConfig.emergency_medical_service.use_KTW == true) { + if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) { + self._ADisVehiclesNeed["38"]++; + } + } + if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) { + self._ADisVehiclesNeed["55"]++; + } + if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) { + self._ADisVehiclesNeed["56"]++; + } + if (Patient.need_Tragehilfe == true) { + self._ADisVehiclesNeed["0"]++; + } + if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) { + self._ADisVehiclesNeed["28"]++; + } + if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) { + self._ADisVehiclesNeed["29"]++; + } + if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) { + self._ADisVehiclesNeed["31"]++; + } + }; + + } // TODO: need to be refactored to make sure first KTW Typ B before RTW. if (self.MissionConfig.emergency_medical_service.use_SEG_ELW1_Only == "true") { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 0d5c6c0..7136956 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1532,37 +1532,49 @@ class AutomaticDispose { self._ADisVehiclesNeed["56"] = 1; } - //$.each(Patients, function (Key, Patient) { - for (var Key in self.Patients) { - var Patient = self.Patients[Key]; - if (self.MissionConfig.emergency_medical_service.use_KTW == true) { - if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) - self._ADisVehiclesNeed["38"]++; + if (Object.keys(self.Patients).length == 0) { + if (self.MissionConfig.emergency_medical_service.use_RTW == true) { + self._ADisVehiclesNeed["28"]++; } - if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) - self._ADisVehiclesNeed["55"]++; - - if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) - self._ADisVehiclesNeed["56"]++; - - if (Patient.need_Tragehilfe == true) - self._ADisVehiclesNeed["0"]++; - - if (Patient.need_Tragehilfe == true) - self._ADisVehiclesNeed["0"]++; - - if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) - self._ADisVehiclesNeed["28"]++; - - if ((self.MissionConfig.emergency_medical_service.use_NEF == true && Patient.need_NEF == true) || Patient.need_NEF == true) + if (self.MissionConfig.emergency_medical_service.use_NEF == true) { self._ADisVehiclesNeed["29"]++; + } - if ((self.MissionConfig.emergency_medical_service.use_RTH == true && Patient.need_RTH == true) || Patient.need_RTH == true) + if (self.MissionConfig.emergency_medical_service.use_RTH == true) { self._ADisVehiclesNeed["31"]++; - }; + } + } else { + for (var Key in self.Patients) { + var Patient = self.Patients[Key]; + if (self.MissionConfig.emergency_medical_service.use_KTW == true) { + if (!Patient.need_RTW && !Patient.need_NEF && !Patient.need_RTH) { + self._ADisVehiclesNeed["38"]++; + } + } + if (Patient.need_LNA && self._ADisVehiclesNeed["55"] < 1) { + self._ADisVehiclesNeed["55"]++; + } + if (Patient.need_OrgL && self._ADisVehiclesNeed["56"] < 1) { + self._ADisVehiclesNeed["56"]++; + } + if (Patient.need_Tragehilfe == true) { + self._ADisVehiclesNeed["0"]++; + } + if (self.MissionConfig.emergency_medical_service.use_RTW == true || Patient.need_RTW == true) { + self._ADisVehiclesNeed["28"]++; + } + if (self.MissionConfig.emergency_medical_service.use_NEF == true || Patient.need_NEF == true) { + self._ADisVehiclesNeed["29"]++; + } + if (self.MissionConfig.emergency_medical_service.use_RTH == true || Patient.need_RTH == true) { + self._ADisVehiclesNeed["31"]++; + } + }; + + } // TODO: need to be refactored to make sure first KTW Typ B before RTW. if (self.MissionConfig.emergency_medical_service.use_SEG_ELW1_Only == "true") {