Download as
Browse Code »

Commit 2f9af1abe3bd6db368279a23de20980f93a9493a

Authored by Rafael Diego
1 parent e309c941
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

correcoes

Showing 3 changed files with 87 additions and 85 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @2f9af1a
... ... @@ -107,7 +107,7 @@
107 107 }
108 108  
109 109 function getProposalById (proposalId, params, cbSuccess, cbError) {
110   - var url = service.apiProposals + proposalId + '/ranking?per_page=3&page=1';
  110 + var url = service.apiProposals + proposalId + '/ranking?per_page=5&page=1';
111 111 console.log(url);
112 112  
113 113 var paramsExtended = angular.extend({
... ...
src/app/pages/programas/programa.controller.js
  Diff comments   View file @2f9af1a
... ... @@ -91,9 +91,6 @@
91 91 vm.proposals = data.proposals;
92 92 vm.proposalsTopFive = vm.proposals.slice(0, 5);
93 93 vm.proposalsTopRated = vm.proposals.slice(0, 3);
94   - //os elementos estavam vindo em ordem inversa
95   - vm.proposalsTopRated.reverse();
96   - console.table(vm.proposalsTopRated);
97 94 vm.loadingTopProposals = false;
98 95  
99 96 if (vm.article.archived) {
... ...
src/app/pages/ranking/ranking.controller.js
  Diff comments   View file @2f9af1a
... ... @@ -2,8 +2,8 @@
2 2 'use strict';
3 3  
4 4 angular
5   - .module('dialoga')
6   - .controller('RankingPageController', RankingPageController);
  5 + .module('dialoga')
  6 + .controller('RankingPageController', RankingPageController);
7 7  
8 8 /** @ngInject */
9 9 function RankingPageController(DialogaService, $scope, $rootScope, $location, $filter, $log) {
... ... @@ -108,14 +108,14 @@
108 108 vm.loadingThemes = false;
109 109 vm.loading = false;
110 110 });
111   - };
  111 +};
112 112  
113   - RankingPageController.prototype.loadPrograms = function (themeId, cb) {
114   - var vm = this;
  113 +RankingPageController.prototype.loadPrograms = function (themeId, cb) {
  114 + var vm = this;
115 115  
116   - vm.DialogaService.getProgramsByThemeId(themeId, function (programs){
  116 + vm.DialogaService.getProgramsByThemeId(themeId, function (programs){
117 117  
118   - vm.filtredPrograms = programs;
  118 + vm.filtredPrograms = programs;
119 119  
120 120 // 4. Select a random program of T
121 121 var selectedProgram = null;
... ... @@ -129,11 +129,16 @@
129 129 if(results && results.length > 0){
130 130 selectedProgram = results[0];
131 131 vm.selectedProgram = selectedProgram;
  132 + console.log("1");
  133 + console.log(vm.selectedProgram);
  134 + console.log("vm.selectedProgram");
132 135 }
133 136 }
134 137  
135 138 if(!selectedProgram){
136 139 vm.selectedProgram = vm.filtredPrograms[Math.floor(Math.random() * vm.filtredPrograms.length)];
  140 + console.log(vm.selectedProgram);
  141 + console.log("2");
137 142 }
138 143  
139 144 if(cb){
... ... @@ -145,95 +150,95 @@
145 150 cb();
146 151 }
147 152 });
148   - };
  153 +};
149 154  
150   - RankingPageController.prototype.attachListeners = function() {
151   - var vm = this;
  155 +RankingPageController.prototype.attachListeners = function() {
  156 + var vm = this;
152 157  
153   - vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
154   - vm.selectedTheme = selectedCategory;
155   - });
  158 + vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) {
  159 + vm.selectedTheme = selectedCategory;
  160 + });
156 161  
157   - vm.$scope.$watch('pageRanking.selectedTheme', function(newValue/*, oldValue*/) {
158   - vm.search.tema = newValue ? newValue.slug : null;
159   - vm.$location.search('tema', vm.search.tema);
  162 + vm.$scope.$watch('pageRanking.selectedTheme', function(newValue/*, oldValue*/) {
  163 + vm.search.tema = newValue ? newValue.slug : null;
  164 + vm.$location.search('tema', vm.search.tema);
160 165  
161   - if(!vm.loadingFilter && vm.selectedTheme && vm.selectedTheme.id){
162   - vm.loadPrograms(vm.selectedTheme.id, function(){
163   - vm.filterProposals();
164   - });
165   - }
166   - });
  166 + if(!vm.loadingFilter && vm.selectedTheme && vm.selectedTheme.id){
  167 + vm.loadPrograms(vm.selectedTheme.id, function(){
  168 + vm.filterProposals();
  169 + });
  170 + }
  171 + });
