From 0eb0c2d4406aef92a826959951f75638692ef08e Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 14 Dec 2021 21:19:01 +0100
Subject: [PATCH] Fixed ist-values in patching

---
 Layout/default/Patching/Index.php           | 10 +++++-----
 application/Pipework/PipeworkController.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php
index 307e76756..7d76b58cd 100644
--- a/Layout/default/Patching/Index.php
+++ b/Layout/default/Patching/Index.php
@@ -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">
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 1aab946d7..c6bedf221 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -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;