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

Fixed ist-values in patching

Browse Source
This commit is contained in:
Frank Schubert
2021-12-14 21:19:01 +01:00
parent 6cd9c688db
commit 0eb0c2d440
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Layout/default/Patching/Index.php
View File

@@ -165,11 +165,11 @@
<?=$term->building->street?><br />
<?=$term->building->zip?> <?=$term->building->city?>
</td>
<td class="text-mono text-primary" title="Schrank: <?=$term->workflowitems["schrank"]->value->value_string?> / Baugruppe: <?=$term->workflowitems["baugruppe"]->value->value_string?> / Modul: <?=$term->workflowitems["modul"]->value->value_string?> / Port: <?=$term->workflowitems["ports"]->value->value_string?>">
<?=$term->workflowitems["schrank"]->value->value_string?> /
<?=$term->workflowitems["baugruppe"]->value->value_string?> /
<?=$term->workflowitems["modul"]->value->value_string?> /
<?=$term->workflowitems["ports"]->value->value_string?>
<td class="text-mono text-primary" title="Schrank: <?=($term->workflowitems["ist_schrank"]->value->id) ? $term->workflowitems["ist_schrank"]->value->value_string : $term->workflowitems["schrank"]->value->value_string?> / Baugruppe: <?=($term->workflowitems["ist_baugruppe"]->value->id) ? $term->workflowitems["ist_baugruppe"]->value->value_string : $term->workflowitems["baugruppe"]->value->value_string?> / Modul: <?=($term->workflowitems["ist_modul"]->value->id) ? $term->workflowitems["ist_modul"]->value->value_string : $term->workflowitems["modul"]->value->value_string?> / Port: <?=($term->workflowitems["ist_ports"]->value->id) ? $term->workflowitems["ist_ports"]->value->value_string : $term->workflowitems["ports"]->value->value_string?>">
<?=($term->workflowitems["ist_schrank"]->value->id) ? $term->workflowitems["ist_schrank"]->value->value_string : $term->workflowitems["schrank"]->value->value_string?> /
<?=($term->workflowitems["ist_baugruppe"]->value->id) ? $term->workflowitems["ist_baugruppe"]->value->value_string : $term->workflowitems["baugruppe"]->value->value_string?> /
<?=($term->workflowitems["ist_modul"]->value->id) ? $term->workflowitems["ist_modul"]->value->value_string : $term->workflowitems["modul"]->value->value_string?> /
<?=($term->workflowitems["ist_ports"]->value->id) ? $term->workflowitems["ist_ports"]->value->value_string : $term->workflowitems["ports"]->value->value_string?>
</td>
<td>
<select name="linework_port" form="term-form-<?=$term->id?>" class="form-control">

2
application/Pipework/PipeworkController.php
View File

@@ -107,7 +107,7 @@ class PipeworkController extends mfBaseController {
$item_colspan = 0;
$i = 0;
// get fields between delimiters for colspan
// get fields count between delimiters for colspan
foreach($building->workflowitems as $wfitem) {
if($i == 0 && $wfitem->type == "delimiter") continue;