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

Const consent add filter

Browse Source
This commit is contained in:
Luca Haid
2025-02-25 18:33:04 +00:00
parent ba00e47d88
commit d1d446f905
3 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/ConstructionConsent/ConstructionConsent.php
View File

@@ -548,7 +548,7 @@ 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";
$where .= " AND vh.netzgebiet_id=$network";
}
}

30
application/ConstructionConsent/ConstructionConsentController.php
View File

@@ -939,17 +939,25 @@ class ConstructionConsentController extends mfBaseController {
}
private function generateStats($baseFilter = array()) {
$allCount = ConstructionConsent::count(array_merge(array(), $baseFilter));
$streetCount = ConstructionConsent::count(array_merge($baseFilter, array("object_type" => "street")));
$buildingCount = ConstructionConsent::count(array_merge($baseFilter, array("object_type" => "building")));
$inspection_planner = ConstructionConsent::count(array_merge($baseFilter, array("inspection_planner" => "!NULL")));
$conduit_installed_building = ConstructionConsent::count(array_merge($baseFilter, array("conduit_installed_building" => "!NULL")));
$conduit_installed_ftu = ConstructionConsent::count(array_merge($baseFilter, array("conduit_installed_ftu" => "!NULL")));
$inhouse_cabling = ConstructionConsent::count(array_merge($baseFilter, array("inhouse_cabling" => "!NULL")));
$status_light_blue = ConstructionConsent::count(array_merge($baseFilter, array("status_light" => "blue")));
$status_light_red = ConstructionConsent::count(array_merge($baseFilter, array("status_light" => "red")));
$status_light_yellow = ConstructionConsent::count(array_merge($baseFilter, array("status_light" => "yellow")));
$status_light_green = ConstructionConsent::count(array_merge($baseFilter, array("status_light" => "green")));
function getFilteredCount($wantedFilter, $filterValue, $baseFilter) {
if (!empty($baseFilter[$wantedFilter]) && $baseFilter[$wantedFilter] != $filterValue) {
return 0;
} else {
return ConstructionConsent::count(array_merge($baseFilter, [$wantedFilter => $filterValue]));
}
}
$allCount = ConstructionConsent::count($baseFilter);
$streetCount = getFilteredCount("object_type", "street", $baseFilter);
$buildingCount = getFilteredCount("object_type", "building", $baseFilter);
$inspection_planner = getFilteredCount("inspection_planner", "!NULL", $baseFilter);
$conduit_installed_building = getFilteredCount("conduit_installed_building", "!NULL", $baseFilter);
$conduit_installed_ftu = getFilteredCount("conduit_installed_ftu", "!NULL", $baseFilter);
$inhouse_cabling = getFilteredCount("inhouse_cabling", "!NULL", $baseFilter);
$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);
return array(
"all" => $allCount,