removed sbidi and rml from duplicate view

application/ADBWohneinheit/ADBWohneinheitController.php

@@ -185,35 +185,41 @@ class ADBWohneinheitController extends mfBaseController {
 
   }
 
-  protected function duplicateAction() {
+    protected function duplicateAction() {
-      $duplicateHomes = array_merge(ADBWohneinheitModel::searchDuplicateExtref(),
+        $duplicateHomes = array_merge(ADBWohneinheitModel::searchDuplicateExtref(),
-          ADBWohneinheitModel::searchDuplicateOAID(),
+            ADBWohneinheitModel::searchDuplicateOAID(),
-      ADBWohneinheitModel::getRimoDeletedHomes()
+            ADBWohneinheitModel::getRimoDeletedHomes()
-      );
+        );
 
-      $ADBNetzgebiete = array_map(function($network) {
+        $ADBNetzgebiete = array_map(function($network) {
             return [
                 "value" => $network->id,
                 "text" => $network->name,
             ];
-      }, ADBNetzgebietModel::getAll());
+        }, ADBNetzgebietModel::getAll());
 
-      $JSGlobals = ["BASE_URL" => self::getUrl(""),
+        $filteredNetzgebiete = [];
-          "DASHBOARD_URL" => self::getUrl("Dashboard"),
+        foreach ($ADBNetzgebiete as $network) {
-          "MFAPPNAME" => MFAPPNAME_SLUG,
+            if (!strstr($network["text"], "SBIDI") && !strstr($network["text"], "Liezen")) {
-          "PAGE_TITLE" => "Doppelte Homes",
+                $filteredNetzgebiete[] = $network;
-          "PATH" => [
+            }
-              ["text" => MFAPPNAME_SLUG, "href" => self::getUrl("Dashboard")],
+        }
-              ["text" => "Doppelte Homes", "href" => self::getUrl("ADBWohneinheit", "duplicate")],
-          ],
-          "DUPLICATE_HOMES" => $duplicateHomes,
-          "ADB_NETZGEBIETE" => $ADBNetzgebiete,
-          "IS_ADMIN" => $this->me->is("Admin"),
-      ];
 
-      $this->layout()->set("vueViewName", "ADBWohneinheitDuplicate");
+        $JSGlobals = ["BASE_URL" => self::getUrl(""),
-      $this->layout()->set("JSGlobals", $JSGlobals);
+            "DASHBOARD_URL" => self::getUrl("Dashboard"),
-      $this->layout()->setTemplate("VueViews/Vue");
+            "MFAPPNAME" => MFAPPNAME_SLUG,
-  }
+            "PAGE_TITLE" => "Doppelte Homes",
-  
+            "PATH" => [
+                ["text" => MFAPPNAME_SLUG, "href" => self::getUrl("Dashboard")],
+                ["text" => "Doppelte Homes", "href" => self::getUrl("ADBWohneinheit", "duplicate")],
+            ],
+            "DUPLICATE_HOMES" => $duplicateHomes,
+            "ADB_NETZGEBIETE" => $filteredNetzgebiete,
+            "IS_ADMIN" => $this->me->is("Admin"),
+        ];
+
+        $this->layout()->set("vueViewName", "ADBWohneinheitDuplicate");
+        $this->layout()->set("JSGlobals", $JSGlobals);
+        $this->layout()->setTemplate("VueViews/Vue");
+    }
 }

application/ADBWohneinheit/ADBWohneinheitModel.php

@@ -300,7 +300,8 @@ class ADBWohneinheitModel {
         $sql = "SELECT Wohneinheit.extref, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id
             FROM Wohneinheit
             LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
-            WHERE $where AND Wohneinheit.extref IS NOT NULL
+                                 LEFT JOIN Netzgebiet ON (Netzgebiet.id = Hausnummer.netzgebiet_id)
+            WHERE $where AND Wohneinheit.extref IS NOT NULL AND Netzgebiet.name NOT LIKE 'SBIDI%' AND Netzgebiet.name NOT LIKE 'Liezen%'
             GROUP BY Wohneinheit.extref, Hausnummer.netzgebiet_id
             HAVING COUNT(*) > 1
             ORDER BY COUNT(*) DESC";
@@ -360,7 +361,8 @@ class ADBWohneinheitModel {
         $sql = "SELECT Wohneinheit.oaid, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id
         FROM Wohneinheit
         LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id)
-        WHERE $where AND Wohneinheit.oaid IS NOT NULL
+        LEFT JOIN Netzgebiet ON (Netzgebiet.id = Hausnummer.netzgebiet_id)
+        WHERE $where AND Wohneinheit.oaid IS NOT NULL AND Netzgebiet.name NOT LIKE 'SBIDI%' AND Netzgebiet.name NOT LIKE 'Liezen%'
         GROUP BY Wohneinheit.oaid, Hausnummer.netzgebiet_id
         HAVING COUNT(*) > 1
         ORDER BY COUNT(*) DESC";
@@ -423,7 +425,7 @@ class ADBWohneinheitModel {
             LEFT JOIN Netzgebiet ON (Netzgebiet.id = Hausnummer.netzgebiet_id)
             LEFT JOIN thetool.Network ON (Network.adb_netzgebiet_id = Netzgebiet.id)
             LEFT JOIN thetool.Address ON (Network.owner_id = Address.id)
-            WHERE $where AND Wohneinheit.rimo_deleted = 1
+            WHERE $where AND Wohneinheit.rimo_deleted = 1 AND Netzgebiet.name NOT LIKE 'SBIDI%' AND Netzgebiet.name NOT LIKE 'Liezen%'
             ORDER BY Wohneinheit.oaid";
 
         $counter = 0;