From de0d0a786db539c5c27e4e5f4a80e10f4e9c4693 Mon Sep 17 00:00:00 2001
From: Leonardo Merlin <leonardo.merlin@serpro.gov.br>
Date: Fri, 25 Sep 2015 17:38:49 -0300
Subject: [PATCH] Fix search button and scroll

---
 src/app/pages/programas/programas.controller.js | 15 +++++++++++++++
 src/app/pages/programas/programas.html          |  6 +++---
 src/app/pages/propostas/propostas.controller.js | 19 ++++++++++++++++++-
 src/app/pages/propostas/propostas.html          |  8 ++++----
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/app/pages/programas/programas.controller.js b/src/app/pages/programas/programas.controller.js
index 63e5eb1..c0b6800 100644
--- a/src/app/pages/programas/programas.controller.js
+++ b/src/app/pages/programas/programas.controller.js
@@ -139,6 +139,21 @@
 
   };
 
+  ProgramasPageController.prototype.submitSearch = function() {
+    var vm = this;
+
+    vm.loadingFilter = true;
+
+    // scroll to result grid
+    var $searchResult = angular.element('#search-result');
+    if ($searchResult && $searchResult.length > 0) {
+      angular.element('body').animate({scrollTop: $searchResult.offset().top}, 'fast');
+      vm.filtredPrograms = vm.getFiltredPrograms();
+    }else {
+      vm.$log.warn('#search-result element not found.');
+    }
+  };
+
   ProgramasPageController.prototype.showAllPrograms = function($event) {
     var vm = this;
     $event.stopPropagation();
diff --git a/src/app/pages/programas/programas.html b/src/app/pages/programas/programas.html
index 856483e..63ec200 100644
--- a/src/app/pages/programas/programas.html
+++ b/src/app/pages/programas/programas.html
@@ -26,7 +26,7 @@
                 <label for="articleQueryFilter" class="control-label sr-only">Buscar programas:</label>
                 <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pageProgramas.query" placeholder="Buscar programas" aria-label="Buscar programas" >
                 <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" ng-click="pageProgramas.search()">
+                  <button type="button" class="btn btn-default" ng-click="pageProgramas.submitSearch()">
                     <span class="icon-circle icon-small color-theme-common-bg">
                       <span class="glyphicon glyphicon-search"></span>
                     </span>
@@ -58,7 +58,7 @@
                 <label for="articleQueryFilter" class="control-label sr-only">Buscar programas:</label>
                 <input id="articleQueryFilter" type="search" class="form-control input-search" ng-model="pageProgramas.query" placeholder="Buscar programas" aria-label="Buscar programas" >
                 <span class="input-group-btn">
-                  <button type="button" class="btn btn-default" ng-click="pageProgramas.search()">
+                  <button type="button" class="btn btn-default" ng-click="pageProgramas.submitSearch()">
                     <span class="icon-circle icon-small color-theme-common-bg">
                       <span class="glyphicon glyphicon-search"></span>
                     </span>
@@ -68,7 +68,7 @@
               </div>
             </div>
           </div>
-          <div class="row">
+          <div id="search-result" class="row">
             <div class="col-sm-12">
               <header class="header">
                 <h2>Conheça os programas</h2>
diff --git a/src/app/pages/propostas/propostas.controller.js b/src/app/pages/propostas/propostas.controller.js
index 9c22c07..fa57d69 100644
--- a/src/app/pages/propostas/propostas.controller.js
+++ b/src/app/pages/propostas/propostas.controller.js
@@ -6,11 +6,12 @@
     .controller('PropostasPageController', PropostasPageController);
 
   /** @ngInject */
-  function PropostasPageController(DialogaService, $scope, $location, $filter, $log) {
+  function PropostasPageController(DialogaService, $scope, $rootScope, $location, $filter, $log) {
     var vm = this;
 
     vm.DialogaService = DialogaService;
     vm.$scope = $scope;
+    vm.$rootScope = $rootScope;
     vm.$location = $location;
     vm.$filter = $filter;
     vm.$log = $log;
@@ -18,6 +19,7 @@
     vm.init();
     vm.loadData();
     // vm.attachListeners(); // attach listeners after load data (SYNC)
+    vm.$rootScope.focusMainContent();
 
     $log.debug('PropostasPageController');
   }
@@ -156,4 +158,19 @@
     return output;
   };
 
+  PropostasPageController.prototype.submitSearch = function() {
+    var vm = this;
+
+    vm.loadingFilter = true;
+
+    // scroll to result grid
+    var $searchResult = angular.element('#search-result');
+    if ($searchResult && $searchResult.length > 0) {
+      angular.element('body').animate({scrollTop: $searchResult.offset().top}, 'fast');
+      vm.filtredProposals = vm.getFiltredProposals();
+    }else {
+      vm.$log.warn('#search-result element not found.');
+    }
+  };
+
 })();
diff --git a/src/app/pages/propostas/propostas.html b/src/app/pages/propostas/propostas.html
index 7b833de..dd7ec10 100644
--- a/src/app/pages/propostas/propostas.html
+++ b/src/app/pages/propostas/propostas.html
@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<div class="page--propostas">
+<div class="page--propostas" role="main">
 
   <section class="section-info" ng-if="pagePropostas.loading || pagePropostas.error">
     <div class="container">
@@ -46,7 +46,7 @@
                 <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.search()">
+                  <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>
@@ -78,7 +78,7 @@
                 <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.search()">
+                  <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>
@@ -89,7 +89,7 @@
             </div>
           </div>
 
-          <div class="row" ng-if="pagePropostas.proposals">
+          <div id="search-result" class="row" ng-if="pagePropostas.proposals">
             <div class="col-sm-12">
               <header class="header">
                 <h2>Total de Propostas: "<b>{{pagePropostas.filtredProposals.length}} propostas</b>"</h2>
--
libgit2 0.21.2