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

Greenfields now exempt from unit count calculation in ADBWohneinheit

Browse Source
This commit is contained in:
Frank Schubert
2025-02-05 14:51:13 +01:00
parent 30902fc094
commit bbd00ffa99
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/ADBWohneinheit/ADBWohneinheit.php
View File

@@ -65,6 +65,8 @@ class ADBWohneinheit extends mfBaseModel {
$gda_egenschaft = strtolower($hausnummer->rimo_type); $gda_egenschaft = strtolower($hausnummer->rimo_type);
} }
if(strtolower($gda_egenschaft) == "greenfield") continue;
if(!$gda_egenschaft) { if(!$gda_egenschaft) {
$unit_count_gda["sd"] += $hausnummer->unit_count; $unit_count_gda["sd"] += $hausnummer->unit_count;
continue; continue;
@@ -107,11 +109,13 @@ class ADBWohneinheit extends mfBaseModel {
$old_status = new ADBStatus($this->_old_data->status_id); $old_status = new ADBStatus($this->_old_data->status_id);
$new_status = new ADBStatus($this->data->status_id); $new_status = new ADBStatus($this->data->status_id);
$logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."' [".$old_status->code." => ".$new_status->code."]"; $logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."' [".$old_status->code." => ".$new_status->code."]";
} elseif($key = "external_data" && $this->_old_data->external_data && $this->external_data) { } elseif($key == "external_data" && $this->_old_data->external_data && $this->external_data) {
$old_data = json_decode($this->_old_data->external_data); $old_data = json_decode($this->_old_data->external_data);
$new_data = json_decode($this->external_data); $new_data = json_decode($this->external_data);
if(json_encode($old_data) !== json_encode($new_data)) { if(json_encode($old_data) !== json_encode($new_data)) {
$logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."'"; $logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."'";
} else {
continue;
} }
} else { } else {
$logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."'"; $logstr .= "| '$key' => FROM '".$this->_old_data->$key."' TO '".$this->data->$key."'";