Merge branch 'fronkdev' into 'master'

ADB: Added stiege as part of Hausnummer

See merge request fronk/thetool!369

Layout/default/AddressDB/Form.php

@@ -144,7 +144,18 @@
                       <?php endif; ?>
                     </div>
                   </div>
-                  
+
+                    <div class="form-group row">
+                        <label class="col-lg-2 col-form-label" for="hausnummer">Stiege</label>
+                        <div class="col-lg-10">
+                            <?php if(is_array($save_data) && array_key_exists("stiege", $save_data)): ?>
+                                <input type="text" class="form-control" name="stiege" id="stiege" value="<?=$save_data['stiege']?>">
+                            <?php else: ?>
+                                <input type="text" class="form-control" name="stiege" id="stiege" value="<?=$address->stiege?>">
+                            <?php endif; ?>
+                        </div>
+                    </div>
+
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="plz">PLZ *</label>
                     <div class="col-lg-10">

Layout/default/AddressDB/Index.php

@@ -167,6 +167,7 @@
                 <th>Ortschaft</th>
                 <th>Straße</th>
                 <th>Hausnummer</th>
+                <th>Stiege</th>
                 <th>Wohneinheiten</th>
                 <th>GDA-Eigenschaft</th>
                 <th>Rollout Jahr</th>
@@ -184,6 +185,7 @@
                 <td><?=$address->ortschaft->name?></td>
                 <td><?=$address->strasse->name?></td>
                 <td><?=$address->hausnummer?></td>
+                <td><?=$address->stiege?></td>
                 <td><?=count($address->wohneinheiten)?></td>
                 <td><?=$address->gdaeigenschaft?></td>
                 <td><?=$address->rollout?></td>

Layout/default/Preorder/Index.php

@@ -277,7 +277,7 @@
                 <?php elseif($preorder->adb_hausnummer_id): ?>
                 <td <?=($preorder->address_created) ? "class='alert-warning' title='Adresse manuell angelegt'" : ""?>">
                   <?=$preorder->adb_hausnummer->strasse->name?>
-                  <?=$preorder->adb_hausnummer->hausnummer?><br />
+                  <?=$preorder->adb_hausnummer->hausnummer?><?=($preorder->adb_hausnummer->stiege) ? "/".$preorder->adb_hausnummer->stiege : ""?><br />
                   <?=($preorder->adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."<br />" : "") : "<i class='text-pink'>&lt;keine Wohneinheit&gt;</i><br />"?>
                   <?=$preorder->adb_hausnummer->plz->plz?>
                   <?=$preorder->adb_hausnummer->ortschaft->name?><br />