fixed camera types

app/Http/Business/CameraTypesBusiness.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Business;
+
+use Luticate\Utils\LuBusiness;
+use App\Http\DataAccess\CameraTypesDataAccess;
+use App\Http\DBO\CameraTypesDbo;
+
+class CameraTypesBusiness extends LuBusiness {
+    protected static function getDataAccess()
+    {
+        return new CameraTypesDataAccess();
+    }
+}

app/Http/Business/CamerasBusiness.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Business;
 
-use App\Http\DataAccess\Models\EntityTypes;
 use Luticate\Utils\LuBusiness;
 use App\Http\DataAccess\CamerasDataAccess;
 use App\Http\DBO\CamerasDbo;
@@ -23,10 +22,7 @@ class CamerasBusiness extends LuBusiness {
             self::badInput("Missing camera name");
         }
         HostsBusiness::getById($camera->getHostId());
-        $type = EntityTypesBusiness::getById($camera->getEntityTypeId());
-        if ($type->getType() != EntityTypesBusiness::ENTITY_CAMERA) {
-            self::badInput("Bad camera type");
-        }
+        CameraTypesBusiness::getById($camera->getCameraTypeId());
         if (is_null($camera->getDescription())) {
             $camera->setDescription("");
         }

app/Http/Business/EntityTypesBusiness.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Business;
-
-use Luticate\Utils\LuBusiness;
-use App\Http\DataAccess\EntityTypesDataAccess;
-use App\Http\DBO\EntityTypesDbo;
-
-class EntityTypesBusiness extends LuBusiness {
-    const ENTITY_CAMERA = 1;
-
-    protected static function getDataAccess()
-    {
-        return new EntityTypesDataAccess();
-    }
-
-    public static function getAllForType($type)
-    {
-        return EntityTypesDataAccess::getAllForType($type);
-    }
-}

app/Http/Business/SensorsBusiness.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Business;
+
+use Luticate\Utils\LuBusiness;
+use App\Http\DataAccess\SensorsDataAccess;
+use App\Http\DBO\SensorsDbo;
+
+class SensorsBusiness extends LuBusiness {
+    protected static function getDataAccess()
+    {
+        return new SensorsDataAccess();
+    }
+}

app/Http/Controller/CamerasController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controller;
 
-use App\Http\Business\EntityTypesBusiness;
+use App\Http\Business\CameraTypesBusiness;
 use Luticate\Utils\LuController;
 use App\Http\Business\CamerasBusiness;
 use App\Http\DBO\CamerasDbo;
@@ -16,11 +16,14 @@ class CamerasController extends LuController {
 
     /**
      * Get all camera types
+     * @param int $page The page number, 0 based
+     * @param int $perPage The number of items per page
+     * @param string $query The filter query
      * @return LuMultipleDbo
      */
-    public function getAllTypes()
+    public function getAllTypes($page = 0, $perPage = PHP_INT_MAX, $query = "")
     {
-        return EntityTypesBusiness::getAllForType(EntityTypesBusiness::ENTITY_CAMERA);
+        return CameraTypesBusiness::getAll($page, $perPage, $query);
     }
 
     /**

app/Http/Controller/SensorsController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controller;
+
+use Luticate\Utils\LuController;
+use App\Http\Business\SensorsBusiness;
+use App\Http\DBO\SensorsDbo;
+
+class SensorsController extends LuController {
+    protected function getBusiness()
+    {
+        return new SensorsBusiness();
+    }
+}

app/Http/DBO/EntityTypesDbo.php → app/Http/DBO/CameraTypesDbo.php

@@ -9,7 +9,7 @@ namespace App\Http\DBO;
 
 use Luticate\Utils\LuDbo;
 
-class EntityTypesDbo extends LuDbo {
+class CameraTypesDbo extends LuDbo {
 
     public function jsonSerialize()
     {
@@ -17,14 +17,13 @@ class EntityTypesDbo extends LuDbo {
             "Id" => $this->_id,
             "Name" => $this->_name,
             "Class" => $this->_class,
-            "DefaultData" => $this->_defaultData,
-            "Type" => $this->_type
+            "DefaultData" => $this->_defaultData
         );
     }
 
     public static function jsonDeserialize($json)
     {
-        $dbo = new EntityTypesDbo();
+        $dbo = new CameraTypesDbo();
         if (isset($json["Id"])) {
             $dbo->setId($json["Id"]);
         }
@@ -37,20 +36,16 @@ class EntityTypesDbo extends LuDbo {
         if (isset($json["DefaultData"])) {
             $dbo->setDefaultData($json["DefaultData"]);
         }
-        if (isset($json["Type"])) {
-            $dbo->setType($json["Type"]);
-        }
         return $dbo;
     }
 
     public static function generateSample()
     {
-        $dbo = new EntityTypesDbo();
+        $dbo = new CameraTypesDbo();
         $dbo->setId(42);
         $dbo->setName("sample string");
         $dbo->setClass("sample string");
         $dbo->setDefaultData("sample string");
-        $dbo->setType(42);
         return $dbo;
     }
 
@@ -105,17 +100,4 @@ class EntityTypesDbo extends LuDbo {
     {
         $this->_defaultData = $value;
     }
-
-    /**
-     * @var integer
-     */
-    protected $_type;
-    public function getType()
-    {
-        return $this->_type;
-    }
-    public function setType($value)
-    {
-        $this->_type = $value;
-    }
 }

