removed sbidi and rml from duplicate view

This commit is contained in:
Luca Haid
2025-06-11 14:18:21 +02:00
parent d29c9f6128
commit f57042b514
2 changed files with 35 additions and 27 deletions
@@ -198,6 +198,13 @@ class ADBWohneinheitController extends mfBaseController {
]; ];
}, ADBNetzgebietModel::getAll()); }, ADBNetzgebietModel::getAll());
$filteredNetzgebiete = [];
foreach ($ADBNetzgebiete as $network) {
if (!strstr($network["text"], "SBIDI") && !strstr($network["text"], "Liezen")) {
$filteredNetzgebiete[] = $network;
}
}
$JSGlobals = ["BASE_URL" => self::getUrl(""), $JSGlobals = ["BASE_URL" => self::getUrl(""),
"DASHBOARD_URL" => self::getUrl("Dashboard"), "DASHBOARD_URL" => self::getUrl("Dashboard"),
"MFAPPNAME" => MFAPPNAME_SLUG, "MFAPPNAME" => MFAPPNAME_SLUG,
@@ -207,7 +214,7 @@ class ADBWohneinheitController extends mfBaseController {
["text" => "Doppelte Homes", "href" => self::getUrl("ADBWohneinheit", "duplicate")], ["text" => "Doppelte Homes", "href" => self::getUrl("ADBWohneinheit", "duplicate")],
], ],
"DUPLICATE_HOMES" => $duplicateHomes, "DUPLICATE_HOMES" => $duplicateHomes,
"ADB_NETZGEBIETE" => $ADBNetzgebiete, "ADB_NETZGEBIETE" => $filteredNetzgebiete,
"IS_ADMIN" => $this->me->is("Admin"), "IS_ADMIN" => $this->me->is("Admin"),
]; ];
@@ -215,5 +222,4 @@ class ADBWohneinheitController extends mfBaseController {
$this->layout()->set("JSGlobals", $JSGlobals); $this->layout()->set("JSGlobals", $JSGlobals);
$this->layout()->setTemplate("VueViews/Vue"); $this->layout()->setTemplate("VueViews/Vue");
} }
} }
@@ -300,7 +300,8 @@ class ADBWohneinheitModel {
$sql = "SELECT Wohneinheit.extref, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id $sql = "SELECT Wohneinheit.extref, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id
FROM Wohneinheit FROM Wohneinheit
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id) 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 GROUP BY Wohneinheit.extref, Hausnummer.netzgebiet_id
HAVING COUNT(*) > 1 HAVING COUNT(*) > 1
ORDER BY COUNT(*) DESC"; ORDER BY COUNT(*) DESC";
@@ -360,7 +361,8 @@ class ADBWohneinheitModel {
$sql = "SELECT Wohneinheit.oaid, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id $sql = "SELECT Wohneinheit.oaid, COUNT(*) as count, Hausnummer.netzgebiet_id as netzgebiet_id
FROM Wohneinheit FROM Wohneinheit
LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id) 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 GROUP BY Wohneinheit.oaid, Hausnummer.netzgebiet_id
HAVING COUNT(*) > 1 HAVING COUNT(*) > 1
ORDER BY COUNT(*) DESC"; ORDER BY COUNT(*) DESC";
@@ -423,7 +425,7 @@ class ADBWohneinheitModel {
LEFT JOIN Netzgebiet ON (Netzgebiet.id = Hausnummer.netzgebiet_id) LEFT JOIN Netzgebiet ON (Netzgebiet.id = Hausnummer.netzgebiet_id)
LEFT JOIN thetool.Network ON (Network.adb_netzgebiet_id = Netzgebiet.id) LEFT JOIN thetool.Network ON (Network.adb_netzgebiet_id = Netzgebiet.id)
LEFT JOIN thetool.Address ON (Network.owner_id = Address.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"; ORDER BY Wohneinheit.oaid";
$counter = 0; $counter = 0;