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 f7df510bda89eae3ba5b21cabfbef82e0c8a6ca6 Author: kootox <jean.couteau@gmail.com> Date: Fri May 29 16:57:36 2015 +0200 Refs #1211 : Improve home page with billing --- chorem-ui-angular/src/main/webapp/home.html | 61 ++++++++++++++++++---- .../src/main/webapp/js/choremControllers.js | 6 +++ 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/home.html b/chorem-ui-angular/src/main/webapp/home.html index ac05943..f8306c2 100644 --- a/chorem-ui-angular/src/main/webapp/home.html +++ b/chorem-ui-angular/src/main/webapp/home.html @@ -1,5 +1,3 @@ -<h1>Chorem</h1> - <div class="row"> <div class="bootcards-cards"> @@ -34,10 +32,10 @@ </div> <div class="col-xs-6 col-sm-4"> <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> - <i class="fa fa-3x fa-clipboard"></i> + <i class="fa fa-3x fa-eur"></i> <h4> - Notes - <span class="label label-info">40</span> + Factures + <span class="label label-info">{{invoiceNumber}}</span> </h4> </a> </div> @@ -71,15 +69,26 @@ <div class="col-sm-4"> - <div class="panel panel-default bootcards-summary"> + <div class="panel panel-default bootcards-table"> <div class="panel-heading"> - <h3 class="panel-title">Facturation</h3> + <h3 class="panel-title">Facturation client</h3> </div> - <div class="panel-body"> - TODO - </div> + <table class="table table-hover"> + + <thead> + <tr class="active"><th></th><th>Montant</th><th>Nombre</th></tr> + </thead> + + <tbody> + <tr><td>Prévu</td><td>0</td><td>0</td></tr> + <tr><td>Envoyé</td><td>0</td><td>0</td></tr> + <tr><td>En retard</td><td>0</td><td>0</td></tr> + <tr><td><strong>Total</strong></td><td><strong>0</strong></td><td><strong>0</strong></td></tr> + </tbody> + + </table> <div class="panel-footer"> </div> @@ -139,5 +148,37 @@ </div> + + + <div class="col-sm-4"> + + <div class="panel panel-default bootcards-table"> + + <div class="panel-heading"> + <h3 class="panel-title">Facturation fournisseurs</h3> + </div> + + <table class="table table-hover"> + + <thead> + <tr class="active"><th></th><th>Montant</th><th>Nombre</th></tr> + </thead> + + <tbody> + <tr><td>Prévu</td><td>0</td><td>0</td></tr> + <tr><td>Reçu</td><td>0</td><td>0</td></tr> + <tr><td>A payer</td><td>0</td><td>0</td></tr> + <tr><td><strong>Total</strong></td><td><strong>0</strong></td><td><strong>0</strong></td></tr> + </tbody> + + </table> + + <div class="panel-footer"> + </div> + + </div> + + </div> + </div> </div> diff --git a/chorem-ui-angular/src/main/webapp/js/choremControllers.js b/chorem-ui-angular/src/main/webapp/js/choremControllers.js index 8f0bcdd..5ccd5a9 100644 --- a/chorem-ui-angular/src/main/webapp/js/choremControllers.js +++ b/chorem-ui-angular/src/main/webapp/js/choremControllers.js @@ -6,6 +6,8 @@ choremControllers.controller('HomePageResumeController', function ($scope, $http $scope.personNumber=0; + $scope.invoiceNumber=0; + $http.get('services/v1/Company').success(function(data){ $scope.companiesNumber = data.length; }); @@ -14,6 +16,10 @@ choremControllers.controller('HomePageResumeController', function ($scope, $http $scope.personNumber = data.length; }); + $http.get('services/v1/Invoice').success(function(data){ + $scope.invoiceNumber = data.length; + }); + }); choremControllers.controller('HomePageCalendarController', function ($scope) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.