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

Added 0 to unit_count filter in Preorder/Index

Browse Source
This commit is contained in:
Frank Schubert
2023-04-18 15:39:35 +02:00
parent 8929e9b7d4
commit d3030edec9
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Layout/default/Preorder/Index.php
View File

@@ -107,7 +107,7 @@
</select>
</div>
<div class="col-2">
<div class="col-1">
<label class="form-label" for="filter_unit_missing">Wohneinheit</label>
<select name="filter[unit_missing]" id="filter_unit_missing" class="form-control">
<option value=""></option>
@@ -116,14 +116,24 @@
</select>
</div>
<div class="col-2">
<label class="form-label" for="filter_unit_count">Anzahl Anschlüsse</label>
<div class="col-1">
<label class="form-label" for="filter_connection_count">Anzahl Anschlüsse</label>
<select name="filter[connection_count]" id="filter_connection_count" class="form-control">
<option value=""></option>
<option value="1" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 1) ? "selected='selected'" : ""?>>1</option>
<option value="2" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
</select>
</div>
<div class="col-2">
<label class="form-label" for="filter_unit_count">Anzahl GWR Wohneinheiten</label>
<select name="filter[unit_count]" id="filter_unit_count" class="form-control">
<option value=""></option>
<option value="0" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 0) ? "selected='selected'" : ""?>>0</option>
<option value="1" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 1) ? "selected='selected'" : ""?>>1</option>
<option value="2" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
</select>
</div>
<?php endif; ?>
</div>

12
application/Preorder/PreorderModel.php
View File

@@ -468,6 +468,18 @@ class PreorderModel {
}
}
if(array_key_exists("unit_count", $filter)) {
$unit_count = $filter['unit_count'];
if(intval($unit_count) === 1) {
$where .= " AND adb_hausnummer.unit_count = 1";
} elseif(intval($unit_count) === 2) {
$where .= " AND adb_hausnummer.unit_count > 1";
} elseif(intval($unit_count) === 0) {
$where .= " AND adb_hausnummer.unit_count = 0 OR adb_hausnummer.unit_count IS NULL";
}
}
if(array_key_exists("attributes", $filter)) {
$attributes = FronkDB::singleton()->escape($filter['attributes']);
if(is_array($attributes) && count($attributes)) {