From 068adf890ea16284c6569c03567e224e47ba8197 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Wed, 20 Mar 2024 19:50:57 +0100 Subject: [PATCH] Added Preding to rimo import; added workorder team --- .../Preorder/include/preorder-detail.php | 9 ++++- .../RimoWorkorder/RimoWorkorderModel.php | 2 + ...20240320124354_rimo_workorder_add_team.php | 36 +++++++++++++++++ .../Network/Network-60324-preding.php | 40 +++++++++++++++++++ ...B3J-mitterberg-stmarin-stainach-puergg.php | 29 ++++++++++++++ ...-J5B3K-bad-mitterndorf-stainach-puergg.php | 29 ++++++++++++++ .../Network-P-J5B3L-bad-mitterndorf.php | 29 ++++++++++++++ ...rk-P-J5B3R-rml-aigen-im-ennstal-puergg.php | 29 ++++++++++++++ .../Network/Network-P-J5B42-wildalpen.php | 29 ++++++++++++++ scripts/adb-rimo-import/rimo-import-test.php | 28 ++++++++----- 10 files changed, 248 insertions(+), 12 deletions(-) create mode 100644 db/migrations/20240320124354_rimo_workorder_add_team.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-60324-preding.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-P-J5B3J-mitterberg-stmarin-stainach-puergg.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-P-J5B3K-bad-mitterndorf-stainach-puergg.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-P-J5B3L-bad-mitterndorf.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-P-J5B3R-rml-aigen-im-ennstal-puergg.php create mode 100644 scripts/adb-rimo-import/ADBAddressHelper/Network/Network-P-J5B42-wildalpen.php diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php index 2fe7eb666..96b36a7f2 100644 --- a/Layout/default/Preorder/include/preorder-detail.php +++ b/Layout/default/Preorder/include/preorder-detail.php @@ -358,7 +358,14 @@ Status adb_wohneinheit->rimo_workorder->rimo_status?> - + + adb_wohneinheit->rimo_workorder->rimo_team_name): ?> + + Zugewiesen an: + adb_wohneinheit->rimo_workorder->rimo_team_name?> + + + Erstellt adb_wohneinheit->rimo_workorder)) ? date("d.m.Y H:i:s", $preorder->adb_wohneinheit->rimo_workorder->create) : ""?> diff --git a/application/RimoWorkorder/RimoWorkorderModel.php b/application/RimoWorkorder/RimoWorkorderModel.php index 4ed8ca453..16c228de6 100644 --- a/application/RimoWorkorder/RimoWorkorderModel.php +++ b/application/RimoWorkorder/RimoWorkorderModel.php @@ -5,6 +5,8 @@ class RimoWorkorderModel { public $rimo_name; public $adb_wohneinheit_id; public $termination_id; + public $rimo_team_id; + public $rimo_team_name; public $create_data; public $create_by; diff --git a/db/migrations/20240320124354_rimo_workorder_add_team.php b/db/migrations/20240320124354_rimo_workorder_add_team.php new file mode 100644 index 000000000..5ff7d1005 --- /dev/null +++ b/db/migrations/20240320124354_rimo_workorder_add_team.php @@ -0,0 +1,36 @@ +getEnvironment() == "thetool") { + $table = $this->table("RimoWorkorder"); + $table->addColumn("rimo_team_id", "string", ["null" => true, "default" => null, "limit" => 64, "after" => "rimo_status"]); + $table->addColumn("rimo_team_name", "string", ["null" => true, "default" => null, "limit" => 64, "after" => "rimo_team_id"]); + $table->update(); + + } + + if($this->getEnvironment() == "addressdb") { + + } + } + + public function down(): void + { + if($this->getEnvironment() == "thetool") { + $table = $this->table("RimoWorkorder"); + $table->removeColumn("rimo_team_name"); + $table->removeColumn("rimo_team_id"); + $table->save(); + } + + if($this->getEnvironment() == "addressdb") { + + } + } +} diff --git a/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-60324-preding.php b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-60324-preding.php new file mode 100644 index 000000000..7ee7a88cd --- /dev/null +++ b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-60324-preding.php @@ -0,0 +1,40 @@ + 1) { //$netowners = ["estmk", "rml"]; $netowners = ["estmk"]; +//$netowners = ["rml"]; +$apiEdition = "prod"; foreach($netowners as $apiOwner) { - $apiEdition = "prod"; $apiData = TT_RIMO_API_CREDS[$apiOwner][$apiEdition]; $apiUrl = $apiData["url"]; $apiToken = $apiData["key"]; + $processType = $apiData["type"]; if(!$apiUrl || !$apiToken) { echo "Api Daten für $apiOwner unvollständig\n"; @@ -117,10 +119,10 @@ foreach($netowners as $apiOwner) { } - if($cluster_rimo_id != "SDIRolloutRegion_330545538305_1709728959") { - // lieboch vorab + /*if($cluster_rimo_id != "SDIRolloutRegion_411273870081_1710940292") { + // preding continue; - } + }*/ /* * get Cluster Outline Coords @@ -134,7 +136,7 @@ foreach($netowners as $apiOwner) { //echo $req_url."\n"; $responseText = file_get_contents($req_url, false, $req_ctx); if($responseText === false) { - //echo "Error fetching Workorders for building $rimo_building_id\n"; + //echo "Error fetching GeoJson for cluster $cluster_rimo_id\n"; continue; } $geodataResponse = json_decode($responseText); @@ -230,7 +232,7 @@ foreach($netowners as $apiOwner) { $home_rimo_id = $home->id; $home_name = $home->name; - //echo "$home_rimo_id\n"; + //echo "$home_rimo_id\n";continue; if(array_key_exists($home_rimo_id, $existing_units)) { $unit = $existing_units[$home_rimo_id]; @@ -247,8 +249,8 @@ foreach($netowners as $apiOwner) { "extref" => $home_rimo_id, "num" => ++$last_unit_num ]); - if(!$unit->save()) { - die("Error saving new unit\n".print_r($home, true)); + if(!$unit->save()) { + die("Error saving new unit\n".print_r($home, true)); } } @@ -401,7 +403,7 @@ foreach($netowners as $apiOwner) { } - + //continue; /* * get workorders */ @@ -431,7 +433,9 @@ foreach($netowners as $apiOwner) { $rimo_workorder_name = $workorder->name; $workorder_status = $workorder->state->userLabel; $workorder_home_id = $workorder->home->id; - + $team_id = (is_array($workorder->teams->item) && count($workorder->teams->item)) ? $workorder->teams->item[0]->id : null; + $team_name = (is_array($workorder->teams->item) && count($workorder->teams->item)) ? $workorder->teams->item[0]->name : null; + $wo = \RimoWorkorderModel::getFirst(["rimo_id" => $rimo_workorder_id]); if($wo && $workorder_status != $wo->rimo_status) { @@ -453,7 +457,9 @@ foreach($netowners as $apiOwner) { "adb_wohneinheit_id" => $wo_home->id, "rimo_id" => $rimo_workorder_id, "rimo_name" => $rimo_workorder_name, - "rimo_status" => $workorder_status + "rimo_status" => $workorder_status, + "rimo_team_id" => $team_id, + "rimo_team_name" => $team_name ]); if(!$wo->save()) { echo "Fehler beim Erstellen der RimoWorkorder $rimo_workorder_id ($workorder_home_id)\n";