From 539cb31e03a1a864d2a08f2b40e4af114cff5f73 Mon Sep 17 00:00:00 2001
From: 98287028191 <nslmjl_2014*>
Date: Wed, 16 Dec 2015 16:18:52 -0200
Subject: [PATCH] paginas propostas. bug no filtro por tema

---
 src/app/components/article-service/article.service.js |  2 ++
 src/app/pages/propostas/propostas.controller.js       | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/app/pages/propostas/propostas.html                | 14 ++++++++------
 3 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js
index f5b30ca..1f48b98 100644
--- a/src/app/components/article-service/article.service.js
+++ b/src/app/components/article-service/article.service.js
@@ -283,6 +283,7 @@
     function searchProposals (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
       var url = service.apiSearch + 'article';
+      console.log("URL",url);
       var paramsExtended = angular.extend({
         page: 1,
         per_page: 10,
@@ -308,6 +309,7 @@
       UtilService.get(url, {params: paramsExtended}).then(function(data){
         _pipeInjectSlugIntoParentProgram(data);
         cbSuccess(data);
+        console.log("Resposta",data);
       }).catch(function(error){
         cbError(error);
       });
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index 3f2bafe..5c42ab7 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -32,6 +32,7 @@
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredProposals = null;
+    vm.filtredProposalsArchived = null;
     vm.query = null;
     vm.search = vm.$location.search();
 
@@ -110,6 +111,30 @@
     vm.selectedTheme = null;
   };
 
+  PropostasPageController.prototype.filtersArchived = function(dataArticles) {
+    
+    var vm = this;
+    var out = [];
+    var input = dataArticles || [];
+
+    for (var i = 0; i < input.length; i++) {
+      
+      var Proposals = input[i];
+      console.log('****************************',Proposals.parent.title + ' - ' +Proposals.parent.archived + ' - ' + Proposals.title);
+      
+      if (Proposals.parent.archived) {
+
+        out.push(Proposals);                      
+        
+      }
+
+    }
+    
+    return out
+
+  };
+
+
   PropostasPageController.prototype.changePage = function(pageIndex) {
     var vm = this;
 
@@ -166,13 +191,25 @@
       params.category_ids = vm.selectedTheme.id;
     }
 
+
     if (query) {params.query = query; }
 
-    vm.loadingProposals = true;
-    vm.DialogaService.searchProposals(params, function(data){
+      vm.loadingProposals = true;
+      vm.DialogaService.searchProposals(params, function(data){
+
       vm.total_proposals = parseInt(data._obj.headers('total'));
+
+      // Antigo
       vm.filtredProposals = data.articles;
+
+      // Novo
+      vm.filtredProposalsArchived = vm.filtersArchived(vm.filtredProposals);
+
+      // Misto
+      //vm.filtredProposals = vm.filtersArchived(data.articles);      
+      
       vm.loadingProposals = false;
+
     }, function (error) {
       vm.error = error;
       vm.$log.error(error);
@@ -180,9 +217,48 @@
     });
   };
 
-  PropostasPageController.prototype.submitSearch = function() {
+  PropostasPageController.prototype.filterProposalsArchived = function(_page, _per_page) {
     var vm = this;
 
+    if (vm.loadingProposals){
+      vm.$log.debug('Content is not loaded yet.');
+      return;
+    }
+
+    var page = _page || vm.page;
+    var per_page = _per_page || vm.per_page;
+    var query = vm.query;
+    var params = {
+      page: page,
+      per_page: per_page,
+    };
+
+    if (vm.selectedTheme) {
+      params.category_ids = vm.selectedTheme.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 = vm.filtersArchived(data.articles);
+      
+      vm.loadingProposals = false;
+    }, function (error) {
+      vm.error = error;
+      vm.$log.error(error);
+      vm.loadingProposals = false;
+    });
+  };
+
+
+
+  PropostasPageController.prototype.submitSearch = function() {
+    var vm = this;
+    
     // scroll to result grid
     var $searchResult = angular.element('#search-result');
     if ($searchResult && $searchResult.length > 0) {
diff --git a/src/app/pages/propostas/propostas.html b/src/app/pages/propostas/propostas.html
index 92d9372..8d90f18 100644
--- a/src/app/pages/propostas/propostas.html
+++ b/src/app/pages/propostas/propostas.html
@@ -22,7 +22,7 @@
             </div>
         </div>
     </section>
-    <section class="section--header" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+    <section class="section--header" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12">
@@ -31,7 +31,7 @@
             </div>
         </div>
     </section>
-    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
         <div class="container">
             <div id="lista-de-propostas" class="row">
                 <div class="col-sm-4 col-md-3">
@@ -67,7 +67,7 @@
                     </div>
                 </div>
                 <div class="col-sm-8 col-md-9">
-                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
+                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposalsArchived">
                         <div class="col-xs-12">
                             <div class="input-group input-group-lg input-group-search">
                                 <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
@@ -83,7 +83,7 @@
                             </div>
                         </div>
                     </div>
-                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
+                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposalsArchived">
                         <div class="col-sm-12">
                             <header class="header">
                                 <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
@@ -91,8 +91,10 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposals && pagePropostas.total_proposals">
-                            <proposal-grid proposals="pagePropostas.filtredProposals"></proposal-grid>
+                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposalsArchived && pagePropostas.total_proposals">
+
+                            <proposal-grid proposals="pagePropostas.filtredProposalsArchived"></proposal-grid>
+
                             <app-paginator page="pagePropostas.page" per-page="pagePropostas.per_page" total="pagePropostas.total_proposals" change-page="pagePropostas.changePage(pageIndex)"></app-paginator>
                         </div>
                         <div ng-if="pagePropostas.loadingProposals">
--
libgit2 0.21.2