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

Added hausnummer filter in AdressDB/Index

Browse Source
This commit is contained in:
Frank Schubert
2023-03-31 16:27:14 +02:00
parent ccf3fda16d
commit 332bbf0e72
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Layout/default/AddressDB/Index.php
View File

@@ -84,6 +84,11 @@
<label class="form-label" for="filter_street">Strasse</label>
<input type="text" class="form-control" name="filter[street]" id="filter_street" value="<?=$filter['street']?>" />
</div>
<div class="col-1">
<label class="form-label" for="filter_hausnummer">Hausnummer</label>
<input type="text" class="form-control" name="filter[hausnummer]" id="filter_street" value="<?=$filter['hausnummer']?>" />
</div>
</div>
<div class="row mt-2">

5
application/ADBHausnummer/ADBHausnummerModel.php
View File

@@ -135,7 +135,6 @@ class ADBHausnummerModel {
WHERE $where
ORDER BY netzgebiet_id,Gemeinde.id,ortschaft_id,strasse_id,LENGTH(hausnummer), hausnummer";
mfLoghandler::singleton()->debug($sql);
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
@@ -312,9 +311,9 @@ class ADBHausnummerModel {
}
if(array_key_exists("hausnummer%", $filter)) {
$hausnummer = FronkDB::singleton()->escape($filter['hausnummer']);
$hausnummer = FronkDB::singleton()->escape($filter['hausnummer%']);
if($hausnummer) {
$where .= " AND Hausnummer.`hausnummer` like '%$hausnummer%'";
$where .= " AND Hausnummer.`hausnummer` like '$hausnummer%'";
}
}

8
application/AddressDB/AddressDBController.php
View File

@@ -73,7 +73,7 @@ class AddressDBController extends mfBaseController {
$this->layout()->set("my_networks", ADBNetzgebietModel::getAll());
$this->layout()->set("my_adb_networks", $my_adb_networks);
//var_dump($addressdb_filter);exit;
//var_dump($addressdb_filter);exit;
if($filter['netzgebiet_id'] === "null") {
$addressdb_filter['netzgebiet_id'] = 0;
$pagination['maxItems'] = ADBHausnummerModel::count($addressdb_filter);
@@ -107,6 +107,11 @@ class AddressDBController extends mfBaseController {
unset($filter['street']);
}
if(array_key_exists("hausnummer", $filter) && $filter['hausnummer']) {
$new_filter['hausnummer%'] = $filter['hausnummer'];
unset($filter['hausnummer']);
}
if(array_key_exists("adrcd", $filter) && $filter['adrcd']) {
$new_filter['adrcd%'] = $filter['adrcd'];
unset($filter['adrcd']);
@@ -149,6 +154,7 @@ class AddressDBController extends mfBaseController {
unset($filter['ortschaft_id']);
}
if(is_array($filter) && count($filter)) {
foreach($filter as $name => $value) {
if(strlen($value) > 0) $new_filter[$name] = $value;