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

Importing and showing Rimo Building and Home Status

Browse Source
This commit is contained in:
Frank Schubert
2024-07-01 12:23:29 +02:00
parent ae298a0665
commit 350815f41a
5 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Layout/default/Preorder/include/preorder-detail.php
View File

@@ -340,9 +340,21 @@
</tr><tr>
<th>Building External ID:</th>
<td class="text-monospace"><?=$preorder->adb_hausnummer->rimo_id?>
</tr><tr>
<th>Building Execution State:</th>
<td class="text-monospace"><?=$preorder->adb_hausnummer->rimo_ex_state?>
</tr><tr>
<th>Building Operational State:</th>
<td class="text-monospace"><?=($preorder->adb_hausnummer->rimo_op_state != "Undefined") ? $preorder->adb_hausnummer->rimo_op_state : ""?>
</tr><tr>
<th>Home External ID:</th>
<td class="text-monospace"><?=$preorder->adb_wohneinheit->extref?>
</tr><tr>
<th>Home Execution State:</th>
<td class="text-monospace"><?=$preorder->adb_wohneinheit->rimo_ex_state?>
</tr><tr>
<th>Home Operational State:</th>
<td class="text-monospace"><?=($preorder->adb_wohneinheit->rimo_op_state != "Undefined") ? $preorder->adb_wohneinheit->rimo_op_state : ""?>
</tr>
</table>
</div>

2
application/ADBHausnummer/ADBHausnummerModel.php
View File

@@ -34,6 +34,8 @@ class ADBHausnummerModel {
public $manual_update_by;
public $manual_update_info;
public $rimo_id;
public $rimo_ex_state;
public $rimo_op_state;
public $rimo_fcp_name;
public $create = null;

2
application/ADBWohneinheit/ADBWohneinheitModel.php
View File

@@ -13,6 +13,8 @@ class ADBWohneinheitModel {
public $zusatz;
public $bezeichner;
public $nutzung;
public $rimo_ex_state;
public $rimo_op_state;
public $patch_cluster;
public $patch_shelf;
public $patch_module;

39
db/migrations/20240701095219_adb_add_rimo_status.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
declare(strict_types=1);
use Phinx\Migration\AbstractMigration;
final class AdbAddRimoStatus extends AbstractMigration
{
public function up(): void
{
if($this->getEnvironment() == "thetool") {
}
if($this->getEnvironment() == "addressdb") {
$hn = $this->table("Hausnummer");
$hn->addColumn("rimo_ex_state", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "rimo_id"]);
$hn->addColumn("rimo_op_state", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "rimo_ex_state"]);
$hn->update();
$we = $this->table("Wohneinheit");
$we->addColumn("rimo_ex_state", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "nutzung"]);
$we->addColumn("rimo_op_state", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "rimo_ex_state"]);
$we->update();
}
}
public function down(): void
{
if($this->getEnvironment() == "thetool") {
}
if($this->getEnvironment() == "addressdb") {
$this->table("Wohneinheit")->removeColumn("rimo_status")->save();
$this->table("Hausnummer")->removeColumn("rimo_status")->save();
}
}
}

28
scripts/adb-rimo-import/rimo-import-test.php
View File

@@ -246,15 +246,22 @@ foreach ($clusters as $cluster_data) {
/*
* Set Building Status based on Operational-/Executionstate
*/
$b_execution_state_id = $building->executionState->name;
$b_execution_state_label = $building->executionState->userLabel;
$b_executionstate_id = $building->executionState->name;
$b_executionstate_label = $building->executionState->userLabel;
$b_operationalstate_id = $building->operationalState->name;
$b_operationalstate_label = $building->operationalState->userLabel;
if($b_executionstate_label != $hausnummer->rimo_ex_state) {
$hausnummer->rimo_ex_state = $b_executionstate_label;
$hausnummer->save();
}
if($b_operationalstate_label != $hausnummer->rimo_op_state) {
$hausnummer->rimo_op_state = $b_operationalstate_label;
$hausnummer->save();
}
if($b_execution_state_id == "99" && $hausnummer->visibility != "private") {
echo "== Setting visibility to private because execution state $b_execution_state_id ($b_execution_state_label) [".$hausnummer->id."]\n";
if($b_executionstate_id == "99" && $hausnummer->visibility != "private") {
echo "== Setting visibility to private because execution state $b_executionstate_id ($b_executionstate_label) [".$hausnummer->id."]\n";
$hausnummer->visibility = "private";
$hausnummer->save();
}
@@ -293,7 +300,7 @@ foreach ($clusters as $cluster_data) {
$rimo_home_count = count($building->homes->item);
foreach ($building->homes->item as $home) {
//print_r($home);//exit;
//print_r($home);exit;
$homes_count++;
$home_rimo_id = $home->id;
$home_name = $home->name;
@@ -331,6 +338,15 @@ foreach ($clusters as $cluster_data) {
* TODO: Status based on execution-/operational-state
*/
if($home->executionState->userLabel != $unit->rimo_ex_state) {
$unit->rimo_ex_state = $home->executionState->userLabel;
$unit->save();
}
if($home->operationalState->userLabel != $unit->rimo_op_state) {
$unit->rimo_op_state = $home->operationalState->userLabel;
$unit->save();
}
/*
* update FTU data
*/