Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'ConstructionConsent/add-deferred-stats' into 'master'

Browse Source 
added deferred changes

See merge request fronk/thetool!1874
This commit is contained in:
Luca Haid
2025-11-09 19:31:53 +00:00
parent c5a2f1a2bb a0d259081e
commit 4e3bb81f84
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Layout/default/ConstructionConsent/Index.php
View File

@@ -304,14 +304,6 @@ $pagination_entity_name = "Zustimmungserklärungen";
</div>
</div>
<?php } ?>
<!-- i have added this to stats and need to show a "traffic light kinda thing round etc" with a grid 2 row 2 col
"status_light_blue" => $status_light_blue,
"status_light_red" => $status_light_red,
"status_light_yellow" => $status_light_yellow,
"status_light_green" => $status_light_green
-->
<div class="card">
<div class="card-body p-0">
<div class="p-2" style="background-color: #f8f9fa">
@@ -344,6 +336,12 @@ $pagination_entity_name = "Zustimmungserklärungen";
<div style="width: 100%; height: 100%; background-color: #5cb85c; border-radius: 50%;"></div>
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_light_green']; ?></span>
</div>
<!-- Gray -->
<div style="position: relative; width: 60px; height: 60px;">
<div style="width: 100%; height: 100%; background-color: #6c757d; border-radius: 50%;"></div>
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_deferred']; ?></span>
</div>
</div>
</div>
</div>

7
application/ConstructionConsent/ConstructionConsentController.php
View File

@@ -1043,10 +1043,12 @@ class ConstructionConsentController extends mfBaseController {
private function generateStats($baseFilter = array()): array {
function getFilteredCount($wantedFilter, $filterValue, $baseFilter) {
if (!empty($baseFilter[$wantedFilter]) && $baseFilter[$wantedFilter] != $filterValue) return 0;
if ($wantedFilter !== 'deferred' && !empty($baseFilter[$wantedFilter]) && $baseFilter[$wantedFilter] != $filterValue) return 0;
return ConstructionConsent::count(array_merge($baseFilter, [$wantedFilter => $filterValue]));
}
$baseFilter["deferred"] = "NULL";
return [
"all" => ConstructionConsent::count($baseFilter),
"street" => getFilteredCount("object_type", "street", $baseFilter),
@@ -1058,7 +1060,8 @@ class ConstructionConsentController extends mfBaseController {
"status_light_blue" => getFilteredCount("status_light", "blue", $baseFilter),
"status_light_red" => getFilteredCount("status_light", "red", $baseFilter),
"status_light_yellow" => getFilteredCount("status_light", "yellow", $baseFilter),
"status_light_green" => getFilteredCount("status_light", "green", $baseFilter)
"status_light_green" => getFilteredCount("status_light", "green", $baseFilter),
"status_deferred" => getFilteredCount("deferred", "!NULL", $baseFilter),
];
}