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

Added assigned_to filter to Pipework

Browse Source
This commit is contained in:
Frank Schubert
2025-04-17 14:38:25 +02:00
parent 68ef494c9d
commit 81b8c307c0
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Layout/default/Linework/Index.php
View File

@@ -53,18 +53,6 @@
</select>
</div>
<?php if($this->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($lineworker 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-1">
<label class="form-label" for="filter_networksection_id">Bauabschnitt</label>
<select name="filter[networksection_id]" id="filter_networksection_id" class="form-control">
@@ -81,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">

12
Layout/default/Pipework/Index.php
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>

5
application/Linework/LineworkController.php
View File

@@ -62,7 +62,8 @@ class LineworkController extends mfBaseController {
}
$this->layout()->set("mynetworks", NetworkModel::getAll());
$lineworker = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
$lineworkers = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
$this->layout()->set("lineworkers", $lineworkers);
} else {
$use_filter_network = false;
$my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
@@ -158,7 +159,7 @@ class LineworkController extends mfBaseController {
$this->layout()->set("pagination", $pagination);
$this->layout()->set("lineworker", $lineworker);
//var_dump($networks);exit;
}

3
application/Pipework/PipeworkController.php
View File

@@ -60,6 +60,9 @@ class PipeworkController extends mfBaseController {
$my_networks = NetworkModel::getAll();
}
$this->layout()->set("mynetworks", NetworkModel::getAll());
$pipeworkers = AddressModel::search(["addresstype" => ["pipeworker", "pipeplanner"]]);
$this->layout()->set("pipeworkers", $pipeworkers);
} else {
$use_filter_network = false;
$my_networks = $this->me->myNetworks(["netowner","pipeplanner","pipeworker","lineplanner","lineworker"]);