From 3235d03deda1f4d1457f3685581d4d10fd13c8a3 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Fri, 31 Jan 2025 09:37:14 +0100
Subject: [PATCH] Added adb_netzgebiet_id Filter for ConstructionConsent

---
 Layout/default/ConstructionConsent/Index.php  | 22 +++++++++++++++----
 .../ConstructionConsent.php                   |  9 ++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index 437ce156e..80e86754e 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -33,10 +33,10 @@ $pagination_entity_name = "Zustimmungserklärungen";
                 <form method="get" action="<?=self::getUrl("ConstructionConsent")?>">
                     <div class="row">
 
-                        <div class="col-2">
+                        <div class="col-3">
                             <label class="form-label" for="filter_project_id">Projekt</label>
                             <select name="filter[project_id]" id="filter_project_id" class="form-control">
-                                <option></option>
+                                <option value="">Alle</option>
                                 <?php foreach(ConstructionConsentProject::getAll() as $p): ?>
                                     <option value="<?=$p->id?>" <?=(is_array($filter) && array_key_exists("project_id", $filter) && $p->id == $filter["project_id"]) ? "selected='selected'" : ""?>><?=$p->name?></option>
                                 <?php endforeach; ?>
@@ -46,13 +46,27 @@ $pagination_entity_name = "Zustimmungserklärungen";
                         <div class="col-2">
                             <label class="form-label" for="filter_object_type">Objektart</label>
                             <select name="filter[object_type]" id="filter_object_type" class="form-control">
-                                <option></option>
+                                <option value="">Alle</option>
                                 <option value="building" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "building") ? "selected='selected'" : ""?>>Gebäude</option>
                                 <option value="street" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "street") ? "selected='selected'" : ""?>>Straße</option>
                             </select>
                         </div>
 
-                        <div class="col-1">
+                        <div class="col-2">
+                            <label class="form-label" for="filter_network">Netzgebiet</label>
+                            <select name="filter[network]" id="filter_network" class="form-control">
+                                <option value="">Alle</option>
+                                <?php
+                                $networks = array_key_exists("project_id", $filter) && $filter["project_id"] ? ConstructionConsentNetwork::search(["constructionconsentproject_id" => $filter["project_id"]]) : ConstructionConsentNetwork::getAll();
+                                foreach($networks as $network): ?>
+                                    <option value="<?=$network->adb_netzgebiet_id?>" <?=(is_array($filter) && array_key_exists("network", $filter) && $network->adb_netzgebiet_id == $filter["network"]) ? "selected='selected'" : ""?>><?=$network->adb_netzgebiet->name?></option>
+                                <?php endforeach;
+                                ?>
+
+                            </select>
+                        </div>
+
+                        <div class="col-2">
                             <label class="form-label" for="filter_address">Objektadresse</label>
                             <input type="text" class="form-control" name="filter[address]" id="filter_address" value="<?=(array_key_exists('address', $filter)) ? $filter['address'] : ""?>" />
                         </div>
diff --git a/application/ConstructionConsent/ConstructionConsent.php b/application/ConstructionConsent/ConstructionConsent.php
index 13678782f..ec54bedb7 100644
--- a/application/ConstructionConsent/ConstructionConsent.php
+++ b/application/ConstructionConsent/ConstructionConsent.php
@@ -353,6 +353,7 @@ class ConstructionConsent extends mfBaseModel {
 
         $where = self::getSqlFilter($filter);
         $sql = "SELECT COUNT(*) as cnt FROM ConstructionConsent
+                LEFT JOIN ".ADDRESSDB_DBNAME.".view_hausnummer ON (ConstructionConsent.adb_hausnummer_id = view_hausnummer.hausnummer_id)
                 WHERE $where";
 
         //mfLoghandler::singleton()->debug($sql);
@@ -377,6 +378,7 @@ class ConstructionConsent extends mfBaseModel {
 
         $where = self::getSqlFilter($filter);
         $sql = "SELECT * FROM ConstructionConsent
+                LEFT JOIN ".ADDRESSDB_DBNAME.".view_hausnummer ON (ConstructionConsent.adb_hausnummer_id = view_hausnummer.hausnummer_id)         
                 WHERE $where
                 ORDER BY $order";
 
@@ -494,6 +496,13 @@ class ConstructionConsent extends mfBaseModel {
             }
         }
 
+        if(array_key_exists("network", $filter)) {
+            $network = FronkDB::singleton()->escape($filter["network"]);
+            if($network) {
+                $where .= " AND view_hausnummer.netzgebiet_id=$network";
+            }
+        }
+
 
 
         if(array_key_exists("add-where", $filter)) {