From 51537997781abab96c5b205f1d3eec61f479e040 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Mon, 6 Dec 2021 19:42:03 +0100 Subject: [PATCH] Added responsible company name to unfinished terminations in Order/Index --- Layout/default/Order/Index.php | 9 ++++++++- application/Termination/Termination.php | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 06ee4632f..bde317729 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -641,7 +641,14 @@ " id="order-dates-id?>"> - + + terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?> + terminations[0]->lineworker->getCompanyOrName()?> + + terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?> + terminations[0]->building->pipeworker->getCompanyOrName()?> + +
value->value_string) ? "active" : ""?>">Tiefbau: terminations[0]->workflowitems["bautermin"]->value->value_string) ? "".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."" : "--.--.----"?>
diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php index b50798185..7a4e8747f 100644 --- a/application/Termination/Termination.php +++ b/application/Termination/Termination.php @@ -170,6 +170,11 @@ class Termination extends mfBaseModel { return $this->workflowitems; } + if($name == "lineworker") { + $this->lineworker = new Address($this->getProperty("building")->lineworker_id); + return $this->lineworker; + } + if($name == "files") { $this->files = TerminationFileModel::search(["termination_id" => $this->id]); return $this->files;