added pipeworker default filter in Pipework

This commit is contained in:
Frank Schubert
2021-09-02 21:29:46 +02:00
parent d10c3572cb
commit ed27e08f40
2 changed files with 19 additions and 3 deletions
+9 -1
View File
@@ -58,7 +58,15 @@
<select name="filter[status_id]" id="filter_status_id" class="form-control"> <select name="filter[status_id]" id="filter_status_id" class="form-control">
<option></option> <option></option>
<?php foreach(BuildingstatusModel::getAll() as $status): ?> <?php foreach(BuildingstatusModel::getAll() as $status): ?>
<option value="<?=$status->id?>" <?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>><?=$status->code?> - <?=__($status->name."-b")?></option> <option
value="<?=$status->id?>"
<?php if(is_array($filter)): ?>
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
<?php else: ?>
<?=(($me->is("pipeworker") && !$me->isAdmin()) && $status->id == 3) ? "selected='selected'" : ""?>
<?php endif; ?>
>
<?=$status->code?> - <?=__($status->name."-b")?></option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
+10 -2
View File
@@ -73,11 +73,17 @@ class PipeworkController extends mfBaseController {
//$building_search = array_merge($building_search, $filter); //$building_search = array_merge($building_search, $filter);
} }
if($this->me->is("pipeworker") && !$this->me->is("admin","pipeplanner","netowner")) {
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
$this->log->debug("is pipeworker"); $this->log->debug("is pipeworker");
$building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id; $building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$building_search["status_id"] = 30;
}
} }
//var_dump($building_search);exit;
foreach(BuildingModel::search($building_search) as $b) { foreach(BuildingModel::search($building_search) as $b) {
if(!array_key_exists($b->id, $networks[$network->name])) { if(!array_key_exists($b->id, $networks[$network->name])) {
@@ -211,6 +217,8 @@ class PipeworkController extends mfBaseController {
* Custom checks * Custom checks
*/ */
if($building->workflowitems['pipework_finished']->value->value_string) { if($building->workflowitems['pipework_finished']->value->value_string) {
// unset Tiefbau abgeschlossen if missing values // unset Tiefbau abgeschlossen if missing values
if( (!$building->workflowitems['anschlusspunkt_typ']->value->value_string && !$building->workflowitems['ist_anschlusspunkt_typ']->value->value_string) if( (!$building->workflowitems['anschlusspunkt_typ']->value->value_string && !$building->workflowitems['ist_anschlusspunkt_typ']->value->value_string)