diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php index 08082a108..e6bca5e2b 100644 --- a/Layout/default/ConstructionConsent/Index.php +++ b/Layout/default/ConstructionConsent/Index.php @@ -127,7 +127,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
-
+
'inspection_planner', 'header' => 'Begehung Planer durchgeführt', 'icon' => 'fas fa-clipboard-check', - 'denominator' => $stats['building'], + 'denominator' => $stats['building'] + $stats['street'], 'color' => '#28a745' ], [ @@ -198,6 +198,56 @@ $pagination_entity_name = "Zustimmungserklärungen";
+ + +
+
+
+
Anfrageresultat
+
+ + +
+
+ +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+
+
+
+
+ + + + + +
diff --git a/application/ConstructionConsent/ConstructionConsentController.php b/application/ConstructionConsent/ConstructionConsentController.php index a87557089..0c440caa4 100644 --- a/application/ConstructionConsent/ConstructionConsentController.php +++ b/application/ConstructionConsent/ConstructionConsentController.php @@ -940,12 +940,16 @@ class ConstructionConsentController extends mfBaseController { private function generateStats($baseFilter = array()) { $allCount = ConstructionConsent::count(array_merge(array(), $baseFilter)); - $streetCount = ConstructionConsent::count(array_merge(array("object_type" => "street"), $baseFilter)); - $buildingCount = ConstructionConsent::count(array_merge(array("object_type" => "building"), $baseFilter)); - $inspection_planner = ConstructionConsent::count(array_merge(array("inspection_planner" => "!NULL"), $baseFilter)); - $conduit_installed_building = ConstructionConsent::count(array_merge(array("conduit_installed_building" => "!NULL"), $baseFilter)); - $conduit_installed_ftu = ConstructionConsent::count(array_merge(array("conduit_installed_ftu" => "!NULL"), $baseFilter)); - $inhouse_cabling = ConstructionConsent::count(array_merge(array("inhouse_cabling" => "!NULL"), $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"))); return array( "all" => $allCount, @@ -954,7 +958,11 @@ class ConstructionConsentController extends mfBaseController { "inspection_planner" => $inspection_planner, "conduit_installed_building" => $conduit_installed_building, "conduit_installed_ftu" => $conduit_installed_ftu, - "inhouse_cabling" => $inhouse_cabling + "inhouse_cabling" => $inhouse_cabling, + "status_light_blue" => $status_light_blue, + "status_light_red" => $status_light_red, + "status_light_yellow" => $status_light_yellow, + "status_light_green" => $status_light_green ); } }