From 92f32611848e5e00435a82661dfe6b70d9dd2a0e Mon Sep 17 00:00:00 2001
From: Jose Pinto <ejosepintog@gmail.com>
Date: Fri, 7 Dec 2018 15:53:32 -0300
Subject: [PATCH] buscador en header, paginado en footer, cambio icons, focus
 no results

focus no results: Hace focus en el input de busqueda cuando no encuentra resultados
---
 package.json                          |  6 ++--
 src/js/controller.js                  | 13 +++++--
 src/views/foca-modal-nota-pedido.html | 66 +++++++++++++++++++----------------
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 55c0557..1c38f58 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
-    "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
+    "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas"
   },
   "pre-commit": [
     "gulp-pre-commit"
@@ -33,13 +33,13 @@
     "gulp-uglify": "^3.0.1",
     "jquery": "^3.3.1",
     "pump": "^3.0.0",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
+    "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
   },
   "devDependencies": {
     "angular": "^1.7.5",
     "angular-ladda": "^0.4.3",
     "bootstrap": "^4.1.3",
-    "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
+    "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
     "font-awesome": "^4.7.0",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.3",
diff --git a/src/js/controller.js b/src/js/controller.js
index b93f91d..a7fa5e5 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -1,12 +1,13 @@
 angular.module('focaModalNotaPedido')
     .controller('focaModalNotaPedidoController', 
         [
+            '$timeout',
             '$filter',
             '$scope',
             '$uibModalInstance',
             'focaModalNotaPedidoService',
             'usadoPor',
-            function($filter, $scope, $uibModalInstance,
+            function($timeout, $filter, $scope, $uibModalInstance,
                 focaModalNotaPedidoService, usadoPor
             ) {
                 var fecha = new Date();
@@ -55,10 +56,10 @@ angular.module('focaModalNotaPedido')
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
                     $scope.notasPedido = res.data;
-                    $scope.search();
+                    $scope.search(true);
                     primera();
                 }
-                $scope.search = function() {
+                $scope.search = function(pressed) {
                     if($scope.notasPedido.length > 0) {
                         $scope.filteredNotasPedido = $filter('filter')(
                             $scope.notasPedido,
@@ -70,6 +71,12 @@ angular.module('focaModalNotaPedido')
                         );
 
                         $scope.resetPage();
+                        if(pressed && $scope.filteredNotasPedido.length === 0){
+                            $timeout(function() {
+                                angular.element('#search')[0].focus();
+                                $scope.filters = '';
+                            });
+                        }
                     }
                 };
 
diff --git a/src/views/foca-modal-nota-pedido.html b/src/views/foca-modal-nota-pedido.html
index 2bfedee..1b14c7f 100644
--- a/src/views/foca-modal-nota-pedido.html
+++ b/src/views/foca-modal-nota-pedido.html
@@ -1,7 +1,38 @@
 <div class="modal-header py-1">
-    <h5 class="modal-title">Busqueda de Nota de Pedido</h5>
+    <div class="row w-100">
+        <div class="col-lg-6">
+            <h5 class="modal-title my-1">Búsqueda de Nota de Pedido</h5>
+        </div>
+        <div class="input-group col-lg-6 pr-0 my-2">
+            <input
+                ladda="searchLoading"
+                type="text"
+                class="form-control form-control-sm"
+                id="search"
+                placeholder="Razón social"
+                ng-model="filters"
+                ng-change="search()"
+                ng-keydown="busquedaDown($event.keyCode)"
+                ng-keypress="busquedaPress($event.keyCode)"
+                foca-focus="selectedNotaPedido == -1"
+                ng-focus="selectedNotaPedido = -1"
+                teclado-virtual
+            />
+            <div class="input-group-append">
+                <button
+                    ladda="searchLoading"
+                    class="btn btn-outline-secondary"
+                    type="button"
+                    ng-click="busquedaPress(13)"
+                >
+                    <i class="fa fa-search" aria-hidden="true"></i>
+                </button>
+            </div>
+        </div>
+    </div>
 </div>
 <div class="modal-body" id="modal-body">
+
     <div class="input-group row">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
@@ -38,31 +69,6 @@
             />
         </div>
     </div>
-    <div class="input-group">
-        <input
-            ladda="searchLoading"
-            type="text"
-            class="form-control form-control-sm"
-            placeholder="Busqueda"
-            ng-model="filters"
-            ng-change="search()"
-            ng-keydown="busquedaDown($event.keyCode)"
-            ng-keypress="busquedaPress($event.keyCode)"
-            foca-focus="selectedNotaPedido == -1"
-            ng-focus="selectedNotaPedido = -1"
-            teclado-virtual
-        />
-        <div class="input-group-append">
-            <button
-                ladda="searchLoading"
-                class="btn btn-outline-secondary"
-                type="button"
-                ng-click="busquedaPress(13)"
-            >
-                <i class="fa fa-search" aria-hidden="true"></i>
-            </button>
-        </div>
-    </div>
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
@@ -95,13 +101,15 @@
                         foca-focus="selectedNotaPedido == {{key}}"
                         ng-keydown="itemNotaPedido($event.keyCode)"
                     >
-                        <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                        <i class="fa fa-circle-thin" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
-    <nav ng-show="currentPageNotasPedido.length > 0 && primerBusqueda">
+</div>
+<div class="modal-footer py-1">
+    <nav ng-show="currentPageNotasPedido.length > 0 && primerBusqueda" class="mr-auto">
         <ul class="pagination pagination-sm justify-content mb-0">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
@@ -129,7 +137,5 @@
             </li>
         </ul>
     </nav>
-</div>
-<div class="modal-footer py-1">
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
 </div>
-- 
1.9.1