From 68ef494c9d5af89b1942abfb41537569382d2f0c Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 15 Apr 2025 21:40:33 +0200
Subject: [PATCH 1/2] Added assigned_to filter to Linework

---
 Layout/default/Linework/Index.php            | 13 ++++++++++
 application/Linework/LineworkController.php  | 27 +++++++++++++-------
 application/Termination/TerminationModel.php |  2 +-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 88649697b..dffccbf0b 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -41,6 +41,7 @@
             <h4 class="header-title mb-3">Filter</h4>
 
             <form method="get" id="filterform" action="<?=self::getUrl("Linework")?>">
+
               <div class="row">
                 <div class="col-1">
                   <label class="form-label" for="filter_network_id">Netzgebiet</label>
@@ -52,6 +53,18 @@
                   </select>
                 </div>
 
+                <?php if($this->me->is("Admin")): ?>
+                <div class="col-1">
+                  <label class="form-label" for="filter_lineworker_id">Zugeteilt an</label>
+                  <select name="filter[lineworker_id]" id="filter_lineworker_id" class="form-control">
+                    <option></option>
+                    <?php foreach($lineworker as $address): ?>
+                        <option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("lineworker_id", $filter) && $filter['lineworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                <?php endif; ?>
+
                 <div class="col-1">
                   <label class="form-label" for="filter_networksection_id">Bauabschnitt</label>
                   <select name="filter[networksection_id]" id="filter_networksection_id" class="form-control">
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index b03e5e236..6ddc4e388 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -61,10 +61,12 @@ class LineworkController extends mfBaseController {
         $my_networks = NetworkModel::getAll();
       }
       $this->layout()->set("mynetworks", NetworkModel::getAll());
+
+      $lineworker = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
     } else {
       $use_filter_network = false;
       $my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
-      
+
       foreach($my_networks as $mn) {
         if($mn->id == $filter['network_id']) {
           $use_filter_network = true;
@@ -78,10 +80,10 @@ class LineworkController extends mfBaseController {
         $my_networks = [];
         $my_networks[] = new Network($filter['network_id']);
       }
-      
+
     }
     unset($filter['network_id']);
-    
+      //var_dump($filter);exit;
     // get Buildings in networks
     $my_network_ids = [];
     $terminations = [];
@@ -108,12 +110,15 @@ class LineworkController extends mfBaseController {
       $termination_search["status_id"] = 3;
     }
     
-    if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner","lineplanner","netowner"]) && $termination_search["status_id"] == 3) {
+    if(!$this->me->is("Admin") && $this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner","lineplanner","netowner"]) && $termination_search["status_id"] == 3) {
       $this->log->debug("is lineworker");
       $termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
       //var_dump($filter);exit;
     }
-    
+    /*if($this->me->is("Admin") && $filter['lineworker_id']) {
+        $termination_search["lineworker_id"] = $filter['lineworker_id'];
+    }*/
+      //var_dump($filter);exit;
     $networks = [];
     $pagination['maxItems'] = TerminationModel::count($termination_search);
     foreach(TerminationModel::search($termination_search, $pagination) as $term) {
@@ -125,9 +130,10 @@ class LineworkController extends mfBaseController {
       }
     }
     
-    if(is_array($networks) && count($networks)) {
+    /*if(is_array($networks) && count($networks)) {
       $term = reset(reset($networks));
-    }
+      var_dump($term);exit;
+    }*/
     $item_colspan = 0;
     $i = 0;
     
@@ -150,6 +156,9 @@ class LineworkController extends mfBaseController {
     $this->layout()->set("wfColspan", $item_colspan);
     $this->layout()->set("networks", $networks);
     $this->layout()->set("pagination", $pagination);
+
+
+    $this->layout()->set("lineworker", $lineworker);
     //var_dump($networks);exit;
 
   }
@@ -157,13 +166,13 @@ class LineworkController extends mfBaseController {
   private function getPreparedFilter($filter) {
     $new_filter = [];
 
-    if(is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
+    if(array_key_exists("networksection_id", $filter) && is_numeric($filter['networksection_id']) && $filter['networksection_id']) {
       $section = new Networksection($filter['networksection_id']);
       if($section->id) {
         $filter['network_id'] = $section->network_id;
       }
     }
-    
+
     foreach($filter as $name => $value) {
       /*if($name == 'network_id') {
         $new_filter['id'] = $value;
diff --git a/application/Termination/TerminationModel.php b/application/Termination/TerminationModel.php
index f69d68b43..c3720d3ab 100644
--- a/application/Termination/TerminationModel.php
+++ b/application/Termination/TerminationModel.php
@@ -110,7 +110,7 @@ class TerminationModel {
     if(is_array($limit) && count($limit)) {
       if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
         $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
-      } elseif(is_numeric($count)) {
+      } elseif(is_numeric($limit['count'])) {
         $sql .= " LIMIT ".$limit['count'];
       }
     }

From 81b8c307c097ac51582f3c4f86d7112c6a3ca6f3 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 17 Apr 2025 14:38:25 +0200
Subject: [PATCH 2/2] Added assigned_to filter to Pipework

---
 Layout/default/Linework/Index.php           | 24 ++++++++++-----------
 Layout/default/Pipework/Index.php           | 12 +++++++++++
 application/Linework/LineworkController.php |  5 +++--
 application/Pipework/PipeworkController.php |  3 +++
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index dffccbf0b..66a84b843 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -53,18 +53,6 @@
                   </select>
                 </div>
 
-                <?php if($this->me->is("Admin")): ?>
-                <div class="col-1">
-                  <label class="form-label" for="filter_lineworker_id">Zugeteilt an</label>
-                  <select name="filter[lineworker_id]" id="filter_lineworker_id" class="form-control">
-                    <option></option>
-                    <?php foreach($lineworker as $address): ?>
-                        <option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("lineworker_id", $filter) && $filter['lineworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
-                    <?php endforeach; ?>
-                  </select>
-                </div>
-                <?php endif; ?>
-
                 <div class="col-1">
                   <label class="form-label" for="filter_networksection_id">Bauabschnitt</label>
                   <select name="filter[networksection_id]" id="filter_networksection_id" class="form-control">
@@ -81,6 +69,18 @@
                   </select>
                 </div>
 
+                  <?php if($me->is("Admin")): ?>
+                      <div class="col-1">
+                          <label class="form-label" for="filter_lineworker_id">Zugeteilt an</label>
+                          <select name="filter[lineworker_id]" id="filter_lineworker_id" class="form-control">
+                              <option></option>
+                              <?php foreach($lineworkers as $address): ?>
+                                  <option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("lineworker_id", $filter) && $filter['lineworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
+                              <?php endforeach; ?>
+                          </select>
+                      </div>
+                  <?php endif; ?>
+
                 <div class="col-2">
                   <label class="form-label" for="filter_status_id">Anschlussstatus</label>
                   <select name="filter[status_id]" id="filter_status_id" class="form-control">
diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index 6b2371275..3beddf78f 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -63,6 +63,18 @@
                     <?php endforeach; ?>
                   </select>
                 </div>
+
+                  <?php if($me->is("Admin")): ?>
+                      <div class="col-1">
+                          <label class="form-label" for="filter_pipeworker_id">Zugeteilt an</label>
+                          <select name="filter[pipeworker_id]" id="filter_pipeworker_id" class="form-control">
+                              <option></option>
+                              <?php foreach($pipeworkers as $address): ?>
+                                  <option value="<?=$address->id?>" <?=(is_array($filter) && array_key_exists("pipeworker_id", $filter) && $filter['pipeworker_id'] == $address->id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?></option>
+                              <?php endforeach; ?>
+                          </select>
+                      </div>
+                  <?php endif; ?>
                 
                 <div class="col-2">
                   <label class="form-label" for="filter_status_id">Objektstatus</label>
diff --git a/application/Linework/LineworkController.php b/application/Linework/LineworkController.php
index 6ddc4e388..98604a682 100644
--- a/application/Linework/LineworkController.php
+++ b/application/Linework/LineworkController.php
@@ -62,7 +62,8 @@ class LineworkController extends mfBaseController {
       }
       $this->layout()->set("mynetworks", NetworkModel::getAll());
 
-      $lineworker = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
+      $lineworkers = AddressModel::search(["addresstype" => ["lineworker", "lineplanner"]]);
+      $this->layout()->set("lineworkers", $lineworkers);
     } else {
       $use_filter_network = false;
       $my_networks = $this->me->myNetworks(["netowner","lineplanner","lineworker"]);
@@ -158,7 +159,7 @@ class LineworkController extends mfBaseController {
     $this->layout()->set("pagination", $pagination);
 
 
-    $this->layout()->set("lineworker", $lineworker);
+
     //var_dump($networks);exit;
 
   }
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 7d0d922a9..fa9cf4f85 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -60,6 +60,9 @@ class PipeworkController extends mfBaseController {
         $my_networks = NetworkModel::getAll();
       }
       $this->layout()->set("mynetworks", NetworkModel::getAll());
+
+      $pipeworkers = AddressModel::search(["addresstype" => ["pipeworker", "pipeplanner"]]);
+      $this->layout()->set("pipeworkers", $pipeworkers);
     } else {
       $use_filter_network = false;
       $my_networks = $this->me->myNetworks(["netowner","pipeplanner","pipeworker","lineplanner","lineworker"]);