fixed cameras types

admin/controllers/cameras.controller.js

@@ -4,7 +4,7 @@ angular.module('camotionAdmin')
 
             $scope.foreighLoaded = false;
             $scope.hosts = {};
-            $scope.entityTypes = {};
+            $scope.cameraTypes = {};
 
             $scope.luTable = {
                 columns: [
@@ -19,7 +19,7 @@ angular.module('camotionAdmin')
                         name: "Type",
                         width: 3,
                         getValue: function (item) {
-                            return $scope.entityTypes[item.EntityTypeId].Name;
+                            return $scope.cameraTypes[item.CameraTypeId].Name;
                         }
                     }, {
                         name: "Description",
@@ -51,9 +51,9 @@ angular.module('camotionAdmin')
                         .then(function(cameras)
                         {
                             if (!$scope.foreighLoaded) {
-                                HelperService.getForeignEntities(promise).then(function (data) {
+                                HelperService.getForeignEntities(CamerasService, promise).then(function (data) {
                                     $scope.hosts = data.hosts;
-                                    $scope.entityTypes = data.entityTypes;
+                                    $scope.cameraTypes = data.types;
                                     $scope.foreighLoaded = true;
                                     defer.resolve(cameras);
                                 }, defer.reject);

admin/controllers/modals/cameraedit.controller.js

@@ -17,34 +17,34 @@ angular.module('camotionAdmin')
                     Description: "",
                     Data: null,
                     HostId: null,
-                    EntityTypeId: null
+                    CameraTypeId: null
                 };
                 $scope.permission = "CAMOTION_CAMERA_ADD";
             }
 
             $scope.hosts = {};
-            $scope.entityTypes = {};
+            $scope.cameraTypes = {};
             var promiseLoadForeign = {
                 id: "promiseLoadForeign",
                 groups: ["modal"]
             };
 
-            HelperService.getForeignEntities(promiseLoadForeign).then(function(data)
+            HelperService.getForeignEntities(CamerasService, promiseLoadForeign).then(function(data)
             {
                 $scope.hosts = data.hosts;
-                $scope.entityTypes = data.entityTypes;
+                $scope.cameraTypes = data.types;
                 if ($scope.camera.Id == null) {
                     var keys = Object.keys($scope.hosts);
                     if (keys.length != 0) {
                         $scope.camera.HostId = $scope.hosts[keys[0]].Id;
-                    }keys = Object.keys($scope.entityTypes);
+                    }keys = Object.keys($scope.cameraTypes);
                     if (keys.length != 0) {
-                        $scope.camera.EntityTypeId = $scope.entityTypes[keys[0]].Id;
-                        $scope.setEntityType($scope.entityTypes[keys[0]]);
+                        $scope.camera.CameraTypeId = $scope.cameraTypes[keys[0]].Id;
+                        $scope.setCamerayType($scope.cameraTypes[keys[0]]);
                     }
                 }
                 else if ($scope.camera.Data == null) {
-                    $scope.setEntityType($scope.entityTypes[$scope.camera.EntityTypeId]);
+                    $scope.setCameraType($scope.cameraTypes[$scope.camera.CameraTypeId]);
                 }
             });
 
@@ -74,9 +74,9 @@ angular.module('camotionAdmin')
                 }
             };
 
-            $scope.setEntityType = function(entityType)
+            $scope.setCameraType = function(cameraType)
             {
-                $scope.camera.EntityTypeId = entityType.Id;
-                $scope.camera.Data = JSON.parse($scope.entityTypes[$scope.camera.EntityTypeId].DefaultData);
+                $scope.camera.CameraTypeId = cameraType.Id;
+                $scope.camera.Data = JSON.parse($scope.cameraTypes[$scope.camera.CameraTypeId].DefaultData);
             };
         }]);

admin/views/modals/cameraedit.html

@@ -27,11 +27,11 @@
         <label for="dropdownType" class="col-sm-2 control-label">Type</label>
         <div class="btn-group">
             <button class="btn btn-default dropdown-toggle" type="button" id="dropdownType" data-toggle="dropdown">
-                {{ entityTypes[camera.EntityTypeId].Name }}
+                {{ cameraTypes[camera.CameraTypeId].Name }}
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
-                <li ng-repeat="type in entityTypes"><a ng-click="setEntityType(type)" href="">{{ type.Name }}</a></li>
+                <li ng-repeat="type in cameraTypes"><a ng-click="setCameraType(type)" href="">{{ type.Name }}</a></li>
             </ul>
         </div>
     </div>

sdk/helper.js

@@ -6,11 +6,11 @@
     'use strict';
 
     angular.module('camotionAdmin')
-        .factory('HelperService', ['HostsService', 'CamerasService', '$q', function (HostsService, CamerasService, $q) {
+        .factory('HelperService', ['HostsService', '$q', function (HostsService, $q) {
 
             var HelperService = {};
 
-            HelperService.getForeignEntities = function (promise) {
+            HelperService.getForeignEntities = function (service, promise) {
                 var defer = $q.defer();
                 HostsService.getAll({}, promise).then(function (hosts) {
                     var hostsArray = {};
@@ -18,7 +18,7 @@
                         var host = hosts.Data[i];
                         hostsArray[host.Id] = host;
                     }
-                    CamerasService.getAllTypes(promise).then(function(types)
+                    service.getAllTypes(promise).then(function(types)
                     {
                         var typesArray = {};
                         for (var i = 0; i < types.Data.length; ++i) {
@@ -27,7 +27,7 @@
                         }
                         defer.resolve({
                             hosts: hostsArray,
-                            entityTypes: typesArray
+                            types: typesArray
                         });
                     }, defer.reject);
                 }, defer.reject);