From 9ddbbe34c854b042f841da61b8b6361f92fa6608 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Fri, 27 Nov 2015 15:13:43 -0200
Subject: [PATCH] fix page 'propostas' - filter params and scroll bugs

---
 src/app/pages/propostas/propostas.controller.js |  84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
 src/app/pages/propostas/propostas.html          | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------
 2 files changed, 156 insertions(+), 143 deletions(-)

diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index 74eb341..df60a51 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -18,7 +18,7 @@
 
     vm.init();
     vm.loadData();
-    // vm.attachListeners(); // attach listeners after load data (SYNC)
+    vm.attachListeners();
     vm.$rootScope.focusMainContent();
 
     $log.debug('PropostasPageController');
@@ -31,11 +31,22 @@
     vm.per_page = 10;
     vm.themes = null;
     vm.selectedTheme = null;
-    vm.filtredPrograms = null;
     vm.filtredProposals = null;
     vm.query = null;
     vm.search = vm.$location.search();
 
+    if (vm.search.tema) {
+      vm._filtredByThemeSlug = vm.search.tema;
+    }
+
+    if (vm.search.filtro) {
+      vm._filtredByQuery = vm.search.filtro;
+    }
+
+    if (vm.search.tema || vm.search.filtro) {
+      vm.loadingFilter = true;
+    }
+
     vm.loading = null;
     vm.error = null;
   };
@@ -61,7 +72,9 @@
       // vm.loadProposals(function() {
       //   vm.attachListeners();
       // });
-      vm.attachListeners();
+      // vm.attachListeners();
+      
+      vm.filter();
     }, function(error) {
       vm.error = error;
       vm.$log.error(error);
@@ -70,30 +83,6 @@
     });
   };
 
-  // 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;
 
@@ -104,13 +93,19 @@
     vm.$scope.$watch('pagePropostas.selectedTheme', function(newValue/*, oldValue*/) {
       vm.search.tema = newValue ? newValue.slug : null;
       vm.$location.search('tema', vm.search.tema);
-      vm.filterProposals();
+
+      if (!vm.loadingFilter) {
+        vm.filterProposals();
+      }
     });
 
     vm.$scope.$watch('pagePropostas.query', function(newValue/*, oldValue*/) {
       vm.search.filtro = newValue ? newValue : null;
       vm.$location.search('filtro', vm.search.filtro);
-      vm.filterProposals();
+
+      if (!vm.loadingFilter) {
+        vm.filterProposals();
+      }
     });
   };
 
@@ -128,6 +123,35 @@
     vm.filterProposals(pageIndex);
   };
 
+  PropostasPageController.prototype.filter = function() {
+    var vm = this;
+
+    if (vm.loadingThemes || vm.loadingProposals) {
+      vm.$log.info('No proposals or themes loaded yet. Abort.');
+      return;
+    }
+
+    if (vm._filtredByThemeSlug) {
+      var slug = vm._filtredByThemeSlug;
+
+      vm.DialogaService.getThemeBySlug(slug, function(theme) {
+        vm.selectedTheme = theme;
+      }, function(error) {
+        vm.$log.error('Error when try to "getThemeBySlug"', error);
+      });
+    }
+
+    if (vm._filtredByQuery) {
+      vm.query = vm._filtredByQuery;
+    }
+
+    if (vm._filtredByThemeSlug || vm._filtredByQuery) {
+      vm.filterProposals();
+      vm.loadingFilter = false;
+    }
+
+  };
+
   PropostasPageController.prototype.filterProposals = function(_page, _per_page) {
     var vm = this;
 
@@ -165,7 +189,7 @@
   PropostasPageController.prototype.submitSearch = function() {
     var vm = this;
 
-    vm.loadingFilter = true;
+    // vm.loadingFilter = true;
 
     // scroll to result grid
     var $searchResult = angular.element('#search-result');
diff --git a/src/app/pages/propostas/propostas.html b/src/app/pages/propostas/propostas.html
index b8216fd..92d9372 100644
--- a/src/app/pages/propostas/propostas.html
+++ b/src/app/pages/propostas/propostas.html
@@ -1,124 +1,113 @@
 <div class="container">
-  <div class="row">
-    <div class="col-sm-12">
-      <div ncy-breadcrumb></div>
+    <div class="row">
+        <div class="col-sm-12">
+            <div ncy-breadcrumb></div>
+        </div>
     </div>
-  </div>
 </div>
-
 <div class="page--propostas" role="main">
-  <section class="section-info" ng-if="pagePropostas.loading || pagePropostas.error">
-    <div class="container">
-      <div class="row">
-        <div class="col-md-12">
-          <div ng-if="pagePropostas.loading && !pagePropostas.error">
-            <div class="alert alert-info" role="alert">Carregando conteúdo...</div>
-          </div>
-
-          <div ng-if="pagePropostas.error">
-            <div class="alert alert-danger" role="alert">
-              Erro ao carregar o conteúdo principal.
+    <section class="section-info" ng-if="pagePropostas.loading || pagePropostas.error">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12">
+                    <div ng-if="pagePropostas.loading && !pagePropostas.error">
+                        <div class="alert alert-info" role="alert">Carregando conteúdo...</div>
+                    </div>
+                    <div ng-if="pagePropostas.error">
+                        <div class="alert alert-danger" role="alert">
+                            Erro ao carregar o conteúdo principal.
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
-    </div>
-  </section>
-
-  <section class="section--header" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
-    <div class="container">
-      <div class="row">
-        <div class="col-sm-12">
-          <h1>Propostas</h1>
-        </div>
-      </div>
-    </div>
-  </section>
-
-  <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
-    <div class="container">
-      <div id="lista-de-propostas" class="row">
-        <div class="col-sm-4 col-md-3">
-          <div class="row visible-xs">
-            <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>
-                <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas">
-                <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" ng-click="pagePropostas.submitSearch()">
-                    <span class="icon-circle icon-small color-theme-common-bg">
-                      <span class="glyphicon glyphicon-search"></span>
-                </span>
-                <span class="sr-only">Buscar</span>
-                </button>
-                </span>
-              </div>
-              <br/>
-            </div>
-          </div>
-          <div ng-if="pagePropostas.themes">
-            <category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme"></category-list>
-          </div>
-          <div ng-if="!pagePropostas.themes && pagePropostas.loadingThemes">
-            <div class="alert alert-info" role="alert">
-              Carregando temas.
+    </section>
+    <section class="section--header" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <h1>Propostas</h1>
+                </div>
             </div>
-          </div>
-          <div ng-if="!pagePropostas.themes && pagePropostas.themesError">
-            <div class="alert alert-danger" role="alert">
-              Não foi possível carregar a lista de temas neste momento.
-            </div>
-          </div>
         </div>
-        <div class="col-sm-8 col-md-9">
-          <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
-            <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>
-                <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas">
-                <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" ng-click="pagePropostas.submitSearch()">
-                    <span class="icon-circle icon-small color-theme-common-bg">
-                      <span class="glyphicon glyphicon-search"></span>
-                </span>
-                <span class="sr-only">Buscar</span>
-                </button>
-                </span>
-              </div>
-            </div>
-          </div>
-
-          <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
-            <div class="col-sm-12">
-              <header class="header">
-                <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
-              </header>
-            </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>
-              <app-paginator
-                page="pagePropostas.page"
-                per-page="pagePropostas.per_page"
-                total="pagePropostas.total_proposals"
-                change-page="pagePropostas.changePage(pageIndex)"
-              ></app-paginator>
+    </section>
+    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+        <div class="container">
+            <div id="lista-de-propostas" class="row">
+                <div class="col-sm-4 col-md-3">
+                    <div class="row visible-xs">
+                        <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>
+                                <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas">
+                                <div class="input-group-btn">
+                                    <button type="button" class="btn btn-default" ng-click="pagePropostas.submitSearch()">
+                                        <div class="icon-circle icon-small color-theme-common-bg">
+                                          <span class="glyphicon glyphicon-search"></span>
+                                        </div>
+                                        <span class="sr-only">Buscar</span>
+                                    </button>
+                                </div>
+                            </div>
+                            <br/>
+                        </div>
+                    </div>
+                    <div ng-if="pagePropostas.themes">
+                        <category-list categories="pagePropostas.themes" selected-category="pagePropostas.selectedTheme"></category-list>
+                    </div>
+                    <div ng-if="!pagePropostas.themes && pagePropostas.loadingThemes">
+                        <div class="alert alert-info" role="alert">
+                            Carregando temas.
+                        </div>
+                    </div>
+                    <div ng-if="!pagePropostas.themes && pagePropostas.themesError">
+                        <div class="alert alert-danger" role="alert">
+                            Não foi possível carregar a lista de temas neste momento.
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-8 col-md-9">
+                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
+                        <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>
+                                <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pagePropostas.query" placeholder="Buscar propostas" aria-label="Buscar propostas">
+                                <div class="input-group-btn">
+                                    <button type="button" class="btn btn-default" ng-click="pagePropostas.submitSearch()">
+                                        <div class="icon-circle icon-small color-theme-common-bg">
+                                          <span class="glyphicon glyphicon-search"></span>
+                                        </div>
+                                        <span class="sr-only">Buscar</span>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
+                        <div class="col-sm-12">
+                            <header class="header">
+                                <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
+                            </header>
+                        </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>
+                            <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">
+                            <div class="alert alert-info" role="alert">
+                                Carregando propostas.
+                            </div>
+                        </div>
+                        <div ng-if="!pagePropostas.loadingProposals && pagePropostas.proposalsError">
+                            <div class="alert alert-danger" role="alert">
+                                Não foi possível carregar a lista de propostas neste momento.
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div ng-if="pagePropostas.loadingProposals">
-              <div class="alert alert-info" role="alert">
-                Carregando propostas.
-              </div>
-            </div>
-            <div ng-if="!pagePropostas.loadingProposals && pagePropostas.proposalsError">
-              <div class="alert alert-danger" role="alert">
-                Não foi possível carregar a lista de propostas neste momento.
-              </div>
-            </div>
-          </div>
         </div>
-      </div>
-    </div>
-  </section>
+    </section>
 </div>
--
libgit2 0.21.2