This is an automated email from the git hooks/post-receive script. New commit to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git commit ca6c4ac2d26faf407ebe08f41a99cdaac4e9d998 Author: kootox <jean.couteau@gmail.com> Date: Sat Apr 4 16:21:45 2015 +0200 refs #1211 : add person and company count on home page --- chorem-ui-angular/src/main/webapp/home.html | 13 +++---------- .../src/main/webapp/js/choremControllers.js | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/home.html b/chorem-ui-angular/src/main/webapp/home.html index f6a02cf..c2790b0 100644 --- a/chorem-ui-angular/src/main/webapp/home.html +++ b/chorem-ui-angular/src/main/webapp/home.html @@ -6,7 +6,7 @@ <div class="col-sm-4"> - <div class="panel panel-default bootcards-summary"> + <div class="panel panel-default bootcards-summary" ng-controller="HomePageResumeController"> <div class="panel-heading"> <h3 class="panel-title">Résumé</h3> @@ -19,7 +19,7 @@ <i class="fa fa-3x fa-users"></i> <h4> Personnes - <span class="label label-info">40</span> + <span class="label label-info">{{personNumber}}</span> </h4> </a> </div> @@ -28,7 +28,7 @@ <i class="fa fa-3x fa-building-o"></i> <h4> Sociétés - <span class="label label-info">40</span> + <span class="label label-info">{{companiesNumber}}</span> </h4> </a> </div> @@ -109,13 +109,6 @@ </div> </div> </div> - - - - - - - </div> <div class="row"> diff --git a/chorem-ui-angular/src/main/webapp/js/choremControllers.js b/chorem-ui-angular/src/main/webapp/js/choremControllers.js index bb73609..8f0bcdd 100644 --- a/chorem-ui-angular/src/main/webapp/js/choremControllers.js +++ b/chorem-ui-angular/src/main/webapp/js/choremControllers.js @@ -1,5 +1,21 @@ var choremControllers = angular.module('chorem.controllers', ['ui.router']); +choremControllers.controller('HomePageResumeController', function ($scope, $http) { + + $scope.companiesNumber=0; + + $scope.personNumber=0; + + $http.get('services/v1/Company').success(function(data){ + $scope.companiesNumber = data.length; + }); + + $http.get('services/v1/Person').success(function(data){ + $scope.personNumber = data.length; + }); + +}); + choremControllers.controller('HomePageCalendarController', function ($scope) { $scope.date=new Date(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.