Merge branch 'fronkdev' into 'master'

Added assigned_to filter to Linework and Pipework

See merge request fronk/thetool!1232
This commit is contained in:
Frank Schubert
2025-04-17 12:39:09 +00:00
5 changed files with 48 additions and 10 deletions

View File

@@ -41,6 +41,7 @@
<h4 class="header-title mb-3">Filter</h4>
<form method="get" id="filterform" action="<?=self::getUrl("Linework")?>">
<div class="row">
<div class="col-1">
<label class="form-label" for="filter_network_id">Netzgebiet</label>
@@ -68,6 +69,18 @@
</select>
</div>
<?php if($me->is("Admin")): ?>
<div class="col-1">
<label class="form-label" for="filter_lineworker_id">Zugeteilt an</label>
<select name="filter[lineworker_id]" id="filter_lineworker_id" class="form-control">
<option></option>
<?php foreach($lineworkers as $address): ?>
<option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("lineworker_id", $filter) && $filter['lineworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
<?php endforeach; ?>
</select>
</div>
<?php endif; ?>
<div class="col-2">
<label class="form-label" for="filter_status_id">Anschlussstatus</label>
<select name="filter[status_id]" id="filter_status_id" class="form-control">

View File

@@ -63,6 +63,18 @@
<?php endforeach; ?>
</select>
</div>
<?php if($me->is("Admin")): ?>
<div class="col-1">
<label class="form-label" for="filter_pipeworker_id">Zugeteilt an</label>
<select name="filter[pipeworker_id]" id="filter_pipeworker_id" class="form-control">
<option></option>
<?php foreach($pipeworkers as $address): ?>
<option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("pipeworker_id", $filter) && $filter['pipeworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
<?php endforeach; ?>
</select>
</div>
<?php endif; ?>
<div class="col-2">
<label class="form-label" for="filter_status_id">Objektstatus</label>