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

Merge branch 'DashboardNew/adb-update' into 'master'

Browse Source 
added new pop columns

See merge request fronk/thetool!1327
This commit is contained in:
Luca Haid
2025-05-13 16:28:50 +00:00
parent b78425e515 15a2d11f2d
commit 3e34eb5baf
3 changed files with 71 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
application/DashboardNew/DashboardNewController.php
View File

@@ -494,40 +494,51 @@ class DashboardNewController extends mfBaseController {
if (!empty($str = $this->request->netzgebiet_id)) $baseFilter["netzgebiet_id"] = $this->request->netzgebiet_id;
$sum_counts = [
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0]), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Planned"]), false),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Passed"]), false),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Connected"]), false),
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, []), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, [])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned"]), false),
"op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned"])),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed"]), false),
"op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed"])),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected"]), false),
"op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected"])),
];
$efh_rimo_types = ["residential", "company", "2/3 familienhaus", "public"];
$efh_counts = [
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => $efh_rimo_types]), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => $efh_rimo_types])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Planned", "rimo_type" => $efh_rimo_types]), false),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Passed", "rimo_type" => $efh_rimo_types]), false),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Connected", "rimo_type" => $efh_rimo_types]), false),
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => $efh_rimo_types]), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => $efh_rimo_types])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $efh_rimo_types]), false),
"op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $efh_rimo_types])),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $efh_rimo_types]), false),
"op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $efh_rimo_types])),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $efh_rimo_types]), false),
"op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $efh_rimo_types])),
];
$mph_rimo_types = ["multiple dwellings"];
$mph_counts = [
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => $mph_rimo_types]), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => $mph_rimo_types])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Planned", "rimo_type" => $mph_rimo_types]), false),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Passed", "rimo_type" => $mph_rimo_types]), false),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_op_state" => "Connected", "rimo_type" => $mph_rimo_types]), false),
"sum" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_type" => $mph_rimo_types]), false),
"sum_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_type" => $mph_rimo_types])),
"op_state_planned" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $mph_rimo_types]), false),
"op_state_planned_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Planned", "rimo_type" => $mph_rimo_types])),
"op_state_passed" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $mph_rimo_types]), false),
"op_state_passed_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Passed", "rimo_type" => $mph_rimo_types])),
"op_state_connected" => ADBHausnummerModel::count(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $mph_rimo_types]), false),
"op_state_connected_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["rimo_op_state" => "Connected", "rimo_type" => $mph_rimo_types])),
];
$other_types = [
"type_greenfield" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "greenfield"]), false),
"type_greenfield_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "greenfield"])),
"type_transformer_station" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "transformer station"]), false),
"type_transformer_station_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "transformer station"])),
"type_others" => ADBHausnummerModel::count(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "other"]), false),
"type_others_homes" => ADBHausnummerModel::countHomes(array_merge($baseFilter, ["is_deleted" => 0, "rimo_type" => "other"])),
"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"])),
];
self::returnJson([