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

added status_id default filter in workflow

Browse Source
This commit is contained in:
Frank Schubert
2021-09-16 23:24:47 +02:00
parent ac77a1a1ae
commit 05a81aeec5
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@
<?php if(is_array($filter)): ?>
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
<?php else: ?>
<?=(($me->is("lineworker") && !$me->isAdmin()) && $status->id == 3) ? "selected='selected'" : ""?>
<?=(!array_key_exists("status_id", $filter) && $status->id == 3) ? "selected='selected'" : ""?>
<?php endif; ?>
>
<?=$status->code?> - <?=__($status->name."-t")?></option>

2
Layout/default/Pipework/Index.php
View File

@@ -63,7 +63,7 @@
<?php if(is_array($filter)): ?>
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
<?php else: ?>
<?=(($me->is("pipeworker") && !$me->isAdmin()) && $status->id == 3) ? "selected='selected'" : ""?>
<?=(!array_key_exists("status_id", $filter) && $status->id == 3) ? "selected='selected'" : ""?>
<?php endif; ?>
>
<?=$status->code?> - <?=__($status->name."-b")?></option>

12
application/Linework/LineworkController.php
View File

@@ -82,14 +82,16 @@ class LineworkController extends mfBaseController {
}
}
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner", "lineplanner","netowner"])) {
$this->log->debug("is lineworker");
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
if(!count($filter)) {
$termination_search["status_id"] = 3;
}
//var_dump($filter);exit;
}
if(!array_key_exists("status_id", $filter)) {
$termination_search["status_id"] = 3;
}
$networks = [];

8
application/Pipework/PipeworkController.php
View File

@@ -84,15 +84,13 @@ class PipeworkController extends mfBaseController {
}
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
$this->log->debug("is pipeworker");
$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"] = 3;
}
if(!array_key_exists("status_id", $filter)) {
$building_search["status_id"] = 3;
}
$pagination['maxItems'] = BuildingModel::count($building_search);