From 1221c356501d1c3fab1bc6aa551ae55f52ecda3b Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Wed, 30 Apr 2025 16:01:19 +0200
Subject: [PATCH] fixed ordering

---
 Layout/default/ConstructionConsent/Index.php         | 12 +++++++-----
 .../ConstructionConsent/ConstructionConsent.php      | 12 ++++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index ffc544640..a34142885 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -72,12 +72,12 @@ $pagination_entity_name = "Zustimmungserklärungen";
 
                         <div class="col-1">
                             <label class="form-label" for="filter_status_light">Ampelstatus</label>
-                            <select name="filter[status_light]" id="filter_status_light" class="form-control">
+                            <select name="filter[status_light][]" id="filter_status_light" class="form-control" multiple="multiple">
                                 <option value="">Alle</option>
-                                <option value="blue" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "blue") ? "selected='selected'" : ""?>>Blau</option>
-                                <option value="green" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "green") ? "selected='selected'" : ""?>>Grün</option>
-                                <option value="yellow" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "yellow") ? "selected='selected'" : ""?>>Gelb</option>
-                                <option value="red" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "red") ? "selected='selected'" : ""?>>Rot</option>
+                                <option value="blue" <?=(array_key_exists("status_light", $filter) && is_array($filter["status_light"]) && in_array("blue", $filter["status_light"])) ? "selected='selected'" : ""?>>Blau</option>
+                                <option value="green" <?=(array_key_exists("status_light", $filter) && is_array($filter["status_light"]) && in_array("green", $filter["status_light"])) ? "selected='selected'" : ""?>>Grün</option>
+                                <option value="yellow" <?=(array_key_exists("status_light", $filter) && is_array($filter["status_light"]) && in_array("yellow", $filter["status_light"])) ? "selected='selected'" : ""?>>Gelb</option>
+                                <option value="red" <?=(array_key_exists("status_light", $filter) && is_array($filter["status_light"]) && in_array("red", $filter["status_light"])) ? "selected='selected'" : ""?>>Rot</option>
                             </select>
                         </div>
 
@@ -454,6 +454,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
 </style>
 
 <script>
+    $("#filter_status_light").select2({closeOnSelect: false});
+
     document.addEventListener('DOMContentLoaded', () => {
         const csvFileInput = document.getElementById('csvFileInput');
         const apiUrl = '<?=self::getUrl("ConstructionConsent", "importConstructionConsentOwners", ["project_id" => (is_array($filter) && array_key_exists("project_id", $filter) ? $filter["project_id"] : "")])?>';
diff --git a/application/ConstructionConsent/ConstructionConsent.php b/application/ConstructionConsent/ConstructionConsent.php
index e80f6eccf..5a6638c73 100644
--- a/application/ConstructionConsent/ConstructionConsent.php
+++ b/application/ConstructionConsent/ConstructionConsent.php
@@ -379,10 +379,18 @@ class ConstructionConsent extends mfBaseModel {
             $order = "vh.strasse, CAST(vh.hausnummer AS UNSIGNED) ASC";
         }
         $having = '';
-        if(array_key_exists("status_light", $filter) && strlen(trim($filter['status_light'])) > 2) {
-            $having = " HAVING status_light = '".$filter['status_light']."'";
+        if(array_key_exists("status_light", $filter)) {
+            if (is_array($filter['status_light']) && count($filter['status_light']) > 0) {
+                $statusLights = array_map(function($item) {
+                    return "'" . addslashes(trim($item)) . "'";
+                }, $filter['status_light']);
+                $having = " HAVING status_light IN (" . implode(",", $statusLights) . ")";
+            } elseif (strlen(trim($filter['status_light'])) > 2) {
+                $having = " HAVING status_light = '" . addslashes(trim($filter['status_light'])) . "'";
+            }
         }
 
+
         $db = FronkDB::singleton();
 
         $where = self::getSqlFilter($filter);