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

Fixed link from Order to Building/Termination

Browse Source
This commit is contained in:
Frank Schubert
2021-09-20 11:34:21 +02:00
parent 79cf7ba3be
commit b169de1d72
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,9 +189,9 @@
<?php if($order->terminations[0]->status->code >= TT_TERMSTATUS_CONNECTED): ?>
<span class="status connected" title="Anschluss connected">CON</span>
<?php elseif($order->terminations[0]->building->status->code >= TT_BUILDINGSTATUS_CONNECTED): ?>
<a href="<?=self::getUrl("Linework", "Index", ["filter" => ["code" => $order->terminations[0]->code]])?>" target="_blank"><span class="status building-connected" title="Tiefbau erledigt">B-C</span></a>
<a href="<?=self::getUrl("Linework", "Index", ["filter" => ["code" => $order->terminations[0]->code, "status_id" => ""]])?>" target="_blank"><span class="status building-connected" title="Tiefbau erledigt">B-C</span></a>
<?php else: ?>
<a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $order->terminations[0]->building->code]])?>" target="_blank"><span class="status not-connected" title="Tiefbau ausständig">BNC</span></a>
<a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $order->terminations[0]->building->code, "status_id" => ""]])?>" target="_blank"><span class="status not-connected" title="Tiefbau ausständig">BNC</span></a>
<?php endif; ?>
<?php endif; ?>
@@ -285,4 +285,4 @@
</div>
</div>
<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>

4
application/Building/BuildingModel.php
View File

@@ -109,7 +109,7 @@ class BuildingModel {
LEFT JOIN Buildingstatus ON (Buildingstatus.id = Building.status_id)
WHERE $where
ORDER BY network_id, pop_id, street, zip, city";
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
@@ -233,4 +233,4 @@ class BuildingModel {
return $where;
}
}
}