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

Merge branch 'fronkdev' into 'master'

Browse Source 
Added RML Import & subcd

See merge request fronk/thetool!212
This commit is contained in:
Frank Schubert
2024-02-05 11:40:37 +00:00
parent c7c16830f7 f25170e398
commit d064de4f90
15 changed files with 465 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/ADBHausnummer/ADBHausnummer.php
View File

@@ -1,7 +1,7 @@
<?php
class ADBHausnummer extends mfBaseModel {
protected $forcestr = ["oaid","adrcd","subcd","extref","hausnummer","zusatz","grund_nr","gdaeigenschaft","meridian","rollout_info","rimo_fcp_name"];
protected $forcestr = ["oaid","adrcd","extref","hausnummer","zusatz","grund_nr","gdaeigenschaft","meridian","rollout_info","rimo_fcp_name"];
private $netzgebiet;
private $ortschaft;
private $strasse;

10
application/ADBHausnummer/ADBHausnummerModel.php
View File

@@ -3,6 +3,7 @@
class ADBHausnummerModel {
public $oaid;
public $adrcd;
public $subcd;
public $netzgebiet_id;
public $extref;
public $ortschaft_id;
@@ -179,6 +180,15 @@ class ADBHausnummerModel {
}
}
if(array_key_exists("subcd", $filter)) {
$subcd = FronkDB::singleton()->escape($filter['subcd']);
if($subcd === false || $subcd === null) {
$where .= " AND (Hausnummer.`subcd` IS NULL OR Hausnummer.`subcd` = 0)";
}
if($subcd) {
$where .= " AND Hausnummer.`subcd` = $subcd";
}
}
if(array_key_exists("oaid", $filter)) {
$oaid = FronkDB::singleton()->escape($filter['oaid']);

15
application/AddressDB/AddressDB.php
View File

@@ -23,6 +23,7 @@ class AddressDB {
`Hausnummer`.`id` AS `hausnummer_id`,
`Hausnummer`.`oaid` AS `oaid`,
`Hausnummer`.`adrcd` AS `adrcd`,
`Hausnummer`.`subcd` AS `subcd`,
`Hausnummer`.`oaid` AS `hausnummer_oaid`,
`Hausnummer`.`hausnummer` AS `hausnummer`,
`Hausnummer`.`extref` AS `hausnummer_extref`,
@@ -230,6 +231,20 @@ class AddressDB {
$me = new User();
$me->loadMe();
$adrcd = null;
$subcd = null;
if(array_key_exists("adrcd", $data) && $data["adrcd"]) {
$adr = trim($data["adrcd"]);
$adr_parts = explode("-", $adr);
if(count($adr_parts)) {
$adrcd = $adr_parts[0];
if(array_key_exists(1, $adr_parts)) {
$subcd = $adr_parts[1];
}
}
}
// build hausnummer data
//$hausnummer_data['oaid'] = (array_key_exists("oaid", $data) && $data['oaid']) ? $data['oaid'] : null;
$hausnummer_data['adrcd'] = ($data['adrcd']) ? $data['adrcd'] : null;