diff --git a/src/app/components/proposal-list/proposal-list.directive.js b/src/app/components/proposal-list/proposal-list.directive.js index 6a395a1..86f71f4 100644 --- a/src/app/components/proposal-list/proposal-list.directive.js +++ b/src/app/components/proposal-list/proposal-list.directive.js @@ -21,8 +21,8 @@ vm.$log = $log; vm.init(); - vm.loadData(); + vm.attachListeners(); } ProposalListController.prototype.init = function () { @@ -37,6 +37,12 @@ vm.per_page = 5; } + vm.initPorposalList(); + }; + + ProposalListController.prototype.initPorposalList = function () { + var vm = this; + vm.currentPageIndex = 0; vm.proposalsPerPage = vm.getProposalsPerPage(0); @@ -44,14 +50,14 @@ vm.proposalsLength = vm.proposals.length; - if ((vm.proposalsLength % vm.per_page) == 0) { + if ((vm.proposalsLength % vm.per_page) === 0) { vm.pages = vm.proposalsLength / vm.per_page; } else{ - vm.pages = (vm.proposalsLength / vm.per_page) +1; - }; - - vm.arraypages = new Array(Math.ceil(vm.pages)); + vm.pages = (vm.proposalsLength / vm.per_page) + 1; + } + // vm.arraypages = new Array(Math.ceil(vm.pages)); + vm.arraypages = new Array(Math.floor(vm.pages)); }; ProposalListController.prototype.loadData = function () { @@ -64,6 +70,14 @@ }, 1000); }; + ProposalListController.prototype.attachListeners = function () { + var vm = this; + + vm.$scope.$watch('vm.proposals', function(/*newValue, oldValue*/) { + vm.initPorposalList(); + }); + }; + ProposalListController.prototype.getProposalsPerPage = function (pageIndex) { var vm = this; @@ -97,7 +111,7 @@ }, { location: true }); - } + }; function attachPopover(){ var vm = this; diff --git a/src/app/components/proposal-list/proposal-list.html b/src/app/components/proposal-list/proposal-list.html index 2a50c27..6d18346 100644 --- a/src/app/components/proposal-list/proposal-list.html +++ b/src/app/components/proposal-list/proposal-list.html @@ -47,7 +47,7 @@ -
  • +
  • {{::($index)+1}}
  • diff --git a/src/app/index.route.js b/src/app/index.route.js index b4c6cca..72e72de 100644 --- a/src/app/index.route.js +++ b/src/app/index.route.js @@ -124,7 +124,7 @@ 'main': { templateUrl: 'app/pages/propostas/ranking.html', controller: 'PropostasPageController', - controllerAs: 'pageRanking' + controllerAs: 'pagePropostas' }, 'footer': { templateUrl: 'app/pages/footer/footer.html' } } diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js index df01a9f..5bd67b7 100644 --- a/src/app/pages/propostas/propostas.controller.js +++ b/src/app/pages/propostas/propostas.controller.js @@ -79,7 +79,6 @@ vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) { vm.selectedTheme = selectedCategory; - vm.$log.debug('vm.selectedTheme', vm.selectedTheme); }); vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue/*, oldValue*/) { diff --git a/src/app/pages/propostas/ranking.html b/src/app/pages/propostas/ranking.html index 017f41b..054a4d3 100644 --- a/src/app/pages/propostas/ranking.html +++ b/src/app/pages/propostas/ranking.html @@ -16,7 +16,7 @@ -
    +
    @@ -24,9 +24,9 @@
    -
    - +
    +
    -
    +
    -
    +
    @@ -56,9 +56,9 @@