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

Added Rimo External ID Filter in AddressDB/Index

Browse Source
This commit is contained in:
Frank Schubert
2024-11-22 15:57:00 +01:00
parent 1c5ea0d91d
commit 86c3c6543e
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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">

7
application/ADBHausnummer/ADBHausnummerModel.php
View File

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

5
application/AddressDB/AddressDBController.php
View File

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