added netzgebiet filter in duplicate view
This commit is contained in:
@@ -163,6 +163,13 @@ class ADBWohneinheitController extends mfBaseController {
|
||||
$duplicateHomes = array_merge(ADBWohneinheitModel::searchDuplicateExtref(),
|
||||
ADBWohneinheitModel::searchDuplicateOAID());
|
||||
|
||||
$ADBNetzgebiete = array_map(function($network) {
|
||||
return [
|
||||
"value" => $network->id,
|
||||
"text" => $network->name,
|
||||
];
|
||||
}, ADBNetzgebietModel::getAll());
|
||||
|
||||
$JSGlobals = ["BASE_URL" => self::getUrl(""),
|
||||
"DASHBOARD_URL" => self::getUrl("Dashboard"),
|
||||
"MFAPPNAME" => MFAPPNAME_SLUG,
|
||||
@@ -172,6 +179,7 @@ class ADBWohneinheitController extends mfBaseController {
|
||||
["text" => "Doppelte Homes", "href" => self::getUrl("ADBWohneinheit", "duplicate")],
|
||||
],
|
||||
"DUPLICATE_HOMES" => $duplicateHomes,
|
||||
"ADB_NETZGEBIETE" => $ADBNetzgebiete,
|
||||
"IS_ADMIN" => $this->me->is("Admin"),
|
||||
];
|
||||
|
||||
|
||||
@@ -287,7 +287,7 @@ 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
|
||||
$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
|
||||
@@ -303,6 +303,7 @@ class ADBWohneinheitModel {
|
||||
$duplicates[$data['extref']] = [
|
||||
"duplicateType" => "extref",
|
||||
'extref' => $data['extref'],
|
||||
'netzgebiet_id' => $data['netzgebiet_id'],
|
||||
'count' => $data['count'],
|
||||
'homeData' => []
|
||||
];
|
||||
@@ -346,7 +347,7 @@ 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
|
||||
$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
|
||||
@@ -363,6 +364,7 @@ class ADBWohneinheitModel {
|
||||
"duplicateType" => "oaid",
|
||||
'oaid' => $data['oaid'],
|
||||
'count' => $data['count'],
|
||||
'netzgebiet_id' => $data['netzgebiet_id'],
|
||||
'homeData' => []
|
||||
];
|
||||
}
|
||||
|
||||
@@ -69,6 +69,7 @@ Vue.component('a-d-b-wohneinheit-duplicate', {
|
||||
tableHeader: 'Doppelte HomeID Liste',
|
||||
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: 'HomeID', value: 'extref'},
|
||||
|
||||
Reference in New Issue
Block a user