sensors get values

admin/app.js

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

admin/index.html

@@ -51,6 +51,7 @@
     <script src="controllers/modals/commandedit.controller.js"></script>
 
     <!-- SDK -->
+    <script src="../sdk/sdk.js"></script>
     <script src="../sdk/helper.js"></script>
     <script src="../sdk/hosts.js"></script>
     <script src="../sdk/cameras.js"></script>

admin/views/navbar.html

@@ -25,6 +25,7 @@
                 <ul class="nav navbar-nav navbar-right">
                     <li ng-show="isLogged()"><a ui-sref="home">{{ getUsername() }}</a></li>
                     <li ng-show="isLogged()"><a href="" ng-click="logout()">Logout</a></li>
+                    <li ng-show="!isLogged()"><a href="" ng-click="logout()">Login</a></li>
                 </ul>
             </ul>
         </div>

camotion/app.js

@@ -9,34 +9,65 @@ var camotion = angular.module('camotion', [
     'luticateAuth',
     'LocalStorageModule',
     'dialogs.main',
-    'ngSanitize'
+    'ngSanitize',
+    'camotionSdk'
 ]);
 
 camotion.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
     function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
 
-
-
-        $locationProvider.html5Mode(true);
+        $stateProvider.state('login',{
+            url:'/',
+            templateUrl:'views/login.html',
+            controller:'LoginController'
+        });
 
         $stateProvider.state('home',{
-            url:'/',
+            url:'/home',
             templateUrl:'views/home.html',
-            controller:'HomeController',
-            revolve:{}
+            controller:'HomeController'
+        });
+
+        $stateProvider.state('cameras',{
+            url:'/cameras',
+            templateUrl:'views/cameras.html',
+            controller:'CamerasController'
+        });
+
+        $stateProvider.state('sensors',{
+            url:'/sensors',
+            templateUrl:'views/sensors.html',
+            controller:'SensorsController'
         });
 
-        $stateProvider.state('qcm',{
-            url:'/qcm/{id:int}',
-            templateUrl:'views/qcm.html',
-            controller:'QcmController',
-            resolve:{}
+        $stateProvider.state('commands',{
+            url:'/commands',
+            templateUrl:'views/commands.html',
+            controller:'CommandsController'
         });
 
         $urlRouterProvider.otherwise('/');
 
+        $httpProvider.interceptors.push(['luticateAuthCache', '$injector', '$q',
+            function (luticateAuthCache, $injector, $q) {
+                return {
+                    'request': function (config) {
+                        var token = luticateAuthCache.getToken();
+
+                        if (token != null)
+                            config.headers['X-Authorization'] = token;
+
+                        return config;
+                    },
+                    'responseError': function(rejection) {
+                        return $q.reject(rejection);
+                    }
+                };
+            }]);
+
     }])
