Merge branch 'fronkdev' into 'master'

showing construction company in Pipe- and Linework

See merge request fronk/thetool!1237

Layout/default/Linework/Index.php

@@ -210,6 +210,12 @@
                         <span class="text-monospace">[<?=__($term->building->status->name."-b")?>]</span>
                         <br />
                         <a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $term->building->code]])?>" target="_blank"><span class="text-success"><?=$term->code?></span></a>
+                        <br />
+                        <?php if($term->building->pipeworker_id): ?>
+                            <span class="text-primary"><?=($term->building->lineworker_id) ? $term->building->lineworker->getCompanyOrName() : ""?></span><br />
+                        <?php else: ?>
+                            <span><em>-- Keiner Baufirma zugewiesen --</em></span><br />
+                        <?php endif; ?>
                       </div>
                       <div class="up-arrow hidden">
                         <i class="fas fa-angle-up"></i>
@@ -253,6 +259,12 @@
                         <div class="mt-2 mb-2">
                           <a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $term->building->code]])?>" target="_blank"><span class="text-success"><?=$term->code?></span></a>
                           <br />
+                          <?php if($term->building->pipeworker_id): ?>
+                              <span class="text-primary"><?=($term->building->lineworker_id) ? $term->building->lineworker->getCompanyOrName() : ""?></span><br />
+                          <?php else: ?>
+                              <span><em>-- Keiner Baufirma zugewiesen --</em></span><br />
+                          <?php endif; ?>
+                          <br />
                           <?php if($term->name): ?>
                             <?=$term->name?><br />
                           <?php endif; ?>

Layout/default/Pipework/Index.php

@@ -168,6 +168,11 @@
                       <div>
                         <strong style="white-space: nowrap;"><?=$building->street?></strong><br />
                         <span class="text-success"><?=$building->code?></span><br />
+                        <?php if($building->pipeworker_id): ?>
+                          <span class="text-primary"><?=($building->pipeworker_id) ? $building->pipeworker->getCompanyOrName() : ""?></span><br />
+                        <?php else: ?>
+                          <span><em>-- Keiner Baufirma zugewiesen --</em></span><br />
+                        <?php endif; ?>
                       </div>
                       <div class="mt-3">
                         <?=$building->contact?><br />