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

Added dates as pills

Browse Source
This commit is contained in:
Frank Schubert
2021-10-12 23:59:47 +02:00
parent b62c0839e5
commit 4c17f949ca
2 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Layout/default/Order/Index.php
View File

@@ -105,7 +105,7 @@
<h4 class="header-title">Bestellungen ohne Anschluss</h4>
</div>
<table class="table table-striped table-hover">
<table class="table">
<tr>
<th></th>
<th>Kunde</th>
@@ -115,8 +115,9 @@
<th>Bearbeitet von</th>
<th></th>
</tr>
<?php $order_count = 0; ?>
<?php foreach($lonelyOrders as $order): ?>
<tr class="building-list-tr" id="order-<?=$order->id?>">
<tr class="order-list-tr pb-0 <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-<?=$order->id?>">
<td onclick="toggleOrder(<?=$order->id?>)"><?=$order->id?></td>
<td onclick="toggleOrder(<?=$order->id?>)">
<?=nl2br($order->owner->getCompanyOrName())?>
@@ -137,6 +138,15 @@
<a href="<?=self::getUrl("Order", "delete", ["id" => $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
</td>
</tr>
<tr class="building-list-tr <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-dates-<?=$order->id?>">
<td onclick="toggleOrder(<?=$order->id?>)" class="pt-0" style="border-top: none;"></td>
<td onclick="toggleOrder(<?=$order->id?>)" colspan="6" class="pt-0" style="border-top: none;">
<div class="row">
<div class="mr-4 order-date-pill">Versandtermin: <span class="text-monospace">--.--.----</span></div>
<div class="order-date-pill <?=($order->install_date) ? "active" : ""?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
</div>
</td>
</tr>
<tr id="order-detail-<?=$order->id?>" class="hidden" style="background-color:#fff">
<td colspan="9">
@@ -182,6 +192,7 @@
<tr style="display:none;">
<td colspan="9"></td>
</tr>
<?php $order_count++; ?>
<?php endforeach; ?>
</table>
</div>
@@ -226,7 +237,7 @@
<?php endif; ?>
</div>
<table class="table table-striped table-hover">
<table class="table">
<tr>
<th></th>
<th></th>
@@ -238,8 +249,9 @@
<th>Bearbeitet von</th>
<th></th>
</tr>
<?php $order_count = 0; ?>
<?php foreach($orders as $order): ?>
<tr class="building-list-tr" id="order-<?=$order->id?>">
<tr class="order-list-tr pb-0 <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-<?=$order->id?>">
<td><?=$order->id?></td>
<td onclick="toggleOrder(<?=$order->id?>)">
<?php if(is_array($order->terminations) && count($order->terminations)): ?>
@@ -305,6 +317,18 @@
<a href="<?=self::getUrl("Order", "delete", ["id" => $order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
</td>
</tr>
<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="7" class="pt-0" style="border-top: none;">
<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["backbone_setup_date"]->value->value_string) ? "active" : ""?>">Backbone Bautermin: <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 <?=($order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string) ? "active" : ""?>">Kunde Bautermin: <span class="text-monospace"><?=($order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["customer_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div>
<div class="mr-4 order-date-pill">Versandtermin: <span class="text-monospace">--.--.----</span></div>
<div class="order-date-pill <?=($order->install_date) ? "active" : ""?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
</div>
</td>
</tr>
<tr id="order-detail-<?=$order->id?>" class="hidden" style="background-color:#fff">
<td colspan="9">
@@ -369,6 +393,7 @@
<tr style="display:none;">
<td colspan="9"></td>
</tr>
<?php $order_count++ ?>
<?php endforeach; ?>
</table>
@@ -436,9 +461,13 @@
if($('#order-detail-' + id).is(":hidden")) {
$('#order-' + id).removeClass("table-info");
$('#order-' + id).removeClass("text-info");
$('#order-dates-' + id).removeClass("table-info");
$('#order-dates-' + id).removeClass("text-info");
} else {
$('#order-' + id).addClass("text-info");
$('#order-' + id).addClass("table-info");
$('#order-dates-' + id).addClass("text-info");
$('#order-dates-' + id).addClass("table-info");
}
}

29
public/assets/css/thetool.css
View File

@@ -37,6 +37,15 @@
cursor: pointer;
}
.order-list-tr {
cursor: pointer;
padding-bottom: 0;
}
.order-list-tr td {
padding-bottom: 4px;
}
.table-bg-even {
background-color: #f1f5f7;
}
@@ -249,4 +258,24 @@ td.controls {
.btn-outline-rosa {
color: #FF0088;
border-color: #FF0088;
}
.order-date-pill {
border: 1px dashed #999;
border-radius: 4px;
padding-left: 4px;
padding-right: 4px;
}
.order-date-pill.active {
border-color: #25b343;
background-color: #f0fff0;
}