Commit a6b79c31cfedba665012f2cbbb3a717fc5337aff
1 parent
7c8b0fdc
Exists in
master
and in
8 other branches
Fix typo. Change proposal list limit
Showing
6 changed files
with
14 additions
and
14 deletions
Show diff stats
src/app/components/proposal-carousel/proposal-carousel.html
@@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
24 | </div> | 24 | </div> |
25 | </div> | 25 | </div> |
26 | <div class="proposal-carousel-bottom color-theme-common-bg" ng-click="vm.showProposalsList()"> | 26 | <div class="proposal-carousel-bottom color-theme-common-bg" ng-click="vm.showProposalsList()"> |
27 | - <div>Veja as propostas mais vortadas</div> | 27 | + <div>Veja as propostas mais votadas</div> |
28 | <div class="proposal-carousel-bottom-icon"> | 28 | <div class="proposal-carousel-bottom-icon"> |
29 | <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg"></span> | 29 | <span class="glyphicon glyphicon-chevron-down pull-right color-theme-common-fg"></span> |
30 | </div> | 30 | </div> |
src/app/components/proposal-list/proposal-list.directive.js
@@ -33,8 +33,8 @@ | @@ -33,8 +33,8 @@ | ||
33 | throw { name: 'NotDefined', message: 'The attribute "proposals" is undefined.'}; | 33 | throw { name: 'NotDefined', message: 'The attribute "proposals" is undefined.'}; |
34 | } | 34 | } |
35 | 35 | ||
36 | - if(!vm.per_page){ | ||
37 | - vm.per_page = 5; | 36 | + if(!vm.perPage){ |
37 | + vm.perPage = 5; | ||
38 | } | 38 | } |
39 | 39 | ||
40 | vm.initPorposalList(); | 40 | vm.initPorposalList(); |
@@ -50,10 +50,10 @@ | @@ -50,10 +50,10 @@ | ||
50 | vm.proposalsLength = vm.proposals.length; | 50 | vm.proposalsLength = vm.proposals.length; |
51 | 51 | ||
52 | 52 | ||
53 | - if ((vm.proposalsLength % vm.per_page) === 0) { | ||
54 | - vm.pages = vm.proposalsLength / vm.per_page; | 53 | + if ((vm.proposalsLength % vm.perPage) === 0) { |
54 | + vm.pages = vm.proposalsLength / vm.perPage; | ||
55 | } else{ | 55 | } else{ |
56 | - vm.pages = (vm.proposalsLength / vm.per_page) + 1; | 56 | + vm.pages = (vm.proposalsLength / vm.perPage) + 1; |
57 | } | 57 | } |
58 | 58 | ||
59 | // vm.arraypages = new Array(Math.ceil(vm.pages)); | 59 | // vm.arraypages = new Array(Math.ceil(vm.pages)); |
@@ -81,8 +81,8 @@ | @@ -81,8 +81,8 @@ | ||
81 | ProposalListController.prototype.getProposalsPerPage = function (pageIndex) { | 81 | ProposalListController.prototype.getProposalsPerPage = function (pageIndex) { |
82 | var vm = this; | 82 | var vm = this; |
83 | 83 | ||
84 | - var initialIndex = pageIndex * vm.per_page; | ||
85 | - var finalIndex = initialIndex + vm.per_page; | 84 | + var initialIndex = pageIndex * vm.perPage; |
85 | + var finalIndex = initialIndex + vm.perPage; | ||
86 | 86 | ||
87 | return vm.proposals.slice(initialIndex, finalIndex); | 87 | return vm.proposals.slice(initialIndex, finalIndex); |
88 | }; | 88 | }; |
@@ -132,7 +132,7 @@ | @@ -132,7 +132,7 @@ | ||
132 | templateUrl: 'app/components/proposal-list/proposal-list.html', | 132 | templateUrl: 'app/components/proposal-list/proposal-list.html', |
133 | scope: { | 133 | scope: { |
134 | proposals: '=', | 134 | proposals: '=', |
135 | - per_page: '=' | 135 | + perPage: '=' |
136 | }, | 136 | }, |
137 | controller: ProposalListController, | 137 | controller: ProposalListController, |
138 | controllerAs: 'vm', | 138 | controllerAs: 'vm', |
src/app/components/proposal-list/proposal-list.html
@@ -27,8 +27,7 @@ | @@ -27,8 +27,7 @@ | ||
27 | <div class="row row-actions"> | 27 | <div class="row row-actions"> |
28 | <div class="col-sm-8"> | 28 | <div class="col-sm-8"> |
29 | <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)"> | 29 | <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)"> |
30 | - Avalie esta proposta | ||
31 | - <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span> | 30 | + Participe |
32 | </button> | 31 | </button> |
33 | </div> | 32 | </div> |
34 | <div class="col-sm-4"> | 33 | <div class="col-sm-4"> |
src/app/pages/programas/programa.controller.js
@@ -76,6 +76,7 @@ | @@ -76,6 +76,7 @@ | ||
76 | vm.loadingTopProposals = true; | 76 | vm.loadingTopProposals = true; |
77 | vm.DialogaService.getProposalsByTopicId(vm.article.id, {}, function(data) { | 77 | vm.DialogaService.getProposalsByTopicId(vm.article.id, {}, function(data) { |
78 | vm.proposals = data.articles; | 78 | vm.proposals = data.articles; |
79 | + vm.proposalsTopFive = vm.proposals.slice(0, 5); | ||
79 | vm.proposalsTopRated = vm.proposals.slice(0, 3); | 80 | vm.proposalsTopRated = vm.proposals.slice(0, 3); |
80 | vm.loadingTopProposals = false; | 81 | vm.loadingTopProposals = false; |
81 | }, function(error) { | 82 | }, function(error) { |
src/app/pages/programas/programa.html
@@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
111 | </div> | 111 | </div> |
112 | </section> | 112 | </section> |
113 | 113 | ||
114 | - <section id="section-proposal-list" class="proposal-extended-section" style="display:none;" ng-if="pagePrograma.proposals && pagePrograma.proposals.length > 0"> | 114 | + <section id="section-proposal-list" class="proposal-extended-section" style="display:none;" ng-if="pagePrograma.proposalsTopFive && pagePrograma.proposalsTopFive.length > 0"> |
115 | <div class="container"> | 115 | <div class="container"> |
116 | <div class="proposal-extended-section-header"> | 116 | <div class="proposal-extended-section-header"> |
117 | <h3 class="color-theme-fg">Resultados de propostas mais votadas</h3> | 117 | <h3 class="color-theme-fg">Resultados de propostas mais votadas</h3> |
@@ -120,7 +120,7 @@ | @@ -120,7 +120,7 @@ | ||
120 | </button> | 120 | </button> |
121 | </div> | 121 | </div> |
122 | <div class="proposal-extended-section-content"> | 122 | <div class="proposal-extended-section-content"> |
123 | - <proposal-list proposals="pagePrograma.proposals"></proposal-list> | 123 | + <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list> |
124 | </div> | 124 | </div> |
125 | </div> | 125 | </div> |
126 | </section> | 126 | </section> |
src/app/pages/propostas/ranking.html
@@ -78,7 +78,7 @@ | @@ -78,7 +78,7 @@ | ||
78 | 78 | ||
79 | <div class="row"> | 79 | <div class="row"> |
80 | <div class="col-sm-12" ng-if="pagePropostas.proposals"> | 80 | <div class="col-sm-12" ng-if="pagePropostas.proposals"> |
81 | - <proposal-list proposals="pagePropostas.filtredProposals"></proposal-list> | 81 | + <proposal-list proposals="pagePropostas.filtredProposals" per-page="10"></proposal-list> |
82 | </div> | 82 | </div> |
83 | <div ng-if="!pagePropostas.proposals && pagePropostas.loadingProposals"> | 83 | <div ng-if="!pagePropostas.proposals && pagePropostas.loadingProposals"> |
84 | <div class="alert alert-info" role="alert"> | 84 | <div class="alert alert-info" role="alert"> |