-    .run(['$rootScope', '$state',function ($rootScope, $state) {
+    .run(['$rootScope', '$state', 'luticateAuthUsers', function ($rootScope, $state, luticateAuthUsers) {
+        luticateAuthUsers.loadPermissions(null);
         $rootScope.$on('$stateChangeError', function (e, curr, prev) {
             $state.go('login');
         });

camotion/controllers/commands.controller.js

@@ -0,0 +1,76 @@
+angular.module('camotion')
+    .controller('CommandsController', ['$scope', 'CommandsService', 'HelperService', '$q', 'luticateAuthCache',
+        function($scope, CommandsService, HelperService, $q, luticateAuthCache) {
+
+            $scope.foreighLoaded = false;
+            $scope.hosts = {};
+            $scope.commandTypes = {};
+
+            $scope.luTable = {
+                columns: [
+                    {
+                        name: "Name",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Name;
+                        }
+                    },
+                    {
+                        name: "Type",
+                        width: 3,
+                        getValue: function (item) {
+                            return $scope.commandTypes[item.CommandTypeId].Name;
+                        }
+                    }, {
+                        name: "Description",
+                        width: 6,
+                        getValue: function (item) {
+                            return item.Description;
+                        }
+                    }
+                ],
+
+                canAdd: function()
+                {
+                    return luticateAuthCache.hasAllEffectivePermissions([
+                        'CAMOTION_COMMAND_ADD',
+                        'CAMOTION_HOST_GET'
+                    ])
+                },
+
+                canDel: 'CAMOTION_COMMAND_DEL',
+
+                canEdit: function()
+                {
+                    return true;
+                },
+
+                getLoadPagePromise: function (page, perPage, query, promise) {
+                    var defer = $q.defer();
+                    CommandsService.getAll({page: page, perPage: perPage, query: query}, promise)
+                        .then(function(commands)
+                        {
+                            if (!$scope.foreighLoaded) {
+                                HelperService.getForeignEntities(CommandsService, promise).then(function (data) {
+                                    $scope.hosts = data.hosts;
+                                    $scope.commandTypes = data.types;
+                                    $scope.foreighLoaded = true;
+                                    defer.resolve(commands);
+                                }, defer.reject);
+                            }
+                            else {
+                                defer.resolve(commands);
+                            }
+                        }, defer.reject);
+                    return defer.promise;
+                },
+
+                getDelPromise: function (id, promise) {
+                    return CommandsService.del({command_id: id}, promise);
+                },
+
+                getEditController: function () {
+                    return "CommandEdit";
+                }
+            };
+    }]);

camotion/controllers/login.controller.js

@@ -0,0 +1,32 @@
+angular.module('camotion')
+    .controller('LoginController', ['$scope', '$state', 'luticateAuthUsers', 'luticateAuthCache',
+        function($scope, $state, luticateAuthUsers, luticateAuthCache) {
+            $scope.username = "";
+            $scope.password = "";
+            $scope.errorString = null;
+
+            var promiseLogin = {
+                id: "promiseLogin",
+                loaderGroups: ["loginForm"]
+            };
+
+            var user = luticateAuthCache.getUser();
+            if (user != null) {
+                $state.go('home');
+                return;
+            }
+
+            $scope.login = function()
+            {
+                $scope.errorString = null;
+                luticateAuthUsers.login({username: $scope.username, password: $scope.password}, promiseLogin)
+                    .then(function(user)
+                    {
+                        $state.go('home');
+                    }, function(error)
+                    {
+                        $scope.errorString = error.Data;
+                    });
+            };
+        }
+    ]);

camotion/controllers/navbar.controller.js

@@ -0,0 +1,46 @@
+/**
+ * Created by robin on 11/1/15.
+ */
+
+angular.module('camotion')
+    .controller('NavBarController', ['$scope', 'luticateAuthCache', 'luticateAuthUsers', '$state',
+        function($scope, luticateAuthCache, luticateAuthUsers, $state) {
+
+
+            $scope.logout = function()
+            {
+                var promiseLogout = {
+                    id: "promiseLogout",
+                    loaderGroups: ["body"]
+                };
+                luticateAuthUsers.logout(promiseLogout).finally(function()
+                {
+                    $state.go('login');
+                });
+            };
+
+            $scope.isLogged = function()
+            {
+                var user = luticateAuthCache.getUser();
+                return user != null && user.Id != 0;
+            };
+
+            $scope.getUsername = function()
+            {
+                var user = luticateAuthCache.getUser();
+                if (user != null) {
+                    return user.Username;
+                }
+                return "";
+            };
+
+            $scope.canSeeAdmin = function()
+            {
+                return luticateAuthCache.hasOneEffectivePermission([
+                    "LU_USER_GET",
+                    "LU_GROUP_GET",
+                    "LU_PERM_GET",
+                    "CAMOTION_HOST_GET"
+                ]);
+            };
+        }]);

camotion/controllers/sensors.controller.js

@@ -0,0 +1,71 @@
+angular.module('camotion')
+    .controller('SensorsController', ['$scope', 'SensorsService', '$timeout',
+        function($scope, SensorsService, $timeout) {
+
+            $scope.values = {};
+            $scope.interval = 1000;
+
+            $scope.luTable = {
+                columns: [
+                    {
+                        name: "Name",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Name;
+                        }
+                    },{
+                        name: "Description",
+                        width: 7,
+                        getValue: function (item) {
+                            return item.Description;
+                        }
+                    },{
+                        name: "Value",
+                        width: 2,
+                        getValue: function (item) {
+                            return $scope.values[item.Id].value;
+                        }
+                    }
+                ],
+
+                getLoadPagePromise: function (page, perPage, query, promise) {
+                    return SensorsService.getAll({page: page, perPage: perPage, query: query}, promise);
+                },
+
+                onPageChanged: function()
+                {
+                    for (var i in $scope.values) {
+                        $timeout.cancel($scope.values[i].timerId);
+                    }
+                    $scope.values = {};
+                    var items = $scope.luTable.luBasicTableScope.items.Data;
+                    for (i = 0; i < items.length; ++i) {
+                        var item = angular.copy(items[i]);
+                        $scope.values[item.Id] = {
+                            value: 0,
+                            timerId: 0
+                        };
+                        $scope.updateSensor(item);
+                    }
+                }
+            };
+
+            $scope.updateSensor = function(sensor)
+            {
+                SensorsService.getValue({sensor_id: sensor.Id})
+                    .then(function(value) {
+                        if (typeof $scope.values[sensor.Id] != 'undefined') {
+                            $scope.values[sensor.Id] = {
+                                value: value,
+                                timerId: $timeout(function () {
+                                    $scope.updateSensor(sensor);
+                                }, $scope.interval)
+                            }
+                        }
+                    });
+            };
+
+            $scope.$on('$destroy', function(){
+                $scope.values = {};
+            });
+    }]);

camotion/index.html

@@ -33,11 +33,19 @@
     <script src="app.js"></script>
 
     <!-- Controller -->
+    <script src="controllers/login.controller.js"></script>
     <script src="controllers/home.controller.js"></script>
+    <script src="controllers/navbar.controller.js"></script>
+    <script src="controllers/sensors.controller.js"></script>
+    <script src="controllers/commands.controller.js"></script>
 
     <!-- Modal Controller -->
 
     <!-- SDK -->
+    <script src="../sdk/sdk.js"></script>
+    <script src="../sdk/cameras.js"></script>
+    <script src="../sdk/sensors.js"></script>
+    <script src="../sdk/commands.js"></script>
 
     <!-- Directives -->
 
@@ -45,7 +53,7 @@
 
 </head>
 <body>
-<ng-include src="'views/header.html'"></ng-include>
+<ng-include src="'views/navbar.html'"></ng-include>
 <div ui-view></div>
 <ng-include src="'views/footer.html'"></ng-include>
 

camotion/views/commands.html

@@ -0,0 +1,4 @@
+<!-- Page Content -->
+<div class="container">
+    <lu-edit-table options="luTable" class="row col-sm-8 col-sm-offset-2"></lu-edit-table>
+</div>

camotion/views/login.html

@@ -0,0 +1,26 @@
+<!-- Page Content -->
+<div class="container">
+    <div class="row">
+        <div class="col-sm-offset-4 col-sm-4">
+            <h1 class="text-center">Login</h1>
+
+            <form ng-submit="login()" lu-busy="loginForm">
+                <label for="login">Username</label><br />
+                <input id="login" ng-model="username" class="form-control" required/>
+
+                <label for="password">Password</label><br />
+                <input id="password" ng-model="password" type="password" class="form-control" required/>
+
+                <br />
+                <div class="col-sm-12 center-block">
+                    <button type="submit" class="btn btn-default center-block">Login</button>
+                </div>
+
+                <br />
+                <div>
+                    <span class="error" ng-show="errorString != null">{{ errorString }}</span>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

camotion/views/header.html → camotion/views/navbar.html

@@ -1,6 +1,6 @@
 <body>
 <!-- Navigation -->
-<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation" ng-controller="NavBarController">
     <div class="container">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
@@ -14,13 +14,18 @@
         </div>
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-left">
+                <li><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET">Cameras</a></li>
+                <li><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET">Sensors</a></li>
+                <li><a ui-sref="commands" lu-show-permission="CAMOTION_COMMAND_GET">Commands</a></li>
+                <li><a href="/admin" ng-show="canSeeAdmin()">Administration</a></li>
+            </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li>
-                    <a href="#">A propos</a>
-                </li>
-                <li>
-                    <a href="#">Contact</a>
-                </li>
+                <ul class="nav navbar-nav navbar-right">
+                    <li ng-show="isLogged()"><a ui-sref="cameras">{{ getUsername() }}</a></li>
+                    <li ng-show="isLogged()"><a href="" ng-click="logout()">Logout</a></li>
+                    <li ng-show="!isLogged()"><a href="" ng-click="logout()">Login</a></li>
+                </ul>
             </ul>
         </div>
         <!-- /.navbar-collapse -->

camotion/views/sensors.html

@@ -0,0 +1,4 @@
+<!-- Page Content -->
+<div class="container">
+    <lu-basic-table options="luTable" class="row col-sm-8 col-sm-offset-2"></lu-basic-table>
+</div>

sdk/cameras.js

@@ -4,7 +4,7 @@
 (function () {
     'use strict';
 
-    angular.module('camotionAdmin')
+    angular.module('camotionSdk')
         .factory('CamerasService', ['luticateRequest', function (luticateRequest) {
 
             var CamerasService = {};

sdk/commands.js

@@ -4,7 +4,7 @@
 (function () {
     'use strict';
 
-    angular.module('camotionAdmin')
+    angular.module('camotionSdk')
         .factory('CommandsService', ['luticateRequest', function (luticateRequest) {
 
             var CommandsService = {};

sdk/helper.js

@@ -5,7 +5,7 @@
 (function () {
     'use strict';
 
-    angular.module('camotionAdmin')
+    angular.module('camotionSdk')
         .factory('HelperService', ['HostsService', '$q', function (HostsService, $q) {
 
             var HelperService = {};

sdk/hosts.js

@@ -4,7 +4,7 @@
 (function () {
     'use strict';
 
-    angular.module('camotionAdmin')
+    angular.module('camotionSdk')
         .factory('HostsService', ['luticateRequest', function (luticateRequest) {
 
             var HostsService = {};

sdk/sdk.js

@@ -0,0 +1,9 @@
+/**
+ * Created by robin on 11/22/15.
+ */
+
+(function () {
+    'use strict';
+
+    angular.module('camotionSdk', []);
+})();

sdk/sensors.js

@@ -4,7 +4,7 @@
 (function () {
     'use strict';
 
-    angular.module('camotionAdmin')
+    angular.module('camotionSdk')
         .factory('SensorsService', ['luticateRequest', function (luticateRequest) {
 
             var SensorsService = {};
@@ -39,6 +39,11 @@
                 return luticateRequest.post("/api/sensors/" + data.sensor_id + "/del", null, null, promise);
             };
 
+            SensorsService.getValue = function(data, promise)
+            {
+                return luticateRequest.post("/api/sensors/" + data.sensor_id + "/value", null, null, promise);
+            };
+
             return SensorsService;
         }]);
 })();