Merge branch 'fronkdev' into 'master'

Added Rimo External ID Filter in AddressDB/Index

See merge request fronk/thetool!760

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']);

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'];