From 05a81aeec51c4b7f7756063fb08755f4fde33e37 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 16 Sep 2021 23:24:47 +0200
Subject: [PATCH] added status_id default filter in workflow

---
 Layout/default/Linework/Index.php           |  2 +-
 Layout/default/Pipework/Index.php           |  2 +-
 application/Linework/LineworkController.php | 12 +++++++-----
 application/Pipework/PipeworkController.php |  8 +++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 29d164cc3..0e2c9d20c 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -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>
diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index 9468fb7c4..91cc7d5c1 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -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>
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index e36b2b180..9a3c51917 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -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 = [];
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index bec4425e9..6aa00980c 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -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);