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

Added responsible company name to unfinished terminations in Order/Index

Browse Source
This commit is contained in:
Frank Schubert
2021-12-06 19:42:03 +01:00
parent 5e74ece36d
commit 5153799778
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Order/Index.php
+8 -1
View File
@@ -641,7 +641,14 @@
</td> </td>
</tr> </tr>
<tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>"> <tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>">
<td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0" style="border-top: none;"></td> <td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0 text-right text-pink" style="border-top: none;">
<?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?>
<?=$order->terminations[0]->lineworker->getCompanyOrName()?>
<?php endif; ?>
<?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?>
<?=$order->terminations[0]->building->pipeworker->getCompanyOrName()?>
<?php endif; ?>
</td>
<td onclick="toggleOrder(<?=$order->id?>)" colspan="7" class="pt-0" style="border-top: none;"> <td onclick="toggleOrder(<?=$order->id?>)" colspan="7" class="pt-0" style="border-top: none;">
<div class="row"> <div class="row">
<div class="mr-4 order-date-pill <?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "active" : ""?>">Tiefbau: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."</span>" : "--.--.----"?></span></div> <div class="mr-4 order-date-pill <?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "active" : ""?>">Tiefbau: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["bautermin"]->value->value_string."</span>" : "--.--.----"?></span></div>
application/Termination/Termination.php
+5
View File
@@ -170,6 +170,11 @@ class Termination extends mfBaseModel {
return $this->workflowitems; return $this->workflowitems;
} }
if($name == "lineworker") {
$this->lineworker = new Address($this->getProperty("building")->lineworker_id);
return $this->lineworker;
}
if($name == "files") { if($name == "files") {
$this->files = TerminationFileModel::search(["termination_id" => $this->id]); $this->files = TerminationFileModel::search(["termination_id" => $this->id]);
return $this->files; return $this->files;