Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added meridian/rw/hw to AddressDB/Form

Browse Source
This commit is contained in:
Frank Schubert
2023-03-16 15:28:26 +01:00
parent 9d015de8fd
commit a27d7a7418
8 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Layout/default/AddressDB/Form.php
View File

@@ -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">

2
Layout/default/AddressDB/Index.php
View File

@@ -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;">

13
Layout/default/Contractconfiggroup/Index.php
View File

@@ -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>

1
application/ADBHausnummer/ADBHausnummer.php
View File

@@ -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;

16
application/AddressDB/AddressDB.php
View File

@@ -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;

5
application/AddressDB/AddressDBController.php
View File

@@ -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();

1
application/ContractconfigItem/ContractconfigItemController.php
View File

@@ -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'] = "";

1
application/ContractconfigItem/ContractconfigItemModel.php
View File

@@ -4,6 +4,7 @@ class ContractconfigItemModel {
public $order;
public $contractconfiggroup_id;
public $type;
public $multiple;
public $name;
public $displayname;
public $description;