167 172  
168   - vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) {
169   - vm.selectedProgram = selectedTopic;
170   - });
  173 + vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) {
  174 + vm.selectedProgram = selectedTopic;
  175 + });
171 176  
172   - vm.$scope.$watch('pageRanking.selectedProgram', function(newValue/*, oldValue*/) {
173   - vm.search.programa = newValue ? newValue.slug : null;
174   - vm.$location.search('programa', vm.search.programa);
175   -
176   - if (!vm.loadingFilter) {
177   - vm.filterProposals();
178   - }
179   - });
  177 + vm.$scope.$watch('pageRanking.selectedProgram', function(newValue/*, oldValue*/) {
  178 + vm.search.programa = newValue ? newValue.slug : null;
  179 + vm.$location.search('programa', vm.search.programa);
180 180  
181   - vm.$scope.$watch('pageRanking.query', function(newValue/*, oldValue*/) {
182   - vm.search.filtro = newValue ? newValue : null;
183   - vm.$location.search('filtro', vm.search.filtro);
184   -
185   - if (!vm.loadingFilter) {
186   - vm.filterProposals();
187   - }
188   - });
189   - };
  181 + if (!vm.loadingFilter) {
  182 + vm.filterProposals();
  183 + }
  184 + });
190 185  
191   - RankingPageController.prototype.resetFilterValues = function() {
192   - var vm = this;
  186 + vm.$scope.$watch('pageRanking.query', function(newValue/*, oldValue*/) {
  187 + vm.search.filtro = newValue ? newValue : null;
  188 + vm.$location.search('filtro', vm.search.filtro);
193 189  
194   - vm.query = null;
195   - vm.selectedTheme = null;
196   - };
  190 + if (!vm.loadingFilter) {
  191 + vm.filterProposals();
  192 + }
  193 + });
  194 +};
197 195  
198   - RankingPageController.prototype.changePage = function(pageIndex) {
199   - var vm = this;
  196 +RankingPageController.prototype.resetFilterValues = function() {
  197 + var vm = this;
200 198  
201   - vm.page = pageIndex;
202   - vm.filterProposals(pageIndex);
203   - };
  199 + vm.query = null;
  200 + vm.selectedTheme = null;
  201 +};
204 202  
205   - RankingPageController.prototype.filterProposals = function(_page, _per_page) {
206   - var vm = this;
  203 +RankingPageController.prototype.changePage = function(pageIndex) {
  204 + var vm = this;
207 205  
208   - if (vm.loadingProposals){
209   - vm.$log.debug('Content is not loaded yet.');
210   - return;
211   - }
  206 + vm.page = pageIndex;
  207 + vm.filterProposals(pageIndex);
  208 +};
212 209  
213   - var page = _page || vm.page;
214   - var per_page = _per_page || vm.per_page;
215   - var query = vm.query;
216   - var selectedProgram = vm.selectedProgram;
217   - var params = {
218   - page: page,
219   - per_page: per_page
220   - };
221   -
222   - if (selectedProgram) {
223   - params.parent_id = selectedProgram.id;
224   - }
  210 +RankingPageController.prototype.filterProposals = function(_page, _per_page) {
  211 + var vm = this;
225 212  
226   - if (query) {params.query = query; }
  213 + if (vm.loadingProposals){
  214 + vm.$log.debug('Content is not loaded yet.');
  215 + return;
  216 + }
227 217  
228   - vm.loadingProposals = true;
229   - vm.DialogaService.searchProposals(params, function(data){
230   - vm.total_proposals = parseInt(data._obj.headers('total'));
231   - vm.filtredProposals = data.articles;
232   - vm.loadingProposals = false;
233   - }, function (error) {
234   - vm.error = error;
235   - vm.$log.error(error);
236   - vm.loadingProposals = false;
237   - });
  218 + var page = _page || vm.page;
  219 + var per_page = _per_page || vm.per_page;
  220 + var query = vm.query;
  221 + var selectedProgram = vm.selectedProgram;
  222 + var params = {
  223 + page: page,
  224 + per_page: per_page
238 225 };
  226 +
  227 + if (selectedProgram) {
  228 + params.parent_id = selectedProgram.id;
  229 + }
  230 +
  231 + if (query) {params.query = query; }
  232 +
  233 + vm.loadingProposals = true;
  234 + vm.DialogaService.searchProposals(params, function(data){
  235 + vm.total_proposals = parseInt(data._obj.headers('total'));
  236 + vm.filtredProposals = data.articles;
  237 + vm.loadingProposals = false;
  238 + }, function (error) {
  239 + vm.error = error;
  240 + vm.$log.error(error);
  241 + vm.loadingProposals = false;
  242 + });
  243 +};
239 244 })();
... ...