From 332bbf0e728b42a24a7c9bb6ae5c6b0672e1f32c Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 31 Mar 2023 16:27:14 +0200
Subject: [PATCH] Added hausnummer filter in AdressDB/Index

---
 Layout/default/AddressDB/Index.php               | 5 +++++
 application/ADBHausnummer/ADBHausnummerModel.php | 5 ++---
 application/AddressDB/AddressDBController.php    | 8 +++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Layout/default/AddressDB/Index.php b/Layout/default/AddressDB/Index.php
index 9ff99ca42..733275147 100644
--- a/Layout/default/AddressDB/Index.php
+++ b/Layout/default/AddressDB/Index.php
@@ -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">
diff --git a/application/ADBHausnummer/ADBHausnummerModel.php b/application/ADBHausnummer/ADBHausnummerModel.php
index 7f1d19c4a..0edd02cba 100644
--- a/application/ADBHausnummer/ADBHausnummerModel.php
+++ b/application/ADBHausnummer/ADBHausnummerModel.php
@@ -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%'";
       }
     }
     
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index b623d91fd..bd7346501 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -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;