From 2fcecb6df1b39ce4efd09a87bad582c716699fc6 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 7 Apr 2025 08:57:13 +0200
Subject: [PATCH] added filter electric_approval to ConstructionConsent

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

diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index 79d3285f3..28a769ae8 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -99,6 +99,18 @@ $pagination_entity_name = "Zustimmungserklärungen";
                             </select>
                         </div>
 
+                        <div class="col-2">
+                            <label class="form-label" for="filter_electric_approval">Elektriker freigegeben</label>
+                            <select name="filter[electric_approval]" id="filter_electric_approval" class="form-control">
+                                <option value="">Alle</option>
+                                <option value="!NULL" <?=(array_key_exists("electric_approval", $filter) && $filter["electric_approval"] == "!NULL") ? "selected='selected'" : ""?>>Ja</option>
+                                <option value="NULL" <?=(array_key_exists("electric_approval", $filter) && $filter["electric_approval"] == "NULL") ? "selected='selected'" : ""?>>Nein</option>
+                            </select>
+                        </div>
+
+                    </div>
+                    <div class="row mt-2">
+
                         <div class="col-2">
                             <label class="form-label" for="filter_conduit_installed_ftu">Leerrohr bis HAK</label>
                             <select name="filter[conduit_installed_ftu]" id="filter_conduit_installed_ftu" class="form-control">
@@ -108,10 +120,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
                             </select>
                         </div>
 
-                    </div>
-                    <div class="row mt-2">
-
-                        <div class="col-2">
+                        <div class="col-1">
                             <label class="form-label" for="filter_inhouse_cabling">Inhouse erledigt</label>
                             <select name="filter[inhouse_cabling]" id="filter_inhouse_cabling" class="form-control">
                                 <option value="">Alle</option>
diff --git a/application/ConstructionConsent/ConstructionConsent.php b/application/ConstructionConsent/ConstructionConsent.php
index 29af55cc3..194b49128 100644
--- a/application/ConstructionConsent/ConstructionConsent.php
+++ b/application/ConstructionConsent/ConstructionConsent.php
@@ -607,6 +607,15 @@ FROM ConstructionConsent
             }
         }
 
+        if(array_key_exists("electric_approval", $filter)) {
+            $inhouse_cabling = $filter["electric_approval"];
+            if($inhouse_cabling == "!NULL") {
+                $where .= " AND (inspection_electrician IS NOT NULL AND inspection_electrician != 0)";
+            } elseif($inhouse_cabling == "NULL") {
+                $where .= " AND (inspection_electrician IS NULL OR inspection_electrician = 0)";
+            }
+        }
+
         if (array_key_exists("cwo", $filter) && !empty($filter['cwo'])) {
             $where .= "
                 AND EXISTS (