Building/Form: pop is updated when network is changed

application/Building/BuildingController.php

@@ -24,6 +24,8 @@ class BuildingController extends mfBaseController {
     $this->layout()->set("networks", NetworkModel::getAll());
     $this->layout()->set("types", BuildingtypeModel::getAll());
     $this->layout()->set("statuses", BuildingstatusModel::getAll());
+    $this->layout()->set("pipeworkers", AddressModel::search(["addresstype" => ["pipeworker"]]));
+    $this->layout()->set("lineworkers", AddressModel::search(["addresstype" => ["lineworker"]]));
   }
   
   protected function editAction() {
@@ -70,6 +72,7 @@ class BuildingController extends mfBaseController {
     $data['type_id'] = $r->type_id;
     $data['status_id'] = ($r->status_id) ? $r->status_id : null;
     $data['pipeworker_id'] = ($r->pipeworker_id) ? $r->pipeworker_id : null;
+    $data['lineworker_id'] = ($r->lineworker_id) ? $r->lineworker_id : null;
     
     $data['oan_id'] = $r->oan_id;
     $data['street'] = $r->street;
@@ -118,6 +121,7 @@ class BuildingController extends mfBaseController {
         'street' => $building->street
       ];
       $coords = Gmaps_Geocoding::getCoords($search);
+      
       if(is_array($coords) && count($coords) == 2) {
         $building->gps_lat = str_replace(",",".",$coords[0]);
         $building->gps_long = str_replace(",",".",$coords[1]);

application/Pop/PopController.php

@@ -72,8 +72,8 @@ class PopController extends mfBaseController {
     $data = [];
     $data['network_id'] = $r->network_id;
     $data['name'] = $r->name;
-    $data['gps_lat'] = $r->gps_lat;
-    $data['gps_long'] = $r->gps_long;
+    $data['gps_lat'] = ($r->gps_lat) ? $r->gps_lat : null;
+    $data['gps_long'] = ($r->gps_long) ? $r->gps_long : null;
     $data['location'] = $r->location;
     $data['vlan_public'] = ($r->vlan_public) ? $r->vlan_public : null;
     $data['vlan_nat'] = ($r->vlan_nat) ? $r->vlan_nat: null;
@@ -101,4 +101,44 @@ class PopController extends mfBaseController {
     $this->layout()->setFlash("Netzgebiet erfolgreich gespeichert.", "success");
     $this->redirect("Network", "Index", [], "view=pops&net=".$pop->network_id);
   }
+  
+  protected function apiAction() {
+    $do = $this->request->do;
+    $data = [];
+    
+    switch($do) {
+      case "getPops":
+        $return = $this->getPopsApi();
+        break;
+      default:
+        $return = false;
+    }
+    
+    if(!is_array($return) || !count($return)) {
+      $data = ["status" => "error"];
+      $this->returnJson($data);
+    }
+    $data['status'] = "OK";
+    $data['result'] = $return;
+    $this->returnJson($data);
+  }
+  
+  private function getPopsApi() {
+    $network_id = $this->request->network_id;
+    if(!is_numeric($network_id) || $network_id < 1) {
+      return false;
+    }
+    
+    $network = new Network($network_id);
+    if(!$network->id) {
+      return false;
+    }
+    
+    $pops = [];
+    foreach($network->pops as $pop) {
+      $pops[$pop->id] = $pop->name;
+    }
+    
+    return ["pops" => $pops];
+  }
 }