Added assigned_to filter to Linework

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;