diff --git a/application/ADBWohneinheit/ADBWohneinheitModel.php b/application/ADBWohneinheit/ADBWohneinheitModel.php index 8d49c0ce9..f4aa5d092 100644 --- a/application/ADBWohneinheit/ADBWohneinheitModel.php +++ b/application/ADBWohneinheit/ADBWohneinheitModel.php @@ -297,11 +297,11 @@ class ADBWohneinheitModel { $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME)->link; $where = self::getSqlFilter($filter); - $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, Netzgebiet.name as netzgebiet_name FROM Wohneinheit LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id) 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%' + WHERE $where AND Wohneinheit.extref IS NOT NULL AND Netzgebiet.name NOT LIKE 'SBIDI%' GROUP BY Wohneinheit.extref, Hausnummer.netzgebiet_id HAVING COUNT(*) > 1 ORDER BY COUNT(*) DESC"; @@ -315,6 +315,7 @@ class ADBWohneinheitModel { "duplicateType" => "extref", 'extref' => $data['extref'], 'netzgebiet_id' => $data['netzgebiet_id'], + 'netzgebiet_owner' => strstr($data['netzgebiet_name'], 'Liezen') ? 'RML' : 'ESTMK', 'count' => $data['count'], 'homeData' => [] ]; @@ -358,11 +359,11 @@ class ADBWohneinheitModel { $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME)->link; $where = self::getSqlFilter($filter); - $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, Netzgebiet.name as netzgebiet_name FROM Wohneinheit LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id) 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%' + WHERE $where AND Wohneinheit.oaid IS NOT NULL AND Netzgebiet.name NOT LIKE 'SBIDI%' GROUP BY Wohneinheit.oaid, Hausnummer.netzgebiet_id HAVING COUNT(*) > 1 ORDER BY COUNT(*) DESC"; @@ -377,6 +378,7 @@ class ADBWohneinheitModel { 'oaid' => $data['oaid'], 'count' => $data['count'], 'netzgebiet_id' => $data['netzgebiet_id'], + 'netzgebiet_owner' => strstr($data['netzgebiet_name'], 'Liezen') ? 'RML' : 'ESTMK', 'homeData' => [] ]; } @@ -419,13 +421,13 @@ class ADBWohneinheitModel { $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME)->link; $where = self::getSqlFilter($filter); - $detailSql = "SELECT Wohneinheit.*, thetool.Address.company AS company, Hausnummer.rimo_id AS hausnummer_extref + $detailSql = "SELECT Wohneinheit.*, thetool.Address.company AS company, Hausnummer.rimo_id AS hausnummer_extref, Netzgebiet.name AS netzgebiet_name FROM Wohneinheit LEFT JOIN Hausnummer ON (Hausnummer.id = Wohneinheit.hausnummer_id) 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 AND Netzgebiet.name NOT LIKE 'SBIDI%' AND Netzgebiet.name NOT LIKE 'Liezen%' + WHERE $where AND Wohneinheit.rimo_deleted = 1 AND Netzgebiet.name NOT LIKE 'SBIDI%' ORDER BY Wohneinheit.oaid"; $counter = 0; @@ -437,6 +439,7 @@ class ADBWohneinheitModel { 'oaid' => $homeData['oaid'] ?? 'Keine OAID', 'extref' => $homeData['extref'], 'netzgebiet_id' => $homeData['netzgebiet_id'], + 'netzgebiet_owner' => strstr($homeData['netzgebiet_name'], 'Liezen') ? 'RML' : 'ESTMK', 'count' => 1, // Each entry is unique in this context 'homeData' => [] ]; diff --git a/public/js/pages/ADBWohneinheitDuplicate/ADBWohneinheitDuplicate.js b/public/js/pages/ADBWohneinheitDuplicate/ADBWohneinheitDuplicate.js index 5b39c3efb..f08a131e2 100644 --- a/public/js/pages/ADBWohneinheitDuplicate/ADBWohneinheitDuplicate.js +++ b/public/js/pages/ADBWohneinheitDuplicate/ADBWohneinheitDuplicate.js @@ -70,13 +70,19 @@ Vue.component('a-d-b-wohneinheit-duplicate', { defaultPageSize: 10, headers: [ {text: 'Netzgebiet', key: 'netzgebiet_id', sortable: true, class: 'text-nowrap', priority: 11, filter: 'select', filterOptions: window['TT_CONFIG']['ADB_NETZGEBIETE']}, - {text: 'HomeID | OAID', key: 'extref', sortable: true, class: 'text-nowrap', priority: 10}, - {text: 'Duplicate Type', key: 'duplicateType', sortable: true, class: 'text-nowrap', priority: 9, filter: 'select', filterOptions: [ + {text: 'Firma', key: 'netzgebiet_owner', sortable: true, class: 'text-nowrap', priority: 11, filter: 'select', filterOptions: + [ + {text: 'RML', value: 'RML'}, + {text: 'ESTMK', value: 'ESTMK'}, + ] + }, + {text: 'HomeID/OAID', key: 'extref', sortable: true, class: 'text-nowrap', priority: 10}, + {text: 'Check-Typ', key: 'duplicateType', sortable: true, class: 'text-nowrap', priority: 9, filter: 'select', filterOptions: [ {text: 'HomeID', value: 'extref'}, {text: 'OAID', value: 'oaid'}, {text: 'RIMO gelöscht', value: 'rimo_deleted'}, ]}, - {text: 'Anzahl gleicher HomeIDs', key: 'count', sortable: true, class: 'text-center', priority: 8}, + {text: 'Anz. HomeIDs', key: 'count', sortable: true, class: 'text-center', priority: 8}, { text: 'Home Details', key: 'homeDetails',