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

Fixed direct journal links in order with no termination

Browse Source
This commit is contained in:
Frank Schubert
2022-05-17 15:43:37 +02:00
parent e01f803fbb
commit 6853a0a0b3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Order/Index.php
+5 -5
View File
@@ -642,18 +642,18 @@
</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 text-left" style="border-top: none;"> <td onclick="toggleOrder(<?=$order->id?>)" colspan="2" class="pt-0 text-left" style="border-top: none;">
<?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?> <?php if(count($order->terminations) && $order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?>
<span class="building-connected" title="<?=$order->terminations[0]->lineworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->lineworker->getCompanyOrName(), 15)?></span> <span class="building-connected" title="<?=$order->terminations[0]->lineworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->lineworker->getCompanyOrName(), 15)?></span>
<?php endif; ?> <?php endif; ?>
<?php if($order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?> <?php if(count($order->terminations) && $order->terminations[0]->status->code < TT_TERMSTATUS_CONNECTED && $order->terminations[0]->building->status->code < TT_BUILDINGSTATUS_CONNECTED): ?>
<span class="not-connected" title="<?=$order->terminations[0]->building->pipeworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->building->pipeworker->getCompanyOrName(), 15)?></span> <span class="not-connected" title="<?=$order->terminations[0]->building->pipeworker->getCompanyOrName()?>"><?=mfLayout::strtrim($order->terminations[0]->building->pipeworker->getCompanyOrName(), 15)?></span>
<?php endif; ?> <?php endif; ?>
</td> </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 <?=(count($order->terminations) && $order->terminations[0]->workflowitems["bautermin"]->value->value_string) ? "active" : ""?>">Tiefbau: <span class="text-monospace"><?=(count($order->terminations) && $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["backbone_setup_date"]->value->value_string) ? "active" : ""?>">Leitungsbau Backbone: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div> <div class="mr-4 order-date-pill <?=(count($order->terminations) && $order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "active" : ""?>">Leitungsbau Backbone: <span class="text-monospace"><?=(count($order->terminations) && $order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill <?=($order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "active" : ""?>">Leitungsbau Kunde: <span class="text-monospace"><?=($order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "<span class='text-success'>".$order->terminations[0]->getWorkflowvalue("customer_setup_date")."</span>" : "--.--.----"?></span></div> <div class="mr-4 order-date-pill <?=(count($order->terminations) && $order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "active" : ""?>">Leitungsbau Kunde: <span class="text-monospace"><?=(count($order->terminations) && $order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "<span class='text-success'>".$order->terminations[0]->getWorkflowvalue("customer_setup_date")."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div> <div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div>
<div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill <?=($order->install_date) ? "active" : ""?>" id="order-install-date-<?=$order->id?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div> <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill <?=($order->install_date) ? "active" : ""?>" id="order-install-date-<?=$order->id?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
</div> </div>