Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
AdressDB visibility filter & not importing canceled buildings

See merge request fronk/thetool!404
This commit is contained in:
Frank Schubert
2024-06-20 11:35:25 +00:00
parent 5b8a4cfcf1 8de0dfa389
commit c5ca6ee94f
5 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/AddressDB/AddressDB.php
+2 -1
View File
@@ -250,7 +250,8 @@ class AddressDB {
// build hausnummer data
//$hausnummer_data['oaid'] = (array_key_exists("oaid", $data) && $data['oaid']) ? $data['oaid'] : null;
$hausnummer_data['adrcd'] = ($data['adrcd']) ? $data['adrcd'] : null;
$hausnummer_data['adrcd'] = ($adrcd) ? $adrcd : null;
$hausnummer_data['subcd'] = ($subcd) ? $subcd : null;
$hausnummer_data['extref'] = ($data['extref']) ? $data['extref'] : null;
$hausnummer_data['rimo_id'] = ($data['rimo_id']) ? $data['rimo_id'] : null;
$hausnummer_data['netzgebiet_id'] = $netzgebiet_id;
application/AddressDB/AddressDBController.php
+8 -3
View File
@@ -77,8 +77,7 @@ class AddressDBController extends mfBaseController {
if(!array_key_exists("netzgebiet_id", $addressdb_filter)) {
$addressdb_filter['netzgebiet_id'] = $netzgebiet_ids;
}
$addressdb_filter["visibility"] = ["public", "private"];
$this->layout()->set("my_networks", ADBNetzgebietModel::getAll());
$this->layout()->set("my_adb_networks", $my_adb_networks);
@@ -161,7 +160,13 @@ class AddressDBController extends mfBaseController {
unset($filter['ortschaft']);
unset($filter['ortschaft_id']);
}
if(array_key_exists("visibility", $filter) && $filter['visibility']) {
$new_filter['visibility'] = $filter['visbility'];
} else {
$new_filter["visibility"] = ["public", "private"];
unset($filter['visibility']);
}
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {