From d54801fa36aefa9e93df0a21707bf6eaa1374ab2 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 2 Sep 2021 19:29:16 +0200
Subject: [PATCH] Added Bauabschnitt Filter

---
 Layout/default/Pipework/Index.php           | 16 ++++++++++++++++
 application/Building/BuildingModel.php      |  7 +++++++
 application/Pipework/PipeworkController.php |  8 ++++++++
 3 files changed, 31 insertions(+)

diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index 1c4cd0e19..7c75d4ade 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -37,6 +37,22 @@
                   </select>
                 </div>
                 
+                <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">
+                    <option></option>
+                    <?php foreach($mynetworks as $fnet): ?>
+                      <?php if(is_array($fnet->sections) && count($fnet->sections)): ?>
+                        <optgroup label="<?=$fnet->name?>">
+                        <?php foreach($fnet->sections as $section): ?>
+                          <option value="<?=$section->id?>" <?=($filter['networksection_id'] == $section->id) ? "selected='selected'" : ""?>><?=$section->name?></option>
+                        <?php endforeach; ?>
+                        </optgroup>
+                      <?php endif; ?>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                
                 <div class="col-2">
                   <label class="form-label" for="filter_status_id">Objektstatus</label>
                   <select name="filter[status_id]" id="filter_status_id" class="form-control">
diff --git a/application/Building/BuildingModel.php b/application/Building/BuildingModel.php
index 354b0075a..00a988dda 100644
--- a/application/Building/BuildingModel.php
+++ b/application/Building/BuildingModel.php
@@ -110,6 +110,13 @@ class BuildingModel {
       }
     }
     
+    if(array_key_exists("networksection_id", $filter)) {
+      $networksection_id = $filter['networksection_id'];
+      if(is_numeric($networksection_id)) {
+        $where .= " AND Building.networksection_id=$networksection_id";
+      }
+    }
+    
     if(array_key_exists("status_id", $filter)) {
       $status_id = $filter['status_id'];
       if(is_numeric($status_id)) {
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index b400f32bd..5ab9e97ee 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -106,12 +106,20 @@ class PipeworkController extends mfBaseController {
   
   private function getPreparedFilter($filter) {
     $new_filter = [];
+
+    if(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;
         continue;
       }*/
+      
       $new_filter[$name] = $value;
     }