diff --git a/Layout/default/ADBWohneinheit/Form.php b/Layout/default/ADBWohneinheit/Form.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/Layout/default/ADBWohneinheit/Form.php @@ -0,0 +1 @@ + +
+ +
+ + + + + +
+
+
diff --git a/Layout/default/AddressDB/export.csv.php b/Layout/default/AddressDB/export.csv.php index c6f3f7979..a675dfeac 100644 --- a/Layout/default/AddressDB/export.csv.php +++ b/Layout/default/AddressDB/export.csv.php @@ -3,7 +3,7 @@ ob_end_flush(); header("Content-type: text/csv"); header('Content-disposition: attachment; filename="addressdb-export-'.date('Y-m-d_H-i-s').'.csv"'); ?> -AddressDB_ID;Extref;Adrcd;OAID;Netzgebiet_Extref;Netzgebiet;GKZ;Gemeinde;OKZ;Ortschaft;PLZ;SKZ;Strasse;Hausnummer;Grundstueck;GPS Breite; GPS Laenge;Rollout;Rollout_Info;Freigabe;Nutzungseinheiten +AddressDB_ID;Extref;Adrcd;OAID;Netzgebiet_Extref;Netzgebiet;GKZ;Gemeinde;OKZ;Ortschaft;PLZ;SKZ;Strasse;Hausnummer;Grundstueck;GPS Breite; GPS Laenge;Rollout;Rollout_Info;Freigabe;Nutzungseinheiten;GDA-Eingenschaft;Meridian;RW;HW unit_count; ?> -id?>;"extref?>";adrcd?>;"oaid?>";"extref?>";"name?>";kennziffer?>;"name?>";kennziffer?>;"name?>";"plz?>";kennziffer?>;"name?>";"hausnummer?>";"grund_nr?>";gps_lat?>;gps_long?>;rollout?>;"rollout_info?>";"";; +id?>;"extref?>";adrcd?>;"oaid?>";"extref?>";"name?>";kennziffer?>;"name?>";kennziffer?>;"name?>";"plz?>";kennziffer?>;"name?>";"hausnummer?>";"grund_nr?>";gps_lat?>;gps_long?>;rollout?>;"rollout_info?>";"";;"gdaeigenschaft?>";"meridian?>";rw?>;hw?> + id; $hausnummer_data['hausnummer'] = $data['hausnummer']; $hausnummer_data['grund_nr'] = $data['grund_nr']; + $hausnummer_data['gdaeigenschaft'] = $data['gdaeigenschaft']; $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 c537645ee..2e1a63f5b 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','gps_lat','gps_long','unit_count'] as $field) { + foreach(['adrcd','extref','netzgebiet_id','strasse','hausnummer','plz','ortschaft','gemeinde','grund_nr','gdaeigenschaft','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");