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
application/AddressDB/AddressDB.php
+16
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;
application/AddressDB/AddressDBController.php
+4 -1
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();