diff --git a/Layout/default/Admin/Index.php b/Layout/default/Admin/Index.php
index 829079d3b..b152ce579 100644
--- a/Layout/default/Admin/Index.php
+++ b/Layout/default/Admin/Index.php
@@ -24,6 +24,9 @@
+
diff --git a/Layout/default/Admin/RtrReporting/Index.php b/Layout/default/Admin/RtrReporting/Index.php
new file mode 100644
index 000000000..37373f717
--- /dev/null
+++ b/Layout/default/Admin/RtrReporting/Index.php
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
RTR Reporting CSVs herunterladen
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/Address/Address.php b/application/Address/Address.php
index 8917b347d..1d4e297bf 100644
--- a/application/Address/Address.php
+++ b/application/Address/Address.php
@@ -27,11 +27,54 @@ class Address extends mfBaseModel {
$this->generateFibuAccountNumber();
$this->syncToFibuMerge();
+ $this->getCoords();
$this->in_after_save--;
}
-
+
+ public function getCoords() {
+ $update_needed = false;
+ if($this->id) {
+ $changes = $this->getChangedFields();
+ foreach($changes as $key => $change) {
+ if($key == "street" || $key == "zip" || $key == "city") {
+ $update_needed = true;
+ }
+ }
+ } else {
+ $update_needed = true;
+ }
+
+
+
+ if(!$this->gps_lat || !$this->gps_long || !$this->laea) {
+ $update_needed = true;
+ }
+
+ if(!$update_needed) return true;
+
+
+ $gps_search = [
+ 'country' => $this->getProperty("country")->isocode,
+ 'city' => $this->city,
+ 'zip' => $this->zip,
+ 'street' => $this->street
+ ];
+
+ $gps = Gmaps_Geocoding::getCoords($gps_search);
+ if(!is_array($gps) || !count($gps) == 2) return false;
+
+ $this->gps_lat = $gps[0];
+ $this->gps_long = $gps[1];
+
+ $this->laea = (new Building())->getLaeaCoordinates($this->gps_lat, $this->gps_long);
+ $this->save();
+
+
+ return true;
+ }
+
public function generateFibuAccountNumber() {
if($this->fibu_account_number) {
return true;
diff --git a/application/Admin/AdminController.php b/application/Admin/AdminController.php
index 2bd1176a6..0a447f54b 100644
--- a/application/Admin/AdminController.php
+++ b/application/Admin/AdminController.php
@@ -47,6 +47,37 @@ class AdminController extends mfBaseController {
$this->layout()->set("xinon_active_customers_total", $xinon_active_customers_total);
+ }
+
+ protected function rtrReporting() {
+ require_once(realpath(dirname(__FILE__)."/functions")."/RtrReporting.php");
+
+ $this->layout()->setTemplate("Admin/RtrReporting/Index");
+
+ $rtrreporting = new Admin_RtrReporting($this->request);
+ $response = $rtrreporting->runRequest();
+
+ foreach(["info", "success", "warning", "error"] as $level) {
+ if(array_key_exists($level, $response) && $response[$level]) {
+ $this->layout()->setFlash($response[$level], $level);
+ }
+ }
+
+ if($response["redirect"]) {
+ $this->redirect($response["redirect"]);
+ }
+
+ if($response["template"]) {
+ $this->layout()->setTemplate($response["template"]);
+ }
+
+ if(is_array($response["templateVars"]) && count($response["templateVars"])) {
+ foreach($response["templateVars"] as $key => $value) {
+ $this->layout()->set($key, $value);
+ }
+ }
+
+
}
protected function createNetworkAddressForNetowner() {
diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php
new file mode 100644
index 000000000..4d3f266e8
--- /dev/null
+++ b/application/Admin/functions/RtrReporting.php
@@ -0,0 +1,143 @@
+request = $request;
+ $this->db = FronkDB::singleton();
+ $this->log = mfLoghandler::singleton();
+
+ }
+
+ public function runRequest() {
+ $action = $this->request->do;
+ if(!$action) {
+ return $this->indexAction();
+ } else {
+ $method = $action."Action";
+ if(method_exists($this, $method)) {
+ return $this->$method();
+ } else {
+ throw new Exception("Method not found", "404");
+ }
+ }
+ }
+
+ public function indexAction() {
+
+ return [
+ "template" => "Admin/RtrReporting/Index",
+ "redirect" => "",
+ "templateVars" => []
+ ];
+ }
+
+ public function a10reportAction() {
+ // alle anschlĂĽsse
+
+ $rasterpunkte = [];
+ foreach(BuildingModel::getAll() as $building) {
+ $raster = $building->laea;
+
+ $prod_code = 14310;
+ $bb = "1000,00"; // glas = 1000, funk = 50
+ $user_count = TerminationModel::count(["building_id" => $building->id]);
+
+
+ if(!array_key_exists($raster, $rasterpunkte)) {
+ $rasterpunkte[$raster] = [];
+ }
+ if(!array_key_exists($prod_code, $rasterpunkte[$raster])) {
+ $rasterpunkte[$raster][$prod_code] = [
+ "bb" => $bb,
+ "user_count" => 0
+ ];
+ }
+ $rasterpunkte[$raster][$prod_code]["user_count"] += $user_count;
+ }
+
+ $building = new Building();
+ $eigen_product_ids = $this->getEigenProductIds();
+ foreach(ContractModel::search(["product_id" => $eigen_product_ids]) as $contract) {
+ if($contract->termination_id) continue;
+
+ $address = $contract->owner;
+ if(!$address->gps_lat || !$address->gps_long || !$address->laea) {
+ //$address->getCoords();
+ $address->save();
+ }
+
+ $raster = $address->laea;
+ $rtr_code = $contract->product->attributes["rtr_tech_code"]->value;
+ if(substr($rtr_code, 0, 4) == 1431) {
+ $prod_code = 14310;
+ $bb = "1000,00";
+ } elseif(substr($rtr_code, 0, 4) == 1042) {
+ $prod_code = 10420;
+ $bb = "50,00";
+ } else {
+ continue; // incompatible product
+ }
+ $user_count = 1;
+ // get laea
+
+ if(!array_key_exists($raster, $rasterpunkte)) {
+ $rasterpunkte[$raster] = [];
+ }
+ if(!array_key_exists($prod_code, $rasterpunkte[$raster])) {
+ $rasterpunkte[$raster][$prod_code] = [
+ "bb" => $bb,
+ "user_count" => 0
+ ];
+ }
+ $rasterpunkte[$raster][$prod_code]["user_count"] += $user_count;
+
+ }
+
+ $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";
+ foreach($rasterpunkte as $rastercode => $raster) {
+ foreach($raster as $prod_code => $data) {
+ $csv .= $rastercode . ";";
+ $csv .= $prod_code . ";";
+ for($i = 0; $i < 16; $i++) {
+ $csv .= $data["bb"] . ";";
+ }
+ $csv .= $data["user_count"];
+ $csv .= "\n";
+ }
+ }
+
+ header("Content-type: text/csv; charset=utf-8");
+ header('Content-disposition: attachment; filename="rtr-A10-report-'.date('Y-m-d_H-i-s').'.csv"');
+
+ echo $csv;
+ exit;
+ }
+
+ /*
+ * 1042% = radio
+ * 1431% = fiber
+ */
+ private function getEigenProductIds() {
+ $product_ids = [];
+
+ $sql = "SELECT product_id FROM `ProductAttribute`
+ LEFT JOIN ProducttechAttribute ON (ProductAttribute.producttechattribute_id = ProducttechAttribute.id)
+ WHERE ProducttechAttribute.name='rtr_tech_code'
+ AND (ProductAttribute.value LIKE '1042%' OR ProductAttribute.value LIKE '1431%')";
+
+ $res = $this->db->query($sql);
+ while($data = $this->db->fetch_object($res)) {
+ $product_ids[] = $data->product_id;
+ }
+
+ return $product_ids;
+
+ }
+
+}
\ No newline at end of file
diff --git a/application/Building/Building.php b/application/Building/Building.php
index 3c02a4039..da878135a 100644
--- a/application/Building/Building.php
+++ b/application/Building/Building.php
@@ -200,11 +200,17 @@ class Building extends mfBaseModel {
return null;
}
- public function getLaeaCoordinates() {
- if(!$this->gps_lat || !$this->gps_lat) {
- return false;
+ public function getLaeaCoordinates($gps_lat = 0, $gps_long = 0) {
+ if(!$gps_lat || !$gps_long) {
+ $gps_lat = $this->gps_lat;
+ $gps_long = $this->gps_long;
}
-
+
+
+ if(!$gps_lat || !$gps_long) {
+ return false;
+ }
+
// Elipsenparameter der Erdoberfläche
$a = 6378137;
$e = 0.081819191;
@@ -221,8 +227,8 @@ class Building extends mfBaseModel {
$PI = M_PI;
// Umrechnung der Eingabekoordinaten in rad
- $Lat = $this->gps_lat * $PI / 180;
- $Lon = $this->gps_long * $PI / 180;
+ $Lat = $gps_lat * $PI / 180;
+ $Lon = $gps_long * $PI / 180;
// Berechnungen
$q = (1 - $e ** 2) * ((sin($Lat) / (1 - $e ** 2 * sin($Lat) ** 2)) - ((1 / (2 * $e)) * log((1 - $e * sin($Lat)) / (1 + $e * sin($Lat)))));
diff --git a/application/Rtr100mRaster/Rtr100mRaster.php b/application/Rtr100mRaster/Rtr100mRaster.php
new file mode 100644
index 000000000..9c1957aa0
--- /dev/null
+++ b/application/Rtr100mRaster/Rtr100mRaster.php
@@ -0,0 +1,167 @@
+$name == null) {
+
+ $classname = ucfirst($name);
+ $idfield = $name."_id";
+ $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-".$this->$idfield);
+ if(!$this->$name) {
+ $this->$name = new $classname($this->$idfield);
+ }
+
+ if($this->$name->id) {
+ mfValuecache::singleton()->set("mfObjectmodel-$name-".$this->$name->id, $this->$name);
+ return $this->$name;
+ } else {
+ return null;
+ }
+
+ }
+
+ return $this->$name;
+ }
+
+ /********************************
+ * Begin static Model functions
+ */
+
+ public static function create(Array $data) {
+ $model = new Rtr100mRaster();
+
+ $table_fields = [
+ "raster", "unit_count",
+ "create_by","edit_by","create","edit"
+ ];
+
+ foreach($data as $field => $value) {
+ if(in_array($field, $table_fields)) {
+ $model->$field = $value;
+ }
+ }
+
+ $me = new User();
+ $me->loadMe();
+
+
+ if($model->create_by === null) {
+ $model->create_by = $me->id;
+ }
+ if($model->edit_by === null) {
+ $model->edit_by = $me->id;
+ }
+
+ return $model;
+ }
+
+ public static function getAll() {
+ $items = [];
+
+ $db = FronkDB::singleton();
+
+ $res = $db->select("Rtr100mRaster", "*",);
+ if($db->num_rows($res)) {
+ while($data = $db->fetch_object($res)) {
+ $items[] = new Rtr100mRaster($data);
+ }
+ }
+ return $items;
+
+ }
+
+ public static function getFirst($filter) {
+ $db = FronkDB::singleton();
+
+ $where = self::getSqlFilter($filter);
+ $sql = "SELECT * FROM Rtr100mRaster
+ WHERE $where
+ LIMIT 1";
+ //var_dump($sql);exit;
+ $res = $db->query($sql);
+ if($db->num_rows($res)) {
+ $data = $db->fetch_object($res);
+ $item = new Rtr100mRaster($data);
+ if($item->id) {
+ return $item;
+ } else {
+ return null;
+ }
+ }
+ return null;
+ }
+
+ public static function count($filter) {
+ $db = FronkDB::singleton();
+
+ $where = self::getSqlFilter($filter);
+ $sql = "SELECT COUNT(*) as cnt FROM Rtr100mRaster
+ WHERE $where";
+
+ //mfLoghandler::singleton()->debug($sql);
+
+ $res = $db->query($sql);
+ if($db->num_rows($res)) {
+ $data = $db->fetch_object($res);
+ return $data->cnt;
+ }
+ return 0;
+ }
+
+ public static function search($filter, $limit = false, $order = false) {
+ //var_dump($filter);exit;
+ $items = [];
+
+ if(!$order) {
+ $order = "";
+ } else {
+ $order = "ORDER BY $order";
+ }
+
+ $db = FronkDB::singleton();
+
+ $where = self::getSqlFilter($filter);
+ $sql = "SELECT * FROM Rtr100mRaster
+ WHERE $where
+ $order";
+
+ if(is_array($limit) && count($limit)) {
+ if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
+ $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
+ } elseif(is_numeric($limit['count'])) {
+ $sql .= " LIMIT ".$limit['count'];
+ }
+ }
+
+ mfLoghandler::singleton()->debug($sql);
+
+ $res = $db->query($sql);
+ if($db->num_rows($res)) {
+ while($data = $db->fetch_object($res)) {
+ $items[$data->id] = new Rtr100mRaster($data);
+ }
+ }
+
+ return $items;
+ }
+
+ private static function getSqlFilter($filter) {
+ $where = "1=1 ";
+
+ if(array_key_exists("raster", $filter)) {
+ $raster = FronkDB::singleton()->escape($filter["raster"]);
+ if($raster) {
+ $where .= " AND raster='$raster'";
+ }
+ }
+
+
+ if(array_key_exists("add-where", $filter)) {
+ $where .= " ".$filter['add-where'];
+ }
+
+ //var_dump($filter, $where);exit;
+ return $where;
+ }
+}
\ No newline at end of file
diff --git a/db/migrations/20241128191804_address_add_gps_and_laea.php b/db/migrations/20241128191804_address_add_gps_and_laea.php
new file mode 100644
index 000000000..f0a9977b5
--- /dev/null
+++ b/db/migrations/20241128191804_address_add_gps_and_laea.php
@@ -0,0 +1,37 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("Address");
+ $table->addColumn("gps_lat", "decimal", ["null" => true, "default" => null, "precision" => 15, "scale" => 10, "after" => "country_id"]);
+ $table->addColumn("gps_long", "decimal", ["null" => true, "default" => null, "precision" => 15, "scale" => 10, "after" => "gps_lat"]);
+ $table->addColumn("laea", "string", ["null" => true, "default" => null, "limit" => 64, "after" => "gps_long"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->table("Address")
+ ->removeColumn("laea")
+ ->removeColumn("gps_long")
+ ->removeColumn("gps_lat")
+ ->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/db/migrations/20241205201225_create_rtr_100m_raster.php b/db/migrations/20241205201225_create_rtr_100m_raster.php
new file mode 100644
index 000000000..91646b30b
--- /dev/null
+++ b/db/migrations/20241205201225_create_rtr_100m_raster.php
@@ -0,0 +1,38 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("Rtr100mRaster");
+ $table->addColumn("raster", "string", ["null" => false, "limit" => 32]);
+ $table->addColumn("unit_count", "integer", ["null" => false]);
+
+ $table->addColumn("create_by", "integer", ["null" => false]);
+ $table->addColumn("edit_by", "integer", ["null" => false]);
+ $table->addColumn("create", "integer", ["null" => false]);
+ $table->addColumn("edit", "integer", ["null" => false]);
+
+ $table->create();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->table("Rtr100mRaster")->drop()->save();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/lib/Gmaps/Geocoding.php b/lib/Gmaps/Geocoding.php
index ba2ba8aab..4b3dab591 100644
--- a/lib/Gmaps/Geocoding.php
+++ b/lib/Gmaps/Geocoding.php
@@ -23,7 +23,7 @@ class Gmaps_Geocoding {
$address = urlencode($address);
$url = TT_GEOCODING_API_URL."?address=$address&key=".TT_GEOCODING_API_SECRET;
-
+
$cstr = "";
if(count($components)) {
$component_string = implode("|", $components);
@@ -41,10 +41,10 @@ class Gmaps_Geocoding {
return false;
}
$results = $json->results;
- if(count($results) > 1) {
+ /*if(count($results) > 1) {
$log->warn(__FILE__.": Got more then 1 result. Aborting. ($url)");
return false;
- }
+ }*/
$lat = $results[0]->geometry->location->lat;
$long = $results[0]->geometry->location->lng;
diff --git a/scripts/import/.gitignore b/scripts/import/.gitignore
new file mode 100644
index 000000000..3eb7507cd
--- /dev/null
+++ b/scripts/import/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!100mraster
+!100mraster/*
diff --git a/scripts/import/100mraster/import-100m-raster.php b/scripts/import/100mraster/import-100m-raster.php
new file mode 100644
index 000000000..137b6d28d
--- /dev/null
+++ b/scripts/import/100mraster/import-100m-raster.php
@@ -0,0 +1,80 @@
+#!/usr/bin/php
+id);
+define("INTERNAL_USER_USERNAME", $me->username);
+
+$bundeslaender = [
+ "Burgenland",
+ "Kaernten",
+ "Niederoesterreich",
+ "Oberoesterreich",
+ "Salzburg",
+ "Steiermark",
+ "Tirol",
+ "Vorarlberg",
+ "Wien"
+];
+
+$db = FronkDB::singleton();
+$log = mfLoghandler::singleton();
+
+foreach($bundeslaender as $bland) {
+ $filename = __DIR__ . "/csv/StatistikAustria_100mRaster_Anschlusspotential2022_$bland.csv";
+
+ if(!file_exists($filename)) {
+ die("File $filename not found!\n");
+ }
+
+
+ $input = fopen($filename, "r");
+
+ $bom = "\xef\xbb\xbf";
+ if(fgets($input, 4) !== $bom) {
+ // BOM not found - rewind pointer to start of file.
+ rewind($input);
+
+ }
+
+ $headers = [];
+
+ $i = 0;
+ while($csv = fgetcsv($input, 0, ";")) {
+ $i++;
+
+ if($i == 1) {
+ foreach($csv as $key => $name) {
+ $headers[$name] = $key;
+ }
+ continue;
+ }
+
+ if(!trim($csv[0])) {
+ continue;
+ }
+
+ $raster = trim($csv[$headers["rasterid"]]);
+ $unit_count = trim($csv[$headers["anschlusspotential"]]);
+
+ $sql = "INSERT INTO `Rtr100mRaster` (`raster`,`unit_count`,`create_by`,`edit_by`,`create`,`edit`) VALUES('$raster',$unit_count,1,1,1733431100,1733431100)";
+ $db->query($sql);
+
+ /*
+ $rtr100mraster = Rtr100mRaster::create([
+ "raster" => $raster,
+ "unit_count" => $unit_count,
+ ]);
+ $rtr100mraster->save()*/
+ }
+}
\ No newline at end of file