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

Merge branch 'spidev' into 'master'

Browse Source 
Pop Updates

See merge request fronk/thetool!1953
This commit is contained in:
Daniel Spitzer
2025-12-14 19:00:42 +00:00
parent ce1cdb0c53 81fe058e3e
commit 12a7598447
6 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/Pop/PopController.php
View File

@@ -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;

9
application/Pop/PopModel.php
View File

@@ -3,6 +3,7 @@
class PopModel
{
public $name = null;
public $category=null;
public $network_id = null;
public $gps_lat = null;
public $gps_long = null;
@@ -30,6 +31,14 @@ class PopModel
5 => "von Techniker abgenommen (Altbestand)",
];
public static $categoryArray = [
1 => array('name' => 'Outdoor', 'comment' => 'Kasten/Schrank'),
2 => array('name' => 'Indoor', 'comment' => 'Keller Gebäude'),
3 => array('name' => 'Sender/Funk', 'comment' => 'Sendemast'),
4 => array('name' => 'Container', 'comment' => 'Garage, Container')
];
public static function find($data)
{