From ed27e08f40320b58fcc73e11e74e8c20410e9d8e Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 2 Sep 2021 21:29:46 +0200
Subject: [PATCH] added pipeworker default filter in Pipework

---
 Layout/default/Pipework/Index.php           | 10 +++++++++-
 application/Pipework/PipeworkController.php | 12 ++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index 590cda361..40188778c 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -58,7 +58,15 @@
                   <select name="filter[status_id]" id="filter_status_id" class="form-control">
                     <option></option>
                     <?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; ?>
                   </select>
                 </div>
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 687ed346c..a94338a64 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -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)