branch chorem-ng updated (1ec27b3 -> 3efffc5)
This is an automated email from the git hooks/post-receive script. New change to branch chorem-ng in repository chorem. See http://git.chorem.org/chorem.git from 1ec27b3 refs #1211 : Init CRM using ui-router not backend plugged new 1dcd720 refs #1211 : Split routing and controllers new 7debc0e Update Menu new 6ab28c2 Use correct ui-router syntax new 3efffc5 Put back saints calendar on home page The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3efffc557f42861211ff04dad4bd246be92d6f49 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 17:16:29 2015 +0200 Put back saints calendar on home page commit 6ab28c2d951b88f48afa2265fdbe7c695af03e68 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 16:20:39 2015 +0200 Use correct ui-router syntax commit 7debc0e01d0e10d361d8c49ce38828bbd53b260b Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 16:18:20 2015 +0200 Update Menu commit 1dcd720e99cda4e395eca25efd26a32ddf6d92e5 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 15:49:23 2015 +0200 refs #1211 : Split routing and controllers Summary of changes: .../src/main/webapp/css/chorem.css | 81 +------------- chorem-ui-angular/src/main/webapp/home.html | 47 ++++++++- chorem-ui-angular/src/main/webapp/index.html | 37 ++++--- chorem-ui-angular/src/main/webapp/js/chorem.js | 2 +- .../src/main/webapp/js/choremControllers.js | 8 ++ chorem-ui-angular/src/main/webapp/js/crm/crm.js | 116 +-------------------- .../webapp/js/crm/{crm.js => crmControllers.js} | 44 ++------ 7 files changed, 82 insertions(+), 253 deletions(-) copy trunk/chorem-webmotion/src/main/webapp/css/chorem.less => chorem-ui-angular/src/main/webapp/css/chorem.css (60%) create mode 100644 chorem-ui-angular/src/main/webapp/js/choremControllers.js copy chorem-ui-angular/src/main/webapp/js/crm/{crm.js => crmControllers.js} (67%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 1dcd720e99cda4e395eca25efd26a32ddf6d92e5 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 15:49:23 2015 +0200 refs #1211 : Split routing and controllers --- chorem-ui-angular/src/main/webapp/index.html | 1 + chorem-ui-angular/src/main/webapp/js/crm/crm.js | 116 +-------------------- .../webapp/js/crm/{crm.js => crmControllers.js} | 44 ++------ 3 files changed, 11 insertions(+), 150 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html index bb8d60c..94b2b45 100644 --- a/chorem-ui-angular/src/main/webapp/index.html +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -13,6 +13,7 @@ <script src="webjars/angular-ui-router/0.2.13/angular-ui-router.js"></script> <script src="js/crm/crm.js"></script> + <script src="js/crm/crmControllers.js"></script> <script src="js/chorem.js"></script> <link href="webjars/bootcards/1.1.0/css/bootcards-desktop.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-desktop..." rel="stylesheet"/> diff --git a/chorem-ui-angular/src/main/webapp/js/crm/crm.js b/chorem-ui-angular/src/main/webapp/js/crm/crm.js index 4a70e63..6db23de 100644 --- a/chorem-ui-angular/src/main/webapp/js/crm/crm.js +++ b/chorem-ui-angular/src/main/webapp/js/crm/crm.js @@ -1,4 +1,4 @@ -var choremCRM = angular.module('chorem.crm', ['ngRoute','ui.router']); +var choremCRM = angular.module('chorem.crm', ['ui.router', 'chorem.crm.controllers']); choremCRM.config( [ '$stateProvider', '$urlRouterProvider', @@ -23,119 +23,5 @@ choremCRM.config( }); }]); -choremCRM.controller('CompanyListController', function ($scope, $http, $location, $route, $routeParams) { - $scope.items = ''; - - $scope.filteredItems = $scope.items; - - $scope.searchTerm=""; - - $scope.selectedItem=$scope.items[0]; - - $scope.targetId=""; - - $scope.setTargetId=function(targetId){ - $scope.targetId=targetId; - } - - $scope.selectItem=function(selectedCompany){ - $scope.selectedItem = selectedCompany; - }; - - $scope.selectItemById=function(id){ - for (var index in $scope.items) { - var company = $scope.items[index]; - if (company.wikittyId===id){ - $scope.selectedItem=company; - } - } - } - - $scope.isItemSelected=function(selectedCompany){ - return selectedCompany===$scope.selectedItem; - }; - - $scope.filter=function(){ - $scope.filteredItems=[]; - for (var index in $scope.items) { - var company = $scope.items[index]; - var regexp = new RegExp($scope.searchTerm,"i"); - if (company.name.match(regexp)){ - $scope.filteredItems.push(company); - } - } - }; - - $scope.updateItem = function(oldItem, newItem) { - for (var index in $scope.items) { - var company = $scope.items[index]; - if (company===oldItem){ - $scope.items[index]=newItem; - } - } - - $scope.filter(); - } - - $scope.addItem = function(newItem) { - $scope.items.push(newItem); - $scope.filter(); - } - - $scope.deleteItem = function(oldItem) { - var index = $scope.items.indexOf(oldItem); - - if (index > -1) { - $scope.items.splice(index, 1); - } - - $scope.filter(); - } - - $scope.refresh=function(){ - $http.get('companies').success(function(data){ - $scope.items = data; - if ($routeParams.companyId){ - //company selected - $scope.selectItemById($routeParams.companyId); - $location.path('companies/'+$routeParams.companyId); - $route.reload(); - } else { - $scope.selectedItem=$scope.items[0]; - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); - } - $scope.filter(); - }); - }; - - $scope.refresh(); - -}); - -choremCRM.controller('CompanyCreateController', function ($scope, $http, $window) { - - $scope.saveCompany = function(){ - $http({ - method : 'PUT', - url : 'companies/add', - data : $.param($scope.company), // pass in data as strings - headers : { 'Content-Type': 'application/x-www-form-urlencoded' } // set the headers so angular passing info as form data (not request payload) - }) - .success(function(data) { - - //update company and selectedItem in parent scope - $scope.addItem(data); - $scope.$parent.selectedItem=data; - - $window.history.back(); - }); - }; - - $scope.cancel = function(){ - $window.history.back(); - } - -}); diff --git a/chorem-ui-angular/src/main/webapp/js/crm/crm.js b/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js similarity index 67% copy from chorem-ui-angular/src/main/webapp/js/crm/crm.js copy to chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js index 4a70e63..c5a1381 100644 --- a/chorem-ui-angular/src/main/webapp/js/crm/crm.js +++ b/chorem-ui-angular/src/main/webapp/js/crm/crmControllers.js @@ -1,29 +1,6 @@ -var choremCRM = angular.module('chorem.crm', ['ngRoute','ui.router']); - -choremCRM.config( - [ '$stateProvider', '$urlRouterProvider', - function ($stateProvider, $urlRouterProvider) { - $stateProvider - .state('crm', { - abstract: true, - templateUrl: 'crm/partials/crm.html', - url: '/crm' - }) - - .state('crm.companies', { - url: '/companies', - templateUrl: 'crm/partials/companies.list.html', - controller:'CompanyListController' - }) - - .state('crm.companies.add', { - url: '/add', - templateUrl: 'crm/partials/companyCreateCard.html', - controller:'CompanyCreateController' - }); -}]); - -choremCRM.controller('CompanyListController', function ($scope, $http, $location, $route, $routeParams) { +var choremCRMControllers = angular.module('chorem.crm.controllers', ['ui.router']); + +choremCRMControllers.controller('CompanyListController', function ($scope, $http, $location, $state) { $scope.items = ''; @@ -96,15 +73,13 @@ choremCRM.controller('CompanyListController', function ($scope, $http, $location $scope.refresh=function(){ $http.get('companies').success(function(data){ $scope.items = data; - if ($routeParams.companyId){ + if ($state.params.companyId){ //company selected - $scope.selectItemById($routeParams.companyId); - $location.path('companies/'+$routeParams.companyId); - $route.reload(); + $scope.selectItemById($state.params.companyId); + $state.go('crm.companies', { companyId: $state.params.companyId }); } else { $scope.selectedItem=$scope.items[0]; - $location.path('companies/'+$scope.selectedItem.wikittyId); - $route.reload(); + $state.go('crm.companies', { companyId: $scope.selectedItem.wikittyId }); } $scope.filter(); }); @@ -114,7 +89,7 @@ choremCRM.controller('CompanyListController', function ($scope, $http, $location }); -choremCRM.controller('CompanyCreateController', function ($scope, $http, $window) { +choremCRMControllers.controller('CompanyCreateController', function ($scope, $http, $window) { $scope.saveCompany = function(){ $http({ @@ -137,5 +112,4 @@ choremCRM.controller('CompanyCreateController', function ($scope, $http, $window $window.history.back(); } -}); - +}); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 7debc0e01d0e10d361d8c49ce38828bbd53b260b Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 16:18:20 2015 +0200 Update Menu --- chorem-ui-angular/src/main/webapp/index.html | 30 +++++++++++----------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html index 94b2b45..e486c96 100644 --- a/chorem-ui-angular/src/main/webapp/index.html +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -54,44 +54,38 @@ <i class="fa fa-building-o"></i> Sociétés </a></li> - <li><a href="/chorem/wikitty/Company/edit/new"><span class="glyphicon glyphicon-plus glyphicon-black"></span> Add company</a></li> - <li class="divider"></li> - <li><a href="/chorem/wikitty/Person/search"><span class="glyphicon glyphicon-th-list"></span> All person</a></li> - <li><a href="/chorem/wikitty/Person/edit/new"><span class="glyphicon glyphicon-plus"></span> Add person</a></li> - <li class="divider"></li> - <li><a href="/chorem/wikitty/Employee/search"><span class="glyphicon glyphicon-th-list"></span> All employee</a></li> - <li><a href="/chorem/wikitty/Employee/edit/new"><span class="glyphicon glyphicon-plus"></span> Add employee</a></li> - <li class="divider"></li> - <li><a href="/chorem/wikitty/ContactDetails/search"><span class="glyphicon glyphicon-th-list"></span> All contact details</a></li> - <li><a href="/chorem/wikitty/ContactDetails/edit/new"><i class="glyphicon glyphicon-plus"></i> Add contact details</a></li> - <li class="divider"></li> - <li><a href="/chorem/wikitty/Touch/search"><span class="glyphicon glyphicon-th-list"></span> All touch</a></li> - <li><a href="/chorem/wikitty/Touch/edit/new"><i class="glyphicon glyphicon-plus"></i> Add touch</a></li> + <li><a href="#"> + <i class="fa fa-users"></i> + Personnes + </a></li> <li class="divider"></li> - <li><a href="/chorem/crm/export"> Export</a></li> + <li><a href="#"> + <i class="fa fa-download"></i> + Export + </a></li> </ul> </li> <li> <a href="#"> - <i class="fa fa-users"></i> + <i class="fa fa-briefcase"></i> Projets </a> </li> <li> <a href="/#"> - <i class="fa fa-clipboard"></i> + <i class="fa fa-leaf"></i> Commercial </a> </li> <li> <a href="/#"> - <i class="fa fa-bar-chart-o"></i> + <i class="fa fa-money"></i> Financial </a> </li> <li> <a href="/#"> - <i class="fa fa-bar-chart-o"></i> + <i class="fa fa-child"></i> HR </a> </li> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 6ab28c2d951b88f48afa2265fdbe7c695af03e68 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 16:20:39 2015 +0200 Use correct ui-router syntax --- chorem-ui-angular/src/main/webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html index e486c96..823606c 100644 --- a/chorem-ui-angular/src/main/webapp/index.html +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -50,7 +50,7 @@ <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="#/crm/companies"> + <li><a ui-sref="crm.companies"> <i class="fa fa-building-o"></i> Sociétés </a></li> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 3efffc557f42861211ff04dad4bd246be92d6f49 Author: kootox <jean.couteau@gmail.com> Date: Mon Mar 30 17:16:29 2015 +0200 Put back saints calendar on home page --- chorem-ui-angular/src/main/webapp/css/chorem.css | 86 ++++++++++++++++++++++ chorem-ui-angular/src/main/webapp/home.html | 47 ++++++++++-- chorem-ui-angular/src/main/webapp/index.html | 4 + chorem-ui-angular/src/main/webapp/js/chorem.js | 2 +- .../src/main/webapp/js/choremControllers.js | 8 ++ 5 files changed, 141 insertions(+), 6 deletions(-) diff --git a/chorem-ui-angular/src/main/webapp/css/chorem.css b/chorem-ui-angular/src/main/webapp/css/chorem.css new file mode 100644 index 0000000..3c98471 --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/css/chorem.css @@ -0,0 +1,86 @@ +/* L'affiche du calendrier sur la page d'accueil */ +.calendar{ + margin:.25em 10px 10px 0; + padding-top:5px; + float:left; + width:80px; + background:#ededef; + background: -webkit-gradient(linear, left top, left bottom, from(#ededef), to(#ccc)); + background: -moz-linear-gradient(top, #ededef, #ccc); + font:bold 40px/60px Arial Black, Arial, Helvetica, sans-serif; + text-align:center; + color:#000; + text-shadow:#fff 0 1px 0; + -moz-border-radius:3px; + -webkit-border-radius:3px; + border-radius:3px; + position:relative; + -moz-box-shadow:0 2px 2px #888; + -webkit-box-shadow:0 2px 2px #888; + box-shadow:0 2px 2px #888; +} + +.calendar span.week { + display:block; + font: 10px/20px Arial Black, Arial, Helvetica, sans-serif; +} + +.calendar span.saint { + display:block; + font:normal bold 11px/11px Arial, Helvetica, sans-serif; + text-shadow:#00365a 0 -1px 0; +} + +.calendar:before, .calendar:after{ + content:''; + float:left; + position:absolute; + top:5px; + width:8px; + height:8px; + background:#111; + z-index:1; + -moz-border-radius:10px; + -webkit-border-radius:10px; + border-radius:10px; + -moz-box-shadow:0 1px 1px #fff; + -webkit-box-shadow:0 1px 1px #fff; + box-shadow:0 1px 1px #fff; +} +.calendar:before{left:11px;} +.calendar:after{right:11px;} + +.calendar em{ + display:block; + font:normal bold 11px/30px Arial, Helvetica, sans-serif; + color:#fff; + text-shadow:#00365a 0 -1px 0; + background:#04599a; + background:-webkit-gradient(linear, left top, left bottom, from(#04599a), to(#00365a)); + background:-moz-linear-gradient(top, #04599a, #00365a); + -moz-border-radius-bottomright:3px; + -webkit-border-bottom-right-radius:3px; + border-bottom-right-radius:3px; + -moz-border-radius-bottomleft:3px; + -webkit-border-bottom-left-radius:3px; + border-bottom-left-radius:3px; + border-top:1px solid #00365a; +} + +.calendar em:before, .calendar em:after{ + content:''; + float:left; + position:absolute; + top:-5px; + width:4px; + height:14px; + background:#dadada; + background:-webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#aaa)); + background:-moz-linear-gradient(top, #f1f1f1, #aaa); + z-index:2; + -moz-border-radius:2px; + -webkit-border-radius:2px; + border-radius:2px; +} +.calendar em:before{left:13px;} +.calendar em:after{right:13px;} \ No newline at end of file diff --git a/chorem-ui-angular/src/main/webapp/home.html b/chorem-ui-angular/src/main/webapp/home.html index 134ed7d..f9f807b 100644 --- a/chorem-ui-angular/src/main/webapp/home.html +++ b/chorem-ui-angular/src/main/webapp/home.html @@ -15,7 +15,7 @@ <div class="panel-body"> <div class="row"> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/contacts" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-users"></i> <h4> Personnes @@ -33,7 +33,7 @@ </a> </div> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/notes" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-clipboard"></i> <h4> Notes @@ -42,7 +42,7 @@ </a> </div> <div class="col-xs-6 col-sm-4"> - <a class="bootcards-summary-item" href="/charts" style="padding-top:35px;"> + <a class="bootcards-summary-item" href="#" style="padding-top:35px;"> <i class="fa fa-3x fa-bar-chart-o"></i> <h4> Charts @@ -101,8 +101,7 @@ <!--bar chart--> <div class="bootcards-chart-canvas" id="chartClosedSales"></div> - <div class="panel-footer - </div>"> + <div class="panel-footer"> </div> </div> @@ -110,4 +109,42 @@ </div> </div> </div> + + + + + + + +</div> + +<div class="row"> + + <div class="bootcards-cards"> + + <div class="col-sm-4"> + + <div class="panel panel-default bootcards-summary" ng-controller="HomePageCalendarController"> + + <div class="panel-heading"> + <h3 class="panel-title">Aujourd'hui</h3> + </div> + + <div class="panel-body"> + <p class="calendar"> + {{date|date:'dd'}} + <span class="saint">{{saints}}</span> + <span class="week">semaine {{date|date:'w'}}</span> + <em>{{date|date:'MMM'}}</em> + </p> + </div> + + <div class="panel-footer"> + </div> + + </div> + + </div> + + </div> </div> diff --git a/chorem-ui-angular/src/main/webapp/index.html b/chorem-ui-angular/src/main/webapp/index.html index 823606c..7814bc3 100644 --- a/chorem-ui-angular/src/main/webapp/index.html +++ b/chorem-ui-angular/src/main/webapp/index.html @@ -15,6 +15,10 @@ <script src="js/crm/crm.js"></script> <script src="js/crm/crmControllers.js"></script> <script src="js/chorem.js"></script> + <script src="js/choremControllers.js"></script> + + <link rel="stylesheet" href="css/chorem.css"> + <link href="webjars/bootcards/1.1.0/css/bootcards-desktop.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/bootcards/1.1.0/css/bootcards-desktop..." rel="stylesheet"/> <link href="webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" /> diff --git a/chorem-ui-angular/src/main/webapp/js/chorem.js b/chorem-ui-angular/src/main/webapp/js/chorem.js index 72c34f9..0735cea 100644 --- a/chorem-ui-angular/src/main/webapp/js/chorem.js +++ b/chorem-ui-angular/src/main/webapp/js/chorem.js @@ -1,4 +1,4 @@ -var chorem = angular.module('chorem', ['ngRoute','ui.select','ngSanitize', 'ui.bootstrap', 'ui.router', 'chorem.crm']); +var chorem = angular.module('chorem', ['ngRoute','ui.select','ngSanitize', 'ui.bootstrap', 'ui.router', 'chorem.crm', 'chorem.controllers']); chorem.run( [ '$rootScope', '$state', '$stateParams', diff --git a/chorem-ui-angular/src/main/webapp/js/choremControllers.js b/chorem-ui-angular/src/main/webapp/js/choremControllers.js new file mode 100644 index 0000000..76932ed --- /dev/null +++ b/chorem-ui-angular/src/main/webapp/js/choremControllers.js @@ -0,0 +1,8 @@ +var choremControllers = angular.module('chorem.controllers', ['ui.router']); + +choremControllers.controller('HomePageCalendarController', function ($scope) { + + $scope.date=new Date(); + $scope.saints=""; + +}); \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm