diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php index 33932752e..c4585428b 100644 --- a/application/Admin/functions/RtrReporting.php +++ b/application/Admin/functions/RtrReporting.php @@ -279,6 +279,13 @@ class Admin_RtrReporting { $rasterpunkte[$raster][$prod_code]["user_count"] = $rtr100m->unit_count; } + $rasterpunkte["100mN26933E47445"] = [ + 14310 => [ + "bb" => 1000, + "unit_sum" => 26, + "user_count" => 26 + ], + ]; $csv_header = "rasterid;code;dl_min_max_bb;dl_q25_max_bb;dl_avg_max_bb;dl_max_max_bb;ul_min_max_bb;ul_q25_max_bb;ul_avg_max_bb;ul_max_max_bb;dl_min_n_bb;dl_q25_n_bb;dl_avg_n_bb;dl_avg_n_bb;ul_min_n_bb;ul_q25_n_bb;ul_avg_n_bb;ul_avg_n_bb;anz_anschl_cov"; $csv = $csv_header."\n"; @@ -558,9 +565,14 @@ class Admin_RtrReporting { } $prod_code_start = substr($prod_code, 0, 4); + $prod_code_a = $prod_code_start."0"; $prod_code_p = $prod_code_start."1"; $prod_code_b = $prod_code_start."2"; + if($prod_code_start == 2011) { + $prov_id = 1522; // A1 in case of Vull + } + if(!$prov_id || $prov_id == $this->systemowner_rtr_id) { if(substr($prod_code_start,0, 3) == "343" || $prod_code_start == "1432") { // is OAN product @@ -576,6 +588,12 @@ class Admin_RtrReporting { $data[$prov_id] = []; } + if($prov_id == $this->systemowner_rtr_id && $netowner_id == $this->systemowner_id && ($prod_code_start == 1042 || $prod_code_start == 1431)) { + if(!in_array($prod_code_a, $data[$prov_id])) { + $data[$prov_id][] = $prod_code_a; + } + } + if(!in_array($prod_code_p, $data[$prov_id])) { $data[$prov_id][] = $prod_code_p; } @@ -594,7 +612,7 @@ class Admin_RtrReporting { $csv .= "$prod_code;"; $csv .= "$prov_id;"; $csv .= "0;"; - $csv .= "0"; + $csv .= substr($prod_code, -1, 1); $csv .= "\n"; } }