From 3e7217e89f27ff04b6ab34c66d077b0c1d69f084 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Wed, 18 Nov 2015 08:50:44 -0200
Subject: [PATCH] Fixes #47

---
 src/app/components/app-navbar/app-navbar.html         |  2 +-
 src/app/components/article-service/article.service.js | 20 +++++++++++++++++---
 src/app/pages/propostas/propostas.controller.js       | 56 +++++++++++++++++++++++++++++---------------------------
 src/app/pages/ranking/ranking.controller.js           | 42 +++++++++++++++++++++---------------------
 4 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/src/app/components/app-navbar/app-navbar.html b/src/app/components/app-navbar/app-navbar.html
index 113cb13..d468420 100644
--- a/src/app/components/app-navbar/app-navbar.html
+++ b/src/app/components/app-navbar/app-navbar.html
@@ -28,7 +28,7 @@
         <li ui-sref-active="active"><a ui-sref="ranking">Ranking</a></li>
         <li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>
         <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
-        <li class="dropdown" style="border: none; margin: 20px 0;">
+        <li class="dropdown" style="border: none;">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
           <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share>
           <div class="clearfix"></div>
diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js
index d293ae2..056c97e 100644
--- a/src/app/components/article-service/article.service.js
+++ b/src/app/components/article-service/article.service.js
@@ -250,11 +250,25 @@
 
     function searchProposals (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
-      var url = service.apiSearch + '/article';
+      var url = service.apiSearch + 'article';
       var paramsExtended = angular.extend({
         page: 1,
-        per_page: 20,
-        type: 'ProposalsDiscussionPlugin::Proposal'
+        per_page: 10,
+        type: 'ProposalsDiscussionPlugin::Proposal',
+        'fields[]': [
+          'id',
+          'abstract',
+          'hits',
+          'ranking_position',
+          'votes_against',
+          'votes_count',
+          'votes_for',
+          'parent',
+            'categories',
+            'slug',
+            'url', // parent.image.url
+            'image',
+          ]
       }, params);
 
       UtilService.get(url, {params: paramsExtended}).then(function(data){
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index 99e1ce9..3b67db7 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -28,7 +28,7 @@
     var vm = this;
 
     vm.page = 1;
-    vm.per_page = 20;
+    vm.per_page = 10;
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredPrograms = null;
@@ -57,9 +57,11 @@
       vm.loadingThemes = false;
       vm.loading = false;
 
-      vm.loadProposals(function() {
-        vm.attachListeners();
-      });
+      // REMOVED: function called twice.
+      // vm.loadProposals(function() {
+      //   vm.attachListeners();
+      // });
+      vm.attachListeners();
     }, function(error) {
       vm.error = error;
       vm.$log.error(error);
@@ -68,29 +70,29 @@
     });
   };
 
-  PropostasPageController.prototype.loadProposals = function(cb) {
-    var vm = this;
-
-    // load Proposals
-    vm.loadingProposals = true;
-    vm.DialogaService.searchProposals({
-      page: vm.page,
-      per_page: vm.per_page
-    }, function(data) {
-      vm.filtredProposals = data.articles;
-      vm.total_proposals = parseInt(data._obj.headers('total'));
-
-      vm.loadingProposals = false;
-
-      if (cb) {
-        cb();
-      }
-    }, function(error) {
-      vm.error = error;
-      vm.$log.error(error);
-      vm.loadingProposals = false;
-    });
-  };
+  // PropostasPageController.prototype.loadProposals = function(cb) {
+  //   var vm = this;
+
+  //   // load Proposals
+  //   vm.loadingProposals = true;
+  //   vm.DialogaService.searchProposals({
+  //     page: vm.page,
+  //     per_page: vm.per_page
+  //   }, function(data) {
+  //     vm.filtredProposals = data.articles;
+  //     vm.total_proposals = parseInt(data._obj.headers('total'));
+
+  //     vm.loadingProposals = false;
+
+  //     if (cb) {
+  //       cb();
+  //     }
+  //   }, function(error) {
+  //     vm.error = error;
+  //     vm.$log.error(error);
+  //     vm.loadingProposals = false;
+  //   });
+  // };
 
   PropostasPageController.prototype.attachListeners = function() {
     var vm = this;
diff --git a/src/app/pages/ranking/ranking.controller.js b/src/app/pages/ranking/ranking.controller.js
index e5aa2e7..7d73a0d 100644
--- a/src/app/pages/ranking/ranking.controller.js
+++ b/src/app/pages/ranking/ranking.controller.js
@@ -18,7 +18,7 @@
 
     vm.init();
     vm.loadData();
-    // vm.attachListeners(); // attach listeners after load data (SYNC)
+    vm.attachListeners(); // attach listeners after load data (SYNC)
     vm.$rootScope.focusMainContent();
 
     $log.debug('RankingPageController');
@@ -83,7 +83,7 @@
       // (AND 4)
       var themeId = vm.selectedTheme.id;
       vm.loadPrograms(themeId, function(){
-        vm.loadProposals();
+        // vm.loadProposals();
         vm.loading = false;
       });
     }, function (error) {
@@ -131,25 +131,25 @@
     });
   };
 
-  RankingPageController.prototype.loadProposals = function () {
-    var vm = this;
-
-    // load Proposals
-    vm.loadingProposals = true;
-    vm.DialogaService.getProposals({
-      page: vm.page,
-      per_page: vm.per_page
-    }, function(data){
-      vm.filtredProposals = data.articles;
-      vm.loadingProposals = false;
-
-      vm.attachListeners();
-    }, function (error) {
-      vm.error = error;
-      vm.$log.error(error);
-      vm.loadingProposals = false;
-    });
-  };
+  // RankingPageController.prototype.loadProposals = function () {
+  //   var vm = this;
+
+  //   // load Proposals
+  //   vm.loadingProposals = true;
+  //   vm.DialogaService.getProposals({
+  //     page: vm.page,
+  //     per_page: vm.per_page
+  //   }, function(data){
+  //     vm.filtredProposals = data.articles;
+  //     vm.loadingProposals = false;
+
+  //     vm.attachListeners();
+  //   }, function (error) {
+  //     vm.error = error;
+  //     vm.$log.error(error);
+  //     vm.loadingProposals = false;
+  //   });
+  // };
 
   RankingPageController.prototype.attachListeners = function() {
     var vm = this;
--
libgit2 0.21.2