From a27d7a74180120a539818f7ee15d19cfca9e1e65 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 16 Mar 2023 15:28:26 +0100
Subject: [PATCH] Added meridian/rw/hw to AddressDB/Form

---
 Layout/default/AddressDB/Form.php             | 33 +++++++++++++++++++
 Layout/default/AddressDB/Index.php            |  2 ++
 Layout/default/Contractconfiggroup/Index.php  | 13 ++++++--
 application/ADBHausnummer/ADBHausnummer.php   |  1 +
 application/AddressDB/AddressDB.php           | 16 +++++++++
 application/AddressDB/AddressDBController.php |  5 ++-
 .../ContractconfigItemController.php          |  1 +
 .../ContractconfigItemModel.php               |  1 +
 8 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/Layout/default/AddressDB/Form.php b/Layout/default/AddressDB/Form.php
index 02f501251..6c8b09958 100644
--- a/Layout/default/AddressDB/Form.php
+++ b/Layout/default/AddressDB/Form.php
@@ -186,6 +186,39 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="meridian">Meridian</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("meridian", $save_data)): ?>
+                      <input type="text" class="form-control" name="meridian" id="meridian" value="<?=$save_data['meridian']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="meridian" id="meridian" value="<?=$address->meridian?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="rw">RW</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("rw", $save_data)): ?>
+                      <input type="text" class="form-control" name="rw" id="rw" value="<?=$save_data['rw']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="rw" id="rw" value="<?=$address->rw?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="hw">HW</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("hw", $save_data)): ?>
+                      <input type="text" class="form-control" name="hw" id="hw" value="<?=$save_data['hw']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="hw" id="hw" value="<?=$address->hw?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="gps_lat">GPS Breite</label>
                     <div class="col-lg-10">
diff --git a/Layout/default/AddressDB/Index.php b/Layout/default/AddressDB/Index.php
index 7fbdb49c5..9ff99ca42 100644
--- a/Layout/default/AddressDB/Index.php
+++ b/Layout/default/AddressDB/Index.php
@@ -158,6 +158,7 @@
                 <th>Straße</th>
                 <th>Hausnummer</th>
                 <th>Wohneinheiten</th>
+                <th>GDA-Eigenschaft</th>
                 <th>Rollout Jahr</th>
                 <th>Rollout Info</th>
                 <th></th>
@@ -174,6 +175,7 @@
                 <td><?=$address->strasse->name?></td>
                 <td><?=$address->hausnummer?></td>
                 <td><?=count($address->wohneinheiten)?></td>
+                <td><?=$address->gdaeigenschaft?></td>
                 <td><?=$address->rollout?></td>
                 <td><?=$address->rollout_info?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
diff --git a/Layout/default/Contractconfiggroup/Index.php b/Layout/default/Contractconfiggroup/Index.php
index e8686bfcf..a609f595f 100644
--- a/Layout/default/Contractconfiggroup/Index.php
+++ b/Layout/default/Contractconfiggroup/Index.php
@@ -34,7 +34,7 @@
                     <div class="input-group mb-3">
                       <input type="text" class="form-control" name="name" placeholder="Gruppenname..." />
                       <div class="input-group-append">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-plus"></i> Gruppe hinzufügen</button>
+                        <button type="submit" class="btn btn-purple"><i class="fas fa-plus"></i> Gruppe hinzufügen</button>
                       </div>
                     </div>
                   </form>
@@ -113,11 +113,18 @@
                                 <input type="text" class="form-control" id="item_new_<?=$group->id?>_description" name="description" value="" />
                               </div>
                             </div>
+                            
+                            <div class="col-md-4">
+                              <div class="form-group text-center">
+                                <label for="item_<?=$item->id?>_multiple">Mehrfach eintragbar</label>
+                                <input type="checkbox" class="form-control" id="item_<?=$item->id?>_multiple" name="multiple" value="1" <?=($item->multiple) ? "checked='checked'" : ""?> />
+                              </div>
+                            </div>
                           </div>
 
                           <div class="form-group row">
                             <div class="col">
-                              <input type="submit" class="btn btn-primary" value="Speichern" />
+                              <input type="submit" class="btn btn-purple" value="Speichern" />
                             </div>
 
                           </div>
@@ -209,7 +216,7 @@
 
                                 <div class="form-group row">
                                   <div class="col-md-10 float-left">
-                                    <input type="submit" class="btn btn-primary" value="Speichern" />
+                                    <input type="submit" class="btn btn-purple" value="Speichern" />
                                   </div>
                                   <div class="col-md-2 float-right text-right">
                                     <small><a class="text-danger" href="<?=self::getUrl("Contractconfig", "deleteItem", ['id' => $item->id])?>" onclick="if(!confirm('Attribut wirklich löschen?')) return false;"><i class="fas fa-trash-alt"></i> löschen</a></small>
