added deferred changes
This commit is contained in:
@@ -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),
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user