diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js index 5b435b0..07b82c4 100644 --- a/src/app/components/article-service/article.service.js +++ b/src/app/components/article-service/article.service.js @@ -107,7 +107,7 @@ } function getProposalById (proposalId, params, cbSuccess, cbError) { - var url = service.apiProposals + proposalId + '/ranking?per_page=3&page=1'; + var url = service.apiProposals + proposalId + '/ranking?per_page=5&page=1'; console.log(url); var paramsExtended = angular.extend({ diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 9109524..23e24fb 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -91,9 +91,6 @@ vm.proposals = data.proposals; vm.proposalsTopFive = vm.proposals.slice(0, 5); vm.proposalsTopRated = vm.proposals.slice(0, 3); - //os elementos estavam vindo em ordem inversa - vm.proposalsTopRated.reverse(); - console.table(vm.proposalsTopRated); vm.loadingTopProposals = false; if (vm.article.archived) { diff --git a/src/app/pages/ranking/ranking.controller.js b/src/app/pages/ranking/ranking.controller.js index f088d2b..d11b018 100644 --- a/src/app/pages/ranking/ranking.controller.js +++ b/src/app/pages/ranking/ranking.controller.js @@ -2,8 +2,8 @@ 'use strict'; angular - .module('dialoga') - .controller('RankingPageController', RankingPageController); + .module('dialoga') + .controller('RankingPageController', RankingPageController); /** @ngInject */ function RankingPageController(DialogaService, $scope, $rootScope, $location, $filter, $log) { @@ -108,14 +108,14 @@ vm.loadingThemes = false; vm.loading = false; }); - }; +}; - RankingPageController.prototype.loadPrograms = function (themeId, cb) { - var vm = this; +RankingPageController.prototype.loadPrograms = function (themeId, cb) { + var vm = this; - vm.DialogaService.getProgramsByThemeId(themeId, function (programs){ + vm.DialogaService.getProgramsByThemeId(themeId, function (programs){ - vm.filtredPrograms = programs; + vm.filtredPrograms = programs; // 4. Select a random program of T var selectedProgram = null; @@ -129,11 +129,16 @@ if(results && results.length > 0){ selectedProgram = results[0]; vm.selectedProgram = selectedProgram; + console.log("1"); + console.log(vm.selectedProgram); + console.log("vm.selectedProgram"); } } if(!selectedProgram){ vm.selectedProgram = vm.filtredPrograms[Math.floor(Math.random() * vm.filtredPrograms.length)]; + console.log(vm.selectedProgram); + console.log("2"); } if(cb){ @@ -145,95 +150,95 @@ cb(); } }); - }; +}; - RankingPageController.prototype.attachListeners = function() { - var vm = this; +RankingPageController.prototype.attachListeners = function() { + var vm = this; - vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) { - vm.selectedTheme = selectedCategory; - }); + vm.$scope.$on('change-selectedCategory', function (event, selectedCategory) { + vm.selectedTheme = selectedCategory; + }); - vm.$scope.$watch('pageRanking.selectedTheme', function(newValue/*, oldValue*/) { - vm.search.tema = newValue ? newValue.slug : null; - vm.$location.search('tema', vm.search.tema); + vm.$scope.$watch('pageRanking.selectedTheme', function(newValue/*, oldValue*/) { + vm.search.tema = newValue ? newValue.slug : null; + vm.$location.search('tema', vm.search.tema); - if(!vm.loadingFilter && vm.selectedTheme && vm.selectedTheme.id){ - vm.loadPrograms(vm.selectedTheme.id, function(){ - vm.filterProposals(); - }); - } - }); + if(!vm.loadingFilter && vm.selectedTheme && vm.selectedTheme.id){ + vm.loadPrograms(vm.selectedTheme.id, function(){ + vm.filterProposals(); + }); + } + }); - vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) { - vm.selectedProgram = selectedTopic; - }); + vm.$scope.$on('change-selectedTopic', function (event, selectedTopic) { + vm.selectedProgram = selectedTopic; + }); - vm.$scope.$watch('pageRanking.selectedProgram', function(newValue/*, oldValue*/) { - vm.search.programa = newValue ? newValue.slug : null; - vm.$location.search('programa', vm.search.programa); - - if (!vm.loadingFilter) { - vm.filterProposals(); - } - }); + vm.$scope.$watch('pageRanking.selectedProgram', function(newValue/*, oldValue*/) { + vm.search.programa = newValue ? newValue.slug : null; + vm.$location.search('programa', vm.search.programa); - vm.$scope.$watch('pageRanking.query', function(newValue/*, oldValue*/) { - vm.search.filtro = newValue ? newValue : null; - vm.$location.search('filtro', vm.search.filtro); - - if (!vm.loadingFilter) { - vm.filterProposals(); - } - }); - }; + if (!vm.loadingFilter) { + vm.filterProposals(); + } + }); - RankingPageController.prototype.resetFilterValues = function() { - var vm = this; + vm.$scope.$watch('pageRanking.query', function(newValue/*, oldValue*/) { + vm.search.filtro = newValue ? newValue : null; + vm.$location.search('filtro', vm.search.filtro); - vm.query = null; - vm.selectedTheme = null; - }; + if (!vm.loadingFilter) { + vm.filterProposals(); + } + }); +}; - RankingPageController.prototype.changePage = function(pageIndex) { - var vm = this; +RankingPageController.prototype.resetFilterValues = function() { + var vm = this; - vm.page = pageIndex; - vm.filterProposals(pageIndex); - }; + vm.query = null; + vm.selectedTheme = null; +}; - RankingPageController.prototype.filterProposals = function(_page, _per_page) { - var vm = this; +RankingPageController.prototype.changePage = function(pageIndex) { + var vm = this; - if (vm.loadingProposals){ - vm.$log.debug('Content is not loaded yet.'); - return; - } + vm.page = pageIndex; + vm.filterProposals(pageIndex); +}; - var page = _page || vm.page; - var per_page = _per_page || vm.per_page; - var query = vm.query; - var selectedProgram = vm.selectedProgram; - var params = { - page: page, - per_page: per_page - }; - - if (selectedProgram) { - params.parent_id = selectedProgram.id; - } +RankingPageController.prototype.filterProposals = function(_page, _per_page) { + var vm = this; - if (query) {params.query = query; } + if (vm.loadingProposals){ + vm.$log.debug('Content is not loaded yet.'); + return; + } - vm.loadingProposals = true; - vm.DialogaService.searchProposals(params, function(data){ - vm.total_proposals = parseInt(data._obj.headers('total')); - vm.filtredProposals = data.articles; - vm.loadingProposals = false; - }, function (error) { - vm.error = error; - vm.$log.error(error); - vm.loadingProposals = false; - }); + var page = _page || vm.page; + var per_page = _per_page || vm.per_page; + var query = vm.query; + var selectedProgram = vm.selectedProgram; + var params = { + page: page, + per_page: per_page }; + + if (selectedProgram) { + params.parent_id = selectedProgram.id; + } + + if (query) {params.query = query; } + + vm.loadingProposals = true; + vm.DialogaService.searchProposals(params, function(data){ + vm.total_proposals = parseInt(data._obj.headers('total')); + vm.filtredProposals = data.articles; + vm.loadingProposals = false; + }, function (error) { + vm.error = error; + vm.$log.error(error); + vm.loadingProposals = false; + }); +}; })(); -- libgit2 0.21.2