diff --git a/application/ADBHausnummer/ADBHausnummer.php b/application/ADBHausnummer/ADBHausnummer.php
index eceb1d695..c2cb88134 100644
--- a/application/ADBHausnummer/ADBHausnummer.php
+++ b/application/ADBHausnummer/ADBHausnummer.php
@@ -1,6 +1,7 @@
 <?php
 
 class ADBHausnummer extends mfBaseModel {
+  protected $forcestr = ["oaid","adrcd","subcd","extref","hausnummer","zusatz","grund_nr","gdaeigenschaft","meridian","rollout_info","rimo_fcp_name"];
   private $netzgebiet;
   private $ortschaft;
   private $strasse;
diff --git a/application/AddressDB/AddressDB.php b/application/AddressDB/AddressDB.php
index a42a84975..e088abdb1 100644
--- a/application/AddressDB/AddressDB.php
+++ b/application/AddressDB/AddressDB.php
@@ -3,6 +3,9 @@
 class AddressDB {
   private $db;
   private $log;
+  
+  public $validation_error = [];
+  
   public static $wohneinheit_query = "select `Netzgebiet`.`id` AS `netzgebiet_id`,
     `Netzgebiet`.`name` AS `netzgebiet`,
     `Netzgebiet`.`extref` AS `netzgebiet_extref`,
@@ -205,6 +208,19 @@ class AddressDB {
     $hausnummer_data['hausnummer'] = $data['hausnummer'];
     $hausnummer_data['grund_nr'] = $data['grund_nr'];
     $hausnummer_data['gdaeigenschaft'] = $data['gdaeigenschaft'];
+    $hausnummer_data['meridian'] = $data['meridian'];
+    $hausnummer_data['rw'] = ($data['rw']) ? str_replace(",",".", $data['rw']) : null;
+    $hausnummer_data['hw'] = ($data['hw']) ? str_replace(",",".", $data['hw']) : null;
+    
+    if($data['rw'] && !is_numeric($hausnummer_data['rw'])) {
+      $hausnummer_data['rw'] = null;
+      $this->validation_error[] = "RW nicht gespeichert: Keine Zahl";
+    }
+    if($data['hw'] && !is_numeric($hausnummer_data['hw'])) {
+      $hausnummer_data['hw'] = null;
+      $this->validation_error[] = "HW nicht gespeichert: Keine Zahl";
+    }
+    
     $hausnummer_data['gps_lat'] = ($data['gps_lat']) ? str_replace(",", ".", $data['gps_lat']) : null;
     $hausnummer_data['gps_long'] = ($data['gps_long']) ? str_replace(",", ".", $data['gps_long']) : null;
     $hausnummer_data['rollout'] = (trim($data['rollout'])) ? trim($data['rollout']) : null;
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index 2e1a63f5b..de3908f38 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -231,7 +231,7 @@ class AddressDBController extends mfBaseController {
     }
     
     $required = ['netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde'];
-    foreach(['adrcd','extref','netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde','grund_nr','gdaeigenschaft','gps_lat','gps_long','unit_count'] as $field) {
+    foreach(['adrcd','extref','netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde','grund_nr','gdaeigenschaft','meridian','rw','hw','gps_lat','gps_long','unit_count'] as $field) {
       if(in_array($field, $required)) {
         if(!trim($r->$field)) {
           $this->layout()->setFlash("'".ucfirst($field)."' darf nicht leer sein!", "error");
@@ -289,6 +289,9 @@ class AddressDBController extends mfBaseController {
     
     $adb = new AddressDB();
     $hausnummer_id = $adb->createUpdateHausnummer($address_data);
+    if(is_array($adb->validation_error) && count($adb->validation_error)) {
+      $this->layout()->setFlash(implode("<br />\n",$adb->validation_error), "warning");
+    }
     if(!$hausnummer_id) {
       $this->layout()->setFlash("Fehler beim Erstellen der Adresse!", "error");
       return $this->addAction();
diff --git a/application/ContractconfigItem/ContractconfigItemController.php b/application/ContractconfigItem/ContractconfigItemController.php
index eeb1b1f9e..69bbe19d7 100644
--- a/application/ContractconfigItem/ContractconfigItemController.php
+++ b/application/ContractconfigItem/ContractconfigItemController.php
@@ -34,6 +34,7 @@ class ContractconfigItemController extends mfBaseController {
     $item_data['name'] = $r->name;
     $item_data['displayname'] = $r->displayname;
     $item_data['description'] = $r->description;
+    $item_data['multiple'] = ($r->multiple) ? 1 : 0;
     
     $item_data['typedata'] = "";
     $item_data['pattern'] = "";
diff --git a/application/ContractconfigItem/ContractconfigItemModel.php b/application/ContractconfigItem/ContractconfigItemModel.php
index 045ad96c5..a968e1aa6 100644
--- a/application/ContractconfigItem/ContractconfigItemModel.php
+++ b/application/ContractconfigItem/ContractconfigItemModel.php
@@ -4,6 +4,7 @@ class ContractconfigItemModel {
   public $order;
   public $contractconfiggroup_id;
   public $type;
+  public $multiple;
   public $name;
   public $displayname;
   public $description;