camera data add/edit

admin/app.js

@@ -9,7 +9,8 @@ var camotion = angular.module('camotionAdmin', [
     'luticateAuth',
     'LocalStorageModule',
     'dialogs.main',
-    'ngSanitize'
+    'ngSanitize',
+    'JSONedit'
 ]);
 
 camotion.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',

admin/controllers/modals/cameraedit.controller.js

@@ -7,6 +7,7 @@ angular.module('camotionAdmin')
         function($scope, CamerasService, data, dialogs, $q, luticateAuthCache, HelperService) {
             if (data != null) {
                 $scope.camera = data;
+                $scope.camera.Data = JSON.parse($scope.camera.Data);
                 $scope.camera.camera_id = $scope.camera.Id;
                 $scope.permission = "CAMOTION_CAMERA_EDIT";
             }
@@ -14,7 +15,7 @@ angular.module('camotionAdmin')
                 $scope.camera = {
                     Name: "",
                     Description: "",
-                    Token: "",
+                    Data: null,
                     HostId: null,
                     EntityTypeId: null
                 };
@@ -39,13 +40,18 @@ angular.module('camotionAdmin')
                     }keys = Object.keys($scope.entityTypes);
                     if (keys.length != 0) {
                         $scope.camera.EntityTypeId = $scope.entityTypes[keys[0]].Id;
+                        $scope.setEntityType($scope.entityTypes[keys[0]]);
                     }
                 }
+                else if ($scope.camera.Data == null) {
+                    $scope.setEntityType($scope.entityTypes[$scope.camera.EntityTypeId]);
+                }
             });
 
             $scope.submitForm = function()
             {
                 if (luticateAuthCache.hasEffectivePermission($scope.permission)) {
+                    $scope.camera.Data = JSON.stringify($scope.camera.Data);
                     if ($scope.camera.Id != null) {
                         var promiseEditCamera = {
                             id: "promiseEditCamera",
@@ -67,4 +73,10 @@ angular.module('camotionAdmin')
                     return defer.promise;
                 }
             };
+
+            $scope.setEntityType = function(entityType)
+            {
+                $scope.camera.EntityTypeId = entityType.Id;
+                $scope.camera.Data = JSON.parse($scope.entityTypes[$scope.camera.EntityTypeId].DefaultData);
+            };
         }]);

admin/index.html

@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
+    <link rel="stylesheet" href="../bower_components/JSONedit/css/styles.css"/>
     <link rel="stylesheet/less" href="css/app.less">
     <!-- endbuild -->
 
@@ -28,6 +29,8 @@
     <script src="../bower_components/luticate-auth/dist/luticate-auth.min.js"></script>
     <script src="../bower_components/angular-dialog-service/dist/dialogs.js"></script>
     <script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
+    <script src="../bower_components/JSONedit/bower_components/angular-ui-sortable/sortable.min.js"></script>
+    <script src="../bower_components/JSONedit/js/directives.js"></script>
 
     <!-- scripts -->
     <script src="app.js"></script>

admin/views/modals/cameraedit.html

@@ -31,8 +31,14 @@
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
-                <li ng-repeat="type in entityTypes"><a ng-click="camera.EntityTypeId = type.Id" href="">{{ type.Name }}</a></li>
+                <li ng-repeat="type in entityTypes"><a ng-click="setEntityType(type)" href="">{{ type.Name }}</a></li>
             </ul>
         </div>
     </div>
+    <div class="form-group">
+        <label for="data" class="col-sm-2 control-label">Data</label>
+        <div class="col-sm-9 jsonView">
+            <json id="data" child="camera.Data" default-collapsed="false" type="object"></json>
+        </div>
+    </div>
 </dialog-ok-cancel>

bower.json

@@ -14,7 +14,8 @@
     "less": "1.7.x",
     "angular-local-storage": "0.2.3",
     "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.x",
-    "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x"
+    "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x",
+    "JSONedit": "json-edit#~0.2.1"
   },
   "resolutions": {
     "angular": "1.4.x"