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>.