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 
Fixed not creating OAID in rimo-import when requested

See merge request fronk/thetool!913
This commit is contained in:
Frank Schubert
2025-01-15 19:48:30 +00:00
parent ec2912050b dcf3ebbea4
commit 830eb987e4
5 changed files with 80 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/ADBNetzgebiet/ADBNetzgebietModel.php
View File

@@ -57,7 +57,7 @@ class ADBNetzgebietModel {
return null;
}
public static function getAll() {
public static function getAll($indexed_by_id = false) {
$items = [];
$db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
@@ -65,7 +65,12 @@ class ADBNetzgebietModel {
$res = $db->select("Netzgebiet", "*", "1=1 ORDER BY name");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new ADBNetzgebiet($data);
if($indexed_by_id) {
$items[$data->id] = new ADBNetzgebiet($data);
} else {
$items[] = new ADBNetzgebiet($data);
}
}
}
return $items;
@@ -102,7 +107,7 @@ class ADBNetzgebietModel {
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($count)) {
} elseif(is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['count'];
}
}

5
application/Api/v1/AddressdbApicontroller.php
View File

@@ -651,6 +651,7 @@ class AddressdbApicontroller extends mfBaseApicontroller {
}
$addresses = [];
$netzgebiete = ADBNetzgebietModel::getAll(true);
$where = "1=1";
@@ -699,6 +700,10 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if($this->db()->num_rows($res)) {
$tmp_addresses = [];
while($data = $this->db()->fetch_object($res)) {
// never return addresses without OAID if OAID is required in Network
if((!$data->hausnummer_oaid || !$data->wohneinheit_oaid) && $netzgebiete[$data->netzgebiet_id]->unit_create_oaid) continue;
$address_key = $data->hausnummer_id;
if($this->hausnummer_add_zusatz) {
$address_key = $data->hausnummer_id . "-" . $data->zusatz;