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

Fixed Address Filter

Browse Source
This commit is contained in:
Luca Haid
2025-02-24 07:29:29 +01:00
parent c8a374b850
commit 64d2df213d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/ConstructionConsent/Index.php
View File

@@ -81,7 +81,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
</select>
</div>
<div class="col-1">
<div class="col-2">
<label class="form-label" for="filter_inspection_planner">Begehung Planer</label>
<select name="filter[inspection_planner]" id="filter_inspection_planner" class="form-control">
<option value="">Alle</option>

13
application/ConstructionConsent/ConstructionConsent.php
View File

@@ -410,10 +410,8 @@ class ConstructionConsent extends mfBaseModel {
ELSE 'blue'
END AS status_light
FROM ConstructionConsent
LEFT JOIN ConstructionConsentOwner cwo
ON ConstructionConsent.id = cwo.constructionconsent_id
LEFT JOIN addressdb.view_hausnummer vh
ON ConstructionConsent.adb_hausnummer_id = vh.hausnummer_id
LEFT JOIN ConstructionConsentOwner cwo ON ConstructionConsent.id = cwo.constructionconsent_id
LEFT JOIN addressdb.view_hausnummer vh ON ConstructionConsent.adb_hausnummer_id = vh.hausnummer_id
WHERE $where
GROUP BY ConstructionConsent.id
$having
@@ -490,6 +488,13 @@ class ConstructionConsent extends mfBaseModel {
}
}
if(array_key_exists("address", $filter)) {
$address = FronkDB::singleton()->escape($filter["address"]);
if($address) {
$where .= " AND (vh.strasse LIKE '%$address%' OR vh.hausnummer LIKE '%$address%' OR vh.plz LIKE '%$address%' OR vh.ortschaft LIKE '%$address%' OR vh.gemeinde LIKE '%$address%')";
}
}
if(array_key_exists("status", $filter)) {
$status = FronkDB::singleton()->escape($filter["status"]);
if($status) {