Pop Updates

* Kategorie wurde hinzugefügt
* beim Bearbeiten von der Vue Table kommt man beim Speichern und Abbrechen nun wieder in die Pop Übersicht

application/Pop/PopController.php

@@ -30,6 +30,7 @@ class PopController extends mfBaseController
             return [
                 "id" => $pop->id,
                 "name" => $pop->name,
+                "category" => $pop->category,
                 "networkArea" => $pop->networks,
                 "location" => $pop->location,
                 "state" => $pop->state,
@@ -94,7 +95,9 @@ class PopController extends mfBaseController
         $this->layout()->set("cables_json", json_encode($cables_json));
         $popnetwork = PopNetworkModel::getbyPopid($id);
         $stateArray = PopModel::$stateArray;
+        $categoryArray=PopModel::$categoryArray;
         $this->layout()->set("stateArray", $stateArray);
+        $this->layout()->set("categoryArray", $categoryArray);
         $this->layout()->set("popnetwork", implode(', ', $popnetwork['name']));
         $this->layout()->set("popnetwork_ids", json_encode($popnetwork['network_id']));
         $this->layout()->setTemplate("Pop/Detail");
@@ -1105,7 +1108,9 @@ class PopController extends mfBaseController
     protected function addAction()
     {
         $stateArray = PopModel::$stateArray;
+        $categoryArray=PopModel::$categoryArray;
         $this->layout()->set("stateArray", $stateArray);
+        $this->layout()->set("categoryArray", $categoryArray);
         $this->layout()->setTemplate("Pop/Form");
         $this->layout()->set("networks", NetworkModel::getAll());
 
@@ -1166,6 +1171,7 @@ class PopController extends mfBaseController
 
 
         $data['name'] = $r->name;
+        $data['category']=$r->category;
         $data['gps_lat'] = ($r->gps_lat) ? $r->gps_lat : null;
         $data['gps_long'] = ($r->gps_long) ? $r->gps_long : null;
         $data['location'] = $r->location;