Merge branch 'update-preorder-filter' into 'master'
Added new filters // borderpoint is still missing See merge request fronk/thetool!831
This commit is contained in:
@@ -148,10 +148,26 @@
|
||||
|
||||
<div class="col-sm-12 col-md-2">
|
||||
<label class="form-label" for="partner_id">Partner</label>
|
||||
<select name="filter[partner_id]" id="filter_partner_id" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<?php foreach($partners as $partner): ?>
|
||||
<option value="<?=$partner['partner_id']?>" <?=(isset($filter) && array_key_exists("partner_id", $filter) && $filter["partner_id"] == $partner['partner_id']) ? "selected='selected'" : ""?>><?=$partner['name']?></option>
|
||||
<select name="filter[partner_id][]" id="filter_partner_id" class="form-control" multiple="multiple">
|
||||
<?php
|
||||
// if partner_id is string unset it from filter
|
||||
if(isset($filter) && array_key_exists("partner_id", $filter) && is_string($filter["partner_id"])) {
|
||||
unset($filter["partner_id"]);
|
||||
}
|
||||
?>
|
||||
<?php foreach($partners as $partner): ?>
|
||||
<option value="<?=$partner['partner_id']?>" <?=(isset($filter) && array_key_exists("partner_id", $filter) && in_array($partner['partner_id'], $filter["partner_id"])) ? "selected='selected'" : ""?>><?=$partner['name']?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-12 col-md-2">
|
||||
<label class="form-label" for="connection_type">Anschlusstyp</label>
|
||||
<select name="filter[connection_type][]" id="connection_type_id" class="form-control" multiple="multiple">
|
||||
<?php
|
||||
$connection_types = ["single-dwelling","multi-dwelling","apartment-building","apartment","business"];
|
||||
foreach($connection_types as $connection_type): ?>
|
||||
<option value="<?=$connection_type?>" <?=(isset($filter) && array_key_exists("connection_type", $filter) && in_array($connection_type, $filter["connection_type"])) ? "selected='selected'" : ""?>><?=__($connection_type, "preorder")?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@@ -173,14 +189,15 @@
|
||||
<option value="order" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("order", $filter['type'])) ? "selected='selected'" : ""?>>Vollanschluss</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-12 col-md-2">
|
||||
<label class="form-label" for="filter_addon_services">Zusatzdienste</label>
|
||||
<select name="filter[addon_services]" id="filter_addon_services" class="form-control">
|
||||
<option></option>
|
||||
<option value="1" <?=(isset($filter['addon_services']) && $filter['addon_services'] == 1) ? "selected='selected'" : ""?>>Nur mit Zusatzdiensten</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- INFO THIS FILTER IS CURRENTLY HIDDEN -->
|
||||
<!-- <div class="col-sm-12 col-md-2">-->
|
||||
<!-- <label class="form-label" for="filter_addon_services">Zusatzdienste</label>-->
|
||||
<!-- <select name="filter[addon_services]" id="filter_addon_services" class="form-control">-->
|
||||
<!-- <option></option>-->
|
||||
<!-- <option value="1" --><?php //=(isset($filter['addon_services']) && $filter['addon_services'] == 1) ? "selected='selected'" : ""?><!-- >Nur mit Zusatzdiensten</option>-->
|
||||
<!-- </select>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
<div class="row mt-2">
|
||||
<div class="col-sm-12 col-md-1">
|
||||
@@ -442,6 +459,8 @@
|
||||
$(document).ready(function() {
|
||||
$("#filter_type").select2({closeOnSelect: false});
|
||||
$("#filter_status").select2({closeOnSelect: false});
|
||||
$("#filter_partner_id").select2({closeOnSelect: false});
|
||||
$("#connection_type_id").select2({closeOnSelect: false});
|
||||
|
||||
var attributes = ["bep_specified", "inhouse_cabling_supplied"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user