app/Http/DBO/CamerasDbo.php

@@ -18,7 +18,7 @@ class CamerasDbo extends LuDbo {
             "Name" => $this->_name,
             "Description" => $this->_description,
             "HostId" => $this->_hostId,
-            "EntityTypeId" => $this->_entityTypeId,
+            "CameraTypeId" => $this->_cameraTypeId,
             "Data" => $this->_data
         );
     }
@@ -38,8 +38,8 @@ class CamerasDbo extends LuDbo {
         if (isset($json["HostId"])) {
             $dbo->setHostId($json["HostId"]);
         }
-        if (isset($json["EntityTypeId"])) {
-            $dbo->setEntityTypeId($json["EntityTypeId"]);
+        if (isset($json["CameraTypeId"])) {
+            $dbo->setCameraTypeId($json["CameraTypeId"]);
         }
         if (isset($json["Data"])) {
             $dbo->setData($json["Data"]);
@@ -54,7 +54,7 @@ class CamerasDbo extends LuDbo {
         $dbo->setName("sample string");
         $dbo->setDescription("sample string");
         $dbo->setHostId(42);
-        $dbo->setEntityTypeId(42);
+        $dbo->setCameraTypeId(42);
         $dbo->setData("sample string");
         return $dbo;
     }
@@ -114,14 +114,14 @@ class CamerasDbo extends LuDbo {
     /**
      * @var integer
      */
-    protected $_entityTypeId;
-    public function getEntityTypeId()
+    protected $_cameraTypeId;
+    public function getCameraTypeId()
     {
-        return $this->_entityTypeId;
+        return $this->_cameraTypeId;
     }
-    public function setEntityTypeId($value)
+    public function setCameraTypeId($value)
     {
-        $this->_entityTypeId = $value;
+        $this->_cameraTypeId = $value;
     }
 
     /**

app/Http/DBO/SensorsDbo.php

@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ */
+
+namespace App\Http\DBO;
+
+use Luticate\Utils\LuDbo;
+
+class SensorsDbo extends LuDbo {
+
+    public function jsonSerialize()
+    {
+        return array(
+            "Id" => $this->_id,
+            "Name" => $this->_name,
+            "Description" => $this->_description,
+            "HostId" => $this->_hostId,
+            "EntityTypeId" => $this->_entityTypeId,
+            "Data" => $this->_data
+        );
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new SensorsDbo();
+        if (isset($json["Id"])) {
+            $dbo->setId($json["Id"]);
+        }
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["Description"])) {
+            $dbo->setDescription($json["Description"]);
+        }
+        if (isset($json["HostId"])) {
+            $dbo->setHostId($json["HostId"]);
+        }
+        if (isset($json["EntityTypeId"])) {
+            $dbo->setEntityTypeId($json["EntityTypeId"]);
+        }
+        if (isset($json["Data"])) {
+            $dbo->setData($json["Data"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new SensorsDbo();
+        $dbo->setId(42);
+        $dbo->setName("sample string");
+        $dbo->setDescription("sample string");
+        $dbo->setHostId(42);
+        $dbo->setEntityTypeId(42);
+        $dbo->setData("sample string");
+        return $dbo;
+    }
+
+    /**
+     * @var integer
+     */
+    protected $_id;
+    public function getId()
+    {
+        return $this->_id;
+    }
+    public function setId($value)
+    {
+        $this->_id = $value;
+    }
+
+    /**
+     * @var string
+     */
+    protected $_name;
+    public function getName()
+    {
+        return $this->_name;
+    }
+    public function setName($value)
+    {
+        $this->_name = $value;
+    }
+
+    /**
+     * @var string
+     */
+    protected $_description;
+    public function getDescription()
+    {
+        return $this->_description;
+    }
+    public function setDescription($value)
+    {
+        $this->_description = $value;
+    }
+
+    /**
+     * @var integer
+     */
+    protected $_hostId;
+    public function getHostId()
+    {
+        return $this->_hostId;
+    }
+    public function setHostId($value)
+    {
+        $this->_hostId = $value;
+    }
+
+    /**
+     * @var integer
+     */
+    protected $_entityTypeId;
+    public function getEntityTypeId()
+    {
+        return $this->_entityTypeId;
+    }
+    public function setEntityTypeId($value)
+    {
+        $this->_entityTypeId = $value;
+    }
+
+    /**
+     * @var text
+     */
+    protected $_data;
+    public function getData()
+    {
+        return $this->_data;
+    }
+    public function setData($value)
+    {
+        $this->_data = $value;
+    }
+}

app/Http/DataAccess/CameraTypesDataAccess.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\DataAccess;
+
+use Luticate\Utils\LuDataAccess;
+use App\Http\DataAccess\Models\CameraTypes;
+use App\Http\DBO\CameraTypesDbo;
+
+class CameraTypesDataAccess extends LuDataAccess {
+    protected static function getModel()
+    {
+        return new CameraTypes();
+    }
+
+    protected static function getOrderBy()
+    {
+        return array(array("name", "ASC"));
+    }
+}

app/Http/DataAccess/EntityTypesDataAccess.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\DataAccess;
-
-use Luticate\Utils\LuDataAccess;
-use App\Http\DataAccess\Models\EntityTypes;
-use App\Http\DBO\EntityTypesDbo;
-
-class EntityTypesDataAccess extends LuDataAccess {
-    protected static function getModel()
-    {
-        return new EntityTypes();
-    }
-
-    protected static function getOrderBy()
-    {
-        return array(array("name", "ASC"));
-    }
-
-    public static function getAllForType($type)
-    {
-        return self::getMultiple(array(array("type", "=", $type)), self::getOrderBy());
-    }
-}

app/Http/DataAccess/Models/CameraTypes.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\DataAccess\Models;
+
+use App\Http\DBO\CameraTypesDbo;
+
+class CameraTypes extends CameraTypesModel
+{
+}

app/Http/DataAccess/Models/EntityTypesModel.php → app/Http/DataAccess/Models/CameraTypesModel.php

@@ -4,16 +4,16 @@
  * AUTO GENERATED BY LUTICATE GENERATOR
  * ANY CHANGES WILL BE OVERWRITTEN
  * DO NOT DIRECTLY USE THIS FILE
- * USE EntityTypes.php
+ * USE CameraTypes.php
  * TO MAKE YOUR CHANGES AND DATABASE ACCESS
 */
 
 namespace App\Http\DataAccess\Models;
 
 use Luticate\Utils\LuModel;
-use App\Http\DBO\EntityTypesDbo;
+use App\Http\DBO\CameraTypesDbo;
 
-class EntityTypesModel extends LuModel
+class CameraTypesModel extends LuModel
 {
     function __construct()
     {
@@ -23,32 +23,30 @@ class EntityTypesModel extends LuModel
 
     public function toDbo()
     {
-        $dbo = new EntityTypesDbo();
+        $dbo = new CameraTypesDbo();
 
         $dbo->setId($this->id);
         $dbo->setName($this->name);
         $dbo->setClass($this->class);
         $dbo->setDefaultData($this->default_data);
-        $dbo->setType($this->type);
 
         return $dbo;
     }
 
     /**
-     * @param $dbo EntityTypesDbo
+     * @param $dbo CameraTypesDbo
      * @param $model LuModel|null
-     * @return EntityTypes
+     * @return CameraTypes
      */
     public function fromDbo($dbo, $model = null)
     {
         if (is_null($model))
-            $model = new EntityTypes();
+            $model = new CameraTypes();
 
         $model->id = $dbo->getId();
         $model->name = $dbo->getName();
         $model->class = $dbo->getClass();
         $model->default_data = $dbo->getDefaultData();
-        $model->type = $dbo->getType();
 
         return $model;
     }

app/Http/DataAccess/Models/CamerasModel.php

@@ -29,7 +29,7 @@ class CamerasModel extends LuModel
         $dbo->setName($this->name);
         $dbo->setDescription($this->description);
         $dbo->setHostId($this->host_id);
-        $dbo->setEntityTypeId($this->entity_type_id);
+        $dbo->setCameraTypeId($this->camera_type_id);
         $dbo->setData($this->data);
 
         return $dbo;
@@ -49,7 +49,7 @@ class CamerasModel extends LuModel
         $model->name = $dbo->getName();
         $model->description = $dbo->getDescription();
         $model->host_id = $dbo->getHostId();
-        $model->entity_type_id = $dbo->getEntityTypeId();
+        $model->camera_type_id = $dbo->getCameraTypeId();
         $model->data = $dbo->getData();
 
         return $model;

app/Http/DataAccess/Models/EntityTypes.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Http\DataAccess\Models;
-
-use App\Http\DBO\EntityTypesDbo;
-
-class EntityTypes extends EntityTypesModel
-{
-}

app/Http/DataAccess/Models/Sensors.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\DataAccess\Models;
+
+use App\Http\DBO\SensorsDbo;
+
+class Sensors extends SensorsModel
+{
+}

app/Http/DataAccess/Models/SensorsModel.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ * DO NOT DIRECTLY USE THIS FILE
+ * USE Sensors.php
+ * TO MAKE YOUR CHANGES AND DATABASE ACCESS
+*/
+
+namespace App\Http\DataAccess\Models;
+
+use Luticate\Utils\LuModel;
+use App\Http\DBO\SensorsDbo;
+
+class SensorsModel extends LuModel
+{
+    function __construct()
+    {
+        parent::__construct();
+        $this->timestamps = false;
+    }
+
+    public function toDbo()
+    {
+        $dbo = new SensorsDbo();
+
+        $dbo->setId($this->id);
+        $dbo->setName($this->name);
+        $dbo->setDescription($this->description);
+        $dbo->setHostId($this->host_id);
+        $dbo->setEntityTypeId($this->entity_type_id);
+        $dbo->setData($this->data);
+
+        return $dbo;
+    }
+
+    /**
+     * @param $dbo SensorsDbo
+     * @param $model LuModel|null
+     * @return Sensors
+     */
+    public function fromDbo($dbo, $model = null)
+    {
+        if (is_null($model))
+            $model = new Sensors();
+
+        $model->id = $dbo->getId();
+        $model->name = $dbo->getName();
+        $model->description = $dbo->getDescription();
+        $model->host_id = $dbo->getHostId();
+        $model->entity_type_id = $dbo->getEntityTypeId();
+        $model->data = $dbo->getData();
+
+        return $model;
+    }
+}

app/Http/DataAccess/SensorsDataAccess.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\DataAccess;
+
+use Luticate\Utils\LuDataAccess;
+use App\Http\DataAccess\Models\Sensors;
+use App\Http\DBO\SensorsDbo;
+
+class SensorsDataAccess extends LuDataAccess {
+    protected static function getModel()
+    {
+        return new Sensors();
+    }
+}

app/Http/routes.php

@@ -27,4 +27,6 @@ $route->get("/cameras", "Cameras", "getAll", CamotionPermissions::CAMERA_GET);
 $route->get("/cameras/$camera_id", "Cameras", "get", CamotionPermissions::CAMERA_GET);
 $route->post("/cameras/add", "Cameras", "add", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_ADD));
 $route->post("/cameras/$camera_id/edit", "Cameras", "edit", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_EDIT));
-$route->post("/cameras/$camera_id/del", "Cameras", "del", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_DEL));
+$route->post("/cameras/$camera_id/del", "Cameras", "del", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_DEL));
+
+//sleep(1);

generate.php

@@ -47,7 +47,7 @@ $gen->setConfig(array("dbo" =>
             "/^sp_lu_.*/"
         ),
         "controllers" => array(
-            "/^EntityTypesController$/"
+            "/^CameraTypesController$/"
         )
     )
 ));