From 86c3c6543ef64bcd705b7f200468c4e04dd26ea9 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 22 Nov 2024 15:57:00 +0100
Subject: [PATCH] Added Rimo External ID Filter in AddressDB/Index

---
 Layout/default/AddressDB/Index.php               | 12 ++++++++++--
 application/ADBHausnummer/ADBHausnummerModel.php |  7 +++++++
 application/AddressDB/AddressDBController.php    |  5 +++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Layout/default/AddressDB/Index.php b/Layout/default/AddressDB/Index.php
index 3b7972df9..7312d205a 100644
--- a/Layout/default/AddressDB/Index.php
+++ b/Layout/default/AddressDB/Index.php
@@ -95,7 +95,7 @@
                   <input type="text" class="form-control" name="filter[hausnummer]" id="filter_street" value="<?=(array_key_exists("hausnummer", $filter)) ? $filter['hausnummer'] : ""?>" />
                 </div>
               </div>
-              
+
               <div class="row mt-2">
                 <div class="col-2">
                   <label class="form-label" for="filter_status_id">Status</label>
@@ -148,7 +148,15 @@
                     <option value="private" <?=(array_key_exists("visibility", $filter) && $filter['visibility'] == "private") ? "selected='selected'" : ""?>>Nur nicht Sichtbar</option>
                   </select>
                 </div>
-                
+
+              </div>
+                <div class="row mt-1">
+
+                    <div class="col-2">
+                      <label class="form-label" for="filter_rimo_id">Rimo External ID</label>
+                      <input type="text" class="form-control" name="filter[rimo_id]" id="filter_rimo_id" value="<?=(array_key_exists("rimo_id", $filter)) ? $filter['rimo_id'] : ""?>" />
+                  </div>
+
                 
               </div>
               <div class="row mt-2">
diff --git a/application/ADBHausnummer/ADBHausnummerModel.php b/application/ADBHausnummer/ADBHausnummerModel.php
index 371c3f793..ab63b1346 100644
--- a/application/ADBHausnummer/ADBHausnummerModel.php
+++ b/application/ADBHausnummer/ADBHausnummerModel.php
@@ -241,6 +241,13 @@ class ADBHausnummerModel {
         $where .= " AND Hausnummer.rimo_id = '$rimo_id'";
       }
     }
+
+      if(array_key_exists("rimo_id%", $filter)) {
+          $rimo_id = FronkDB::singleton()->escape($filter['rimo_id%']);
+          if($rimo_id) {
+              $where .= " AND Hausnummer.rimo_id LIKE '%$rimo_id%'";
+          }
+      }
     
     if(array_key_exists("plz", $filter)) {
       $plz = FronkDB::singleton()->escape($filter['plz']);
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index 8e6b8c786..b3cbe0688 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -133,6 +133,11 @@ class AddressDBController extends mfBaseController {
       $new_filter['extref%'] = "%".$filter['extref'];
       unset($filter['extref']);
     }
+
+      if(array_key_exists("rimo_id", $filter) && $filter['rimo_id']) {
+          $new_filter['rimo_id%'] = $filter['rimo_id'];
+          unset($filter['rimo_id']);
+      }
     
     if(array_key_exists("zip", $filter) && $filter['zip']) {
       $new_filter['plz%'] = $filter['zip'];