From ffd8c46bba1c80f8656a8bed32feecb90d12fd4f Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Tue, 10 Jun 2025 10:02:02 +0200 Subject: [PATCH] Added all Export Fields --- .../DashboardNew/DashboardNewController.php | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/application/DashboardNew/DashboardNewController.php b/application/DashboardNew/DashboardNewController.php index bc5a0f2a2..2ae28d0c6 100644 --- a/application/DashboardNew/DashboardNewController.php +++ b/application/DashboardNew/DashboardNewController.php @@ -372,8 +372,8 @@ class DashboardNewController extends mfBaseController { $order_max_homes = $this->getTotalHomes($campaign_ids, $gemeinde_ids); - $efh_connection_types = ["single-dwelling", "business"]; - $mph_connection_types = ["apartment-building", "apartment", "multi-dwelling"]; + $efh_connection_types = [0, 1]; // Single-dwelling and business + $mph_connection_types = [2]; // Apartment-building, apartment, multi-dwelling $countFunction = function($params, $statusFlag = null) use ($campaign_ids, $gemeinde_ids) { $baseParams = ["preordercampaign_id" => $campaign_ids, "gemeinde_id" => $gemeinde_ids]; @@ -387,6 +387,12 @@ class DashboardNewController extends mfBaseController { $ont_installiert_300 = $countFunction([">status_code" => "299", " "899"]); $provider_bestellt_500 = $countFunction([">status_code" => "499", " "899"]); + $baseFilter = [ + "netzgebiet_id" => $campaign->network->adb_netzgebiet_id, + ]; + $efh_rimo_types = ["residential", "company", "2/3 familienhaus", "public"]; + $mph_rimo_types = ["multiple dwellings"]; + $campaign_data = [ 'campaign_id' => $campaign->id, 'campaign_name' => $campaign->name ?? 'Unnamed Campaign', @@ -408,7 +414,45 @@ class DashboardNewController extends mfBaseController { 'ont_installiert_300' => $ont_installiert_300, 'vollanschluss_dokumentiert_350' => $countFunction(["status_code" => ["350","500"], "type" => "order"]), 'vorsorge_dokumentiert_351' => $countFunction(["status_code" => ["351","500"], "type" => "provision"]), - 'provider_bestellt_500' => $provider_bestellt_500 + 'provider_bestellt_500' => $provider_bestellt_500, + + //addrdb counts + + "all_sum" => ADBHausnummerModel::count(array_merge($baseFilter, []), false), + "all_sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, [])), + "all_op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned"]), false), + "all_op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned"])), + "all_op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed"]), false), + "all_op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed"])), + "all_op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected"]), false), + "all_op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected"])), + + "efh_sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => $efh_rimo_types]), false), + "efh_sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => $efh_rimo_types])), + "efh_op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $efh_rimo_types]), false), + "efh_op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $efh_rimo_types])), + "efh_op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $efh_rimo_types]), false), + "efh_op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $efh_rimo_types])), + "efh_op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $efh_rimo_types]), false), + "efh_op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $efh_rimo_types])), + + "mph_sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => $mph_rimo_types]), false), + "mph_sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => $mph_rimo_types])), + "mph_op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $mph_rimo_types]), false), + "mph_op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $mph_rimo_types])), + "mph_op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $mph_rimo_types]), false), + "mph_op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $mph_rimo_types])), + "mph_op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $mph_rimo_types]), false), + "mph_op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $mph_rimo_types])), + + "other_type_sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => "other"]), false), + "other_type_sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => "other"])), + "type_greenfield" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => "greenfield"]), false), + "type_greenfield_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => "greenfield"])), + "type_transformer_station" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => "transformer station"]), false), + "type_transformer_station_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => "transformer station"])), + "type_others" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => "other"]), false), + "type_others_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => "other"])), ]; $export_data[] = $campaign_data;