From dc56881dddf98a7a91f5405ee933a1331fc697a5 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 13 Jul 2021 23:21:31 +0200
Subject: [PATCH] Rearranged Building/Form

---
 Layout/default/Building/Form.php | 114 ++++++++++++++++---------------
 application/Pop/Pop.php          |   1 +
 2 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/Layout/default/Building/Form.php b/Layout/default/Building/Form.php
index 5125c248a..bae04d3e5 100644
--- a/Layout/default/Building/Form.php
+++ b/Layout/default/Building/Form.php
@@ -34,7 +34,7 @@
                   <input type="hidden" name="id" value="<?=$building->id?>" />
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="network_id">Netzgebiet</label>
+                    <label class="col-lg-2 col-form-label" for="network_id">Netzgebiet *</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="network_id" id="network_id">
                         <option></option>
@@ -45,6 +45,64 @@
                     </div>
                   </div>
                   
+                  
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="type_id">Objekttyp *</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control " name="type_id" id="type_id">
+                        <option></option>
+                        <?php foreach($types as $type): ?>
+                          <option value="<?=$type->id?>" <?=($building->type_id == $type->id) ? "selected='selected'" : ""?>><?=($type->name)?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="units">Wohneinheiten *</label>
+                    <div class="col-lg-10">
+                      <input type="number" class="form-control" name="units" id="units" value="<?=$building->units?>" />
+                    </div>
+                  </div>
+
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="street">Straße *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="street" id="street" value="<?=$building->street?>" />
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="zip">PLZ *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="zip" id="zip" value="<?=$building->zip?>" />
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="city">Ort *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="city" id="city" value="<?=$building->city?>" />
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="code">Objekt ID</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="code" id="code" value="<?=$building->code?>" />
+                    </div>
+                  </div>
+
+
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="oan_id">OAN ID</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="oan_id" id="oan_id" value="<?=$building->oan_id?>" />
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="pop_id">POP</label>
                     <div class="col-lg-10">
@@ -59,53 +117,6 @@
                     </div>
                   </div>
                   
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="type_id">Objekttyp</label>
-                    <div class="col-lg-10">
-                      <select class="select2 form-control " name="type_id" id="type_id">
-                        <option></option>
-                        <?php foreach($types as $type): ?>
-                          <option value="<?=$type->id?>" <?=($building->type_id == $type->id) ? "selected='selected'" : ""?>><?=($type->name)?></option>
-                        <?php endforeach; ?>
-                      </select>
-                    </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="code">Objecktcode</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="code" id="code" value="<?=$building->code?>" />
-                    </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="oan_id">OAN ID</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="oan_id" id="oan_id" value="<?=$building->oan_id?>" />
-                    </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="street">Straße</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="street" id="street" value="<?=$building->street?>" />
-                    </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="zip">PLZ</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="zip" id="zip" value="<?=$building->zip?>" />
-                    </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="city">Ort</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="city" id="city" value="<?=$building->city?>" />
-                    </div>
-                  </div>
-                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="gps_lat">GPS Länge (N)</label>
                     <div class="col-lg-10">
@@ -141,13 +152,6 @@
                     </div>
                   </div>
                   
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="units">Wohneinheiten</label>
-                    <div class="col-lg-10">
-                      <input type="number" class="form-control" name="units" id="units" value="<?=$building->units?>" />
-                    </div>
-                  </div>
-                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="description">Bauabschnitt</label>
                     <div class="col-lg-10">
diff --git a/application/Pop/Pop.php b/application/Pop/Pop.php
index d242218dc..446777a7f 100644
--- a/application/Pop/Pop.php
+++ b/application/Pop/Pop.php
@@ -1,6 +1,7 @@
 <?php
 
 class Pop extends mfBaseModel {
+  protected $forcestr = ['gps_lat','gps_long','vlan_public','vlan_nat','vlan_ipv6'];
   private $network;
   
   public function getProperty($name) {