From cf89b1178bc6b42c29d706853adecf22b76b7a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= <froehle@b1-systems.de>
Date: Mon, 3 Dec 2018 09:06:42 +0100
Subject: [PATCH] v2 maifa0

---
 dist/autoloader.js   |  2 +-
 dist/autoloaderV2.js | 12 ++++--------
 src/autoloaderV2.js  | 10 +++-------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/dist/autoloader.js b/dist/autoloader.js
index 0d9c428..95a83a7 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 03 2018 01:08:54 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 03 2018 09:06:41 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 9fae97a..d929d9b 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 03 2018 01:08:54 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 03 2018 09:06:41 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18578,8 +18578,7 @@ class AutomaticDispose {
             // Wir benötigen einen RTW oder KTW Typ B.
             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;
-            }
-
+            } else
             // Wir benötigen einen RTW.
             if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein RTW") != -1) {
                 PatientNeedRTW = true;
@@ -18684,16 +18683,13 @@ class AutomaticDispose {
                 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 || Patient.need_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 || Patient.need_RTH == true)
                     self._ADisVehiclesNeed["31"]++;
             };
 
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 972ab9d..5d3ec94 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1408,8 +1408,7 @@ class AutomaticDispose {
             // Wir benötigen einen RTW oder KTW Typ B.
             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;
-            }
-
+            } else
             // Wir benötigen einen RTW.
             if ($(elem).find(".alert-danger").length > 0 && $(elem).find(".alert-danger").text().indexOf("Wir benötigen ein RTW") != -1) {
                 PatientNeedRTW = true;
@@ -1514,16 +1513,13 @@ class AutomaticDispose {
                 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 || Patient.need_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 || Patient.need_RTH == true)
                     self._ADisVehiclesNeed["31"]++;
             };