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

added pipeworker default filter in Pipework

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
application/Pipework/PipeworkController.php
View File

@@ -73,11 +73,17 @@ class PipeworkController extends mfBaseController {
//$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");
$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) {
if(!array_key_exists($b->id, $networks[$network->name])) {
@@ -211,6 +217,8 @@ class PipeworkController extends mfBaseController {
* Custom checks
*/
if($building->workflowitems['pipework_finished']->value->value_string) {
// unset Tiefbau abgeschlossen if missing values
if( (!$building->workflowitems['anschlusspunkt_typ']->value->value_string && !$building->workflowitems['ist_anschlusspunkt_typ']->value->value_string)