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