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

Merge branch 'fronkdev' into 'master'

Browse Source 
PreorderstatusJournal & preorder flags -> ADBHausnummer flags sync

See merge request fronk/thetool!1739
This commit is contained in:
Frank Schubert
2025-09-10 15:41:55 +00:00
parent 01b79a8e27 aab08b5d65
commit 90e40567b1
11 changed files with 486 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Preorder/Preorder.php
+43 -24
View File
@@ -23,6 +23,7 @@ class Preorder extends mfBaseModel {
private $history;
private $citycomoan; // ONT data
private $ctags; // network-keyed array of Ctags
private $statusjournals;
protected function beforeUpdate($data) {
if(!array_key_exists("edit_by", $data)) {
@@ -532,8 +533,8 @@ class Preorder extends mfBaseModel {
if(is_array($flags) && count($flags)) {
foreach($flags as $flag) {
if(strlen($flag->value->value) && array_key_exists($flag->code, TT_PREORDER_STATUS_MATRIX)) {
$flag_matrix_item = TT_PREORDER_STATUS_MATRIX[$flag->code];
if(strlen($flag->value->value) && array_key_exists($flag->code, TT_PREORDER_STATUS_FLAG_MATRIX)) {
$flag_matrix_item = TT_PREORDER_STATUS_FLAG_MATRIX[$flag->code];
if(!$flag_matrix_item["flag"]) continue;
// set hausnummer flag
@@ -541,19 +542,13 @@ class Preorder extends mfBaseModel {
$hflag = ADBStatusflagModel::getFirst(["code" => $flag_matrix_item["h"]]);
if(!$hflag) {
$this->log->warn("[".$this->_ruid."] "."Statusflag Code ".$flag->code." does not exist");
} else {
//var_dump($hflag);exit;
$hflag->hausnummer_id = $hausnummer->id;
$hflag->value->value = $flag->value->value;
$hflag->save();
$this->log->debug("[" . $this->_ruid . "] " . __METHOD__ . ": Hausnummer flag " . $hflag->code . " value '" . $hflag->value->value . "' gespeichert");
}
$hflagval = ADBHausnummerStatusflagValueModel::getFirst(["hausnummer_id" => $this->adb_hausnummer_id, "flag_id" => $hflag->id]);
if(!$hflagval) {
$hflagval = ADBHausnummerStatusflagValueModel::create([
"hausnummer_id" => $this->adb_hausnummer_id,
"flag_id" => $hflag->id,
"value" => 0
]);
}
$hflagval->value = $flag->value->value;
$hflagval->save();
$this->log->debug("[".$this->_ruid."] ".__METHOD__.": Hausnummer flag ".$hflag->code." value '".$hflagval->value."' gespeichert");
}
// set wohneiheit flag
@@ -561,19 +556,33 @@ class Preorder extends mfBaseModel {
$wflag = ADBStatusflagModel::getFirst(["code" => $flag_matrix_item["w"]]);
if(!$wflag) {
$this->log->warn("[".$this->_ruid."] "."Statusflag Code ".$flag->code." does not exist");
} else {
$wflag->wohneinheit_id = $wohneinheit->id;
$wflag->value->value = $flag->value->value;
$wflag->value->save();
$this->log->debug("[" . $this->_ruid . "] " . __METHOD__ . ": Wohneinheit flag " . $hflag->code . " value '" . $wflag->value->value . "' gespeichert");
}
}
if(array_key_exists("ws", $flag_matrix_item) && $flag_matrix_item["ws"] && $this->adb_wohneinheit_id) {
//echo "Setting Wohneinheit status to ".$flag_matrix_item["ws"]." from ".$this->getProperty("adb_wohneinheit")->status->code."\n";
// set new wohneinheit status
$new_wohneinheit_status = ADBStatusModel::getFirst(["code" => $flag_matrix_item["ws"]]);
if(!$new_wohneinheit_status) {
$this->log->warning("[".$this->_ruid."] ".__METHOD__ . ": new ADBStatus code " . $flag_matrix_item["w"] . " not found!");
return true;
}
$wflagval = ADBWohneinheitStatusflagValueModel::getFirst(["wohneinheit_id" => $this->adb_wohneinheit_id, "flag_id" => $wflag->id]);
if(!$wflagval) {
$wflagval = ADBWohneinheitStatusflagValueModel::create([
"wohneinheit_id" => $this->adb_wohneinheit_id,
"flag_id" => $wflag->id,
"value" => 0
]);
$wohneinheit = new ADBWohneinheit($this->adb_wohneinheit_id);
if(!$wohneinheit->id) return true;
$this->log->debug("[".$this->_ruid."] ".__METHOD__ . ": new wohneinheit status code " . $new_wohneinheit_status->code);
// only update if current status is less than new status
if($wohneinheit->status->code < $new_wohneinheit_status->code) {
$this->log->debug("[".$this->_ruid."] ".__METHOD__ . ": Setting new wohneinheit status code: " . $new_wohneinheit_status->code);
$wohneinheit->status_id = $new_wohneinheit_status->id;
$wohneinheit->save();
}
$wflagval->value = $flag->value->value;
$wflagval->save();
$this->log->debug("[".$this->_ruid."] ".__METHOD__.": Wohneinheit flag ".$hflag->code." gespeichert");
}
}
@@ -1554,6 +1563,16 @@ class Preorder extends mfBaseModel {
return $this->attribute;
}
if($name == "statusjournals") {
$journals = PreorderstatusJournal::search(["preorder_id" => $this->id]);
if($journals) {
$this->statusjournals = $journals;
return $this->statusjournals;
}
return [];
}
if($name == "creator") {
$user = mfValuecache::singleton()->get("Worker-id-" . $this->create_by);
if($user) {