This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 22b4a74c1cbfe74fb0a158128072508e1ad15600 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 5 17:00:14 2015 +0100 problème de conflit au niveau des dépendances résolu (mais filtre sur les groupes ne passe plus) --- bower.json | 5 ++- static/js/controllers/dashboardCtrl.js | 2 -- static/js/controllers/groupCtrl.js | 62 ++++++++++++++++++++++++++++++++++ static/js/mumApp.js | 4 +-- views/dashboard.html | 3 +- views/groups.html | 3 +- views/index.html | 4 ++- 7 files changed, 72 insertions(+), 11 deletions(-) diff --git a/bower.json b/bower.json index 542acde..c470f26 100644 --- a/bower.json +++ b/bower.json @@ -3,10 +3,9 @@ "version": "0.0.1", "dependencies": { "bootstrap": "~3.2.0", - "angular-latest": "~1.3.9", - "angular": "~1.3.13", + "angular": "~1.2.28", "angular-toastr": "~0.5.2", - "angular-route": "~1.3.13", + "angular-route": "~1.2.28", "angular-bootstrap": "~0.12.1" } } diff --git a/static/js/controllers/dashboardCtrl.js b/static/js/controllers/dashboardCtrl.js index f09c76d..4b7a783 100644 --- a/static/js/controllers/dashboardCtrl.js +++ b/static/js/controllers/dashboardCtrl.js @@ -10,8 +10,6 @@ mumApp.controller('dashboardCtrl', function($scope, $filter, $routeParams, DataH $scope.items = DataHosts.Items; - - $scope.$on("hostsUpdate", function (event) { $scope.items = DataHosts.Items; }); diff --git a/static/js/controllers/groupCtrl.js b/static/js/controllers/groupCtrl.js new file mode 100644 index 0000000..f7419c2 --- /dev/null +++ b/static/js/controllers/groupCtrl.js @@ -0,0 +1,62 @@ +mumApp.controller('groupCtrl', function($scope, $filter, $routeParams, DataHosts){ + $scope.sort = { + sortingOrder : 'id', + reverse : false + }; + + $scope.items = DataHosts.Items; + + $scope.$on("hostsUpdate", function (event) { + $scope.items = DataHosts.Items; + }); + + $scope.group_filter = ''; + + $scope.selected = []; + + $scope.select = function(host){ + $scope.selected.append(host); + }; + + $scope.unselect = function(host){ + $scope.selected.remove(host); + }; + + $scope.status = ''; + + $scope.grp = "all"; + + $scope.getGroupsByAddr = function(addr) { + res = "" + for(var i = 0; i<$scope.items.length; i++){ + if($scope.items[i].addr === addr){ + for(var j = 0; j<$scope.items[i].group.length; j++){ + res += $scope.items[i].group[j].name + " "; + } + } + } + return res; + }; + + $scope.allGroups = function(){ + var res = [] + for(var i = 0; i<$scope.items.length; i++){ + for(var j = 0; j<$scope.items[i].group.length; j++){ + res.push($scope.items[i].group[j].name); + } + } + return res; + }; + + $scope.checkAll = function(){ + if($scope.selectedAll){ + $scope.selectedAll = true; + } + else{ + $scope.selectedAll = false; + } + angular.forEach($scope.items, function(item){ + item.Selected = $scope.selectedAll; + }); + }; +}); \ No newline at end of file diff --git a/static/js/mumApp.js b/static/js/mumApp.js index a3a0f4e..9a8f2e8 100644 --- a/static/js/mumApp.js +++ b/static/js/mumApp.js @@ -1,4 +1,4 @@ -var mumApp = angular.module('mumApp', ['ui.bootstrap', 'ngRoute', 'toastr']); +var mumApp = angular.module('mumApp', ['ngRoute', 'ui.bootstrap', 'toastr']); mumApp.factory('DataHosts', function(){ return {Items: []}; @@ -20,7 +20,7 @@ mumApp.config(function($routeProvider){ }) .when('/groups',{ templateUrl : 'groups.html', - controller : 'dashboardCtrl' + controller : 'groupCtrl' }) .when('/hostpage/:param',{ templateUrl : 'hostpage.html', diff --git a/views/dashboard.html b/views/dashboard.html index fc69e6a..1a66eb3 100644 --- a/views/dashboard.html +++ b/views/dashboard.html @@ -65,8 +65,7 @@ <tbody> <tr ng-repeat="item in items | orderBy:sort.sortingOrder:sort.reverse | - filter:{addr:addr_filter, name:name_filter, status:status_filter, - group:{name:group_filter}}" class={{item.status}}> + filter:{addr:addr_filter, name:name_filter, status:status_filter}" class={{item.status}}> <!-- group.name:group_filter --> <td><a href="#/hostpage/{{item.addr}}">{{item.addr}}</a></td> <td>{{item.name}}</td> <td>warning : {{item.warning}}<br/> diff --git a/views/groups.html b/views/groups.html index 70aa2cd..5d29ccd 100644 --- a/views/groups.html +++ b/views/groups.html @@ -1,6 +1,7 @@ <div class="col-md-offset-2 main"> <h1 class="page-header">Group manager</h1> + <button type="button" class="btn btn-primary" ng-click="toto()">ngf.</button> <div class="row"> <div class="col-xs-3"> <label for="grpoption">Your existing groups</label> @@ -27,7 +28,7 @@ </tr> </thead> <tbody> - <tr ng-repeat="item in items | filter:{group:{name:grp}, addr:addr_filter, name:name_filter}"> + <tr ng-repeat="item in items | filter:{addr:addr_filter, name:name_filter}"> <!-- group:{name:grp} --> <td>{{item.addr}}</td> <td>{{item.name}}</td> <td>{{getGroupsByAddr(item.addr)}}</td> diff --git a/views/index.html b/views/index.html index 706f22b..3eeeeaf 100644 --- a/views/index.html +++ b/views/index.html @@ -19,15 +19,17 @@ <!-- AngularJS --> <script src="bower_components/angular/angular.min.js"></script> + <script src="bower_components/angular-route/angular-route.min.js"></script> <script src="bower_components/angular-toastr/dist/angular-toastr.min.js"></script> <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - <script src="bower_components/angular-route/angular-route.min.js"></script> + <script src="static/js/mumApp.js"></script> <script src="static/js/controllers/dashboardCtrl.js"></script> <script src="static/js/controllers/headCtrl.js"></script> <script src="static/js/controllers/scanCtrl.js"></script> <script src="static/js/controllers/hostPageCtrl.js"></script> + <script src="static/js/controllers/groupCtrl.js"></script> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]><!-- -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.