Merge branch 'spidev' into 'master'

Qgis Preorder sync um Felder erweitert und in ADB verlinkt

See merge request fronk/thetool!2035

scripts/fiberplan/sync_preorder_qgis.php

@@ -202,6 +202,21 @@ SQL;
             continue;
         }
 
+        $block = $po->adb_block ?? null;
+        $stiege = $po->adb_stiege ?? null;
+        $stock = $po->adb_stock ?? null;
+        $tuer = $po->adb_tuer ?? null;
+
+        if (!empty($po->adb_wohneinheit_id)) {
+            $wohneinheit = new ADBWohneinheit($po->adb_wohneinheit_id);
+            if ($wohneinheit->id) {
+                $block = $wohneinheit->block;
+                $stiege = $wohneinheit->stiege;
+                $stock = $wohneinheit->stock;
+                $tuer = $wohneinheit->tuer;
+            }
+        }
+
         $latVal = str_replace(',', '.', $gps_lat);
         $lonVal = str_replace(',', '.', $gps_long);
 
@@ -211,10 +226,10 @@ SQL;
             ':type_label' => $po->type_label,
             ':strasse' => $po->adb_strasse,
             ':hausnummer' => $po->adb_hausnummer,
-            ':block' => $po->block,
+            ':block' => $block,
-            ':stiege' => $po->stiege,
+            ':stiege' => $stiege,
-            ':stock' => $po->stock,
+            ':stock' => $stock,
-            ':tuer' => $po->tuer,
+            ':tuer' => $tuer,
             ':plz' => $po->adb_plz,
             ':ort' => $po->adb_ort,
             ':company' => $po->company,