From 44a742447eb09b416e6b59fcd3b8e0d1e4c02082 Mon Sep 17 00:00:00 2001
From: Jose Pinto <ejosepintog@gmail.com>
Date: Thu, 6 Dec 2018 15:23:47 -0300
Subject: [PATCH] buscador en header, paginado en footer, cambio icons

---
 package.json                   |  8 ++---
 src/views/modal-proveedor.html | 68 ++++++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index df25df9..2782c75 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,14 @@
         "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 jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 gulp-htmlmin git+https://debo.suite.repo/modulos-npm/foca-directivas"
+        "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 gulp-htmlmin git+ssh://git@git.focasoftware.com:npm/foca-directivas"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
-        "url": "https://debo.suite.repo/modulos-npm/foca-modal-proveedor"
+        "url": "git+ssh://git@git.focasoftware.com:npm/foca-modal-proveedor"
     },
     "author": "Nicolás Guarnieri",
     "license": "ISC",
@@ -34,13 +34,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/views/modal-proveedor.html b/src/views/modal-proveedor.html
index a80b418..5ec056e 100644
--- a/src/views/modal-proveedor.html
+++ b/src/views/modal-proveedor.html
@@ -1,32 +1,41 @@
 <div class="modal-header py-1">
-    <h5 class="modal-title" ng-hide="transportista">Búsqueda de Proveedor</h5>
-    <h5 class="modal-title" ng-show="transportista">Búsqueda de Transportista</h5>
+    <div class="row w-100">
+        <div class="col-md-6">
+            <h5 class="modal-title" ng-hide="transportista">Búsqueda de Proveedor</h5>
+            <h5 class="modal-title" ng-show="transportista">Búsqueda de Transportista</h5>
+        </div>
+        <div class="input-group col-md-6 pr-0 my-2">
+            <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="selectedProveedores == -1"
+                ng-focus="selectedProveedores = -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">
-        <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="selectedProveedores == -1"
-            ng-focus="selectedProveedores = -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 ng-show="!primerBusqueda">
+        Debe realizar una primer búsqueda.
     </div>
-</div>
+    
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
@@ -61,13 +70,16 @@
                         foca-focus="selectedProveedores == {{key}}"
                         ng-keydown="itemProveedor($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="currentPageProveedores.length > 0 && primerBusqueda">
+    
+</div>
+<div class="modal-footer py-1">
+    <nav ng-show="currentPageProveedores.length > 0 && primerBusqueda" class="mr-auto">
         <ul class="pagination pagination-sm mb-0">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
@@ -95,7 +107,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