From 332745ca6fee41ecbfe4358772daef0a5ccdb82d Mon Sep 17 00:00:00 2001
From: Jose Pinto <ejosepintog@gmail.com>
Date: Thu, 6 Dec 2018 14:04:51 -0300
Subject: [PATCH] buscador en header, paginado en footer, cambio icons

---
 package.json                    |  42 +++++++-------
 src/views/modal-vendedores.html | 121 +++++++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/package.json b/package.json
index 8901162..cf9447e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,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-clean gulp-replace gulp-uglify 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-clean gulp-replace gulp-uglify jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+http://git.focasoftware.com/npm/foca-directivas.git"
     },
     "pre-commit": [
         "gulp-pre-commit"
@@ -37,27 +37,27 @@
         "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
     },
     "devDependencies": {
-        "angular": "^1.7.5",
-        "angular-ladda": "^0.4.3",
-        "bootstrap": "^4.1.3",
+        "angular": "1.7.5",
+        "angular-ladda": "0.4.3",
+        "bootstrap": "4.1.3",
         "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
-        "font-awesome": "^4.7.0",
-        "gulp": "^3.9.1",
-        "gulp-angular-templatecache": "^2.2.3",
-        "gulp-clean": "^0.4.0",
-        "gulp-concat": "^2.6.1",
-        "gulp-connect": "^5.6.1",
-        "gulp-htmlmin": "^5.0.1",
-        "gulp-jshint": "^2.1.0",
-        "gulp-rename": "^1.4.0",
-        "gulp-replace": "^1.0.0",
-        "gulp-uglify": "^3.0.1",
-        "jasmine-core": "^3.3.0",
-        "jquery": "^3.3.1",
-        "jshint": "^2.9.6",
+        "font-awesome": "4.7.0",
+        "gulp": "3.9.1",
+        "gulp-angular-templatecache": "2.2.5",
+        "gulp-clean": "0.4.0",
+        "gulp-concat": "2.6.1",
+        "gulp-connect": "5.6.1",
+        "gulp-htmlmin": "5.0.1",
+        "gulp-jshint": "2.1.0",
+        "gulp-rename": "1.4.0",
+        "gulp-replace": "1.0.0",
+        "gulp-uglify": "3.0.1",
+        "jasmine-core": "3.3.0",
+        "jquery": "3.3.1",
+        "jshint": "2.9.6",
         "ladda": "1.0.6",
-        "pre-commit": "^1.2.2",
-        "pump": "^3.0.0",
-        "ui-bootstrap4": "^3.0.5"
+        "pre-commit": "1.2.2",
+        "pump": "3.0.0",
+        "ui-bootstrap4": "3.0.5"
     }
 }
diff --git a/src/views/modal-vendedores.html b/src/views/modal-vendedores.html
index 3aaf22f..6342e92 100644
--- a/src/views/modal-vendedores.html
+++ b/src/views/modal-vendedores.html
@@ -1,32 +1,41 @@
-<div class="modal-header">
-    <h5 class="modal-title my-1">Búsqueda de vendedores</h5>
-</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="selectedVendedor == -1"
-            ng-focus="selectedVendedor = -1"
-            teclado-virtual
-        >
-        <div class="input-group-append">
-            <button
+<div class="modal-header py-1">
+    <div class="row w-100">
+        <div class="col-lg-6 col-xs-12">
+            <h5 class="modal-title my-1">Búsqueda de vendedores</h5>
+        </div>
+        <div class="input-group col-lg-6 col-xs-12 pr-0 my-2">
+            <input
                 ladda="searchLoading"
-                class="btn btn-outline-secondary"
-                type="button"
-                ng-click="busquedaPress(13)"
+                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="selectedVendedor == -1"
+                ng-focus="selectedVendedor = -1"
+                teclado-virtual
             >
-                <i class="fa fa-search" aria-hidden="true"></i>
-            </button>
+            <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 ng-show="!primerBusqueda">
+        Debe realizar una primer búsqueda.
+    </div>
+    
     <table ng-show="primerBusqueda" class="table table-striped table-sm col-12">
         <thead>
             <tr>
@@ -48,7 +57,7 @@
                 <td ng-bind="vendedor.CodVen"></td>
                 <td ng-bind="vendedor.NomVen"></td>
                 <td class="d-md-none text-primary">
-                    <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                    <i class="fa fa-circle-thin" aria-hidden="true"></i>
                 </td>
                 <td class="d-none d-md-table-cell">
                     <button
@@ -60,41 +69,41 @@
                         }"
                         foca-focus="selectedVendedor == {{key}}"
                         ng-keydown="itemVendedor($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="currentPageVendedores.length > 0 && primerBusqueda">
-        <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)">
-                    <span aria-hidden="true">&laquo;</span>
-                    <span class="sr-only">Anterior</span>
-                </a>
-            </li>
-            <li
-                class="page-item"
-                ng-repeat="pagina in paginas"
-                ng-class="{'active': pagina == currentPage}"
-            >
-                <a
-                    class="page-link"
-                    href="javascript:void();"
-                    ng-click="selectPage(pagina)"
-                    ng-bind="pagina"
-                ></a>
-            </li>
-            <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
-                <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
-                    <span aria-hidden="true">&raquo;</span>
-                    <span class="sr-only">Siguiente</span>
-                </a>
-            </li>
-        </ul>
-    </nav>
 </div>
-<div class="modal-footer">
+<div class="modal-footer py-1">
+    <nav ng-show="currentPageVendedores.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)">
+                        <span aria-hidden="true">&laquo;</span>
+                        <span class="sr-only">Anterior</span>
+                    </a>
+                </li>
+                <li
+                    class="page-item"
+                    ng-repeat="pagina in paginas"
+                    ng-class="{'active': pagina == currentPage}"
+                >
+                    <a
+                        class="page-link"
+                        href="javascript:void();"
+                        ng-click="selectPage(pagina)"
+                        ng-bind="pagina"
+                    ></a>
+                </li>
+                <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
+                    <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
+                        <span aria-hidden="true">&raquo;</span>
+                        <span class="sr-only">Siguiente</span>
+                    </a>
+                </li>
+            </ul>
+        </nav>
     <button class="btn btn-sm btn-secondary my-1" type="button" ng-click="cancel()">Cancelar</button>
 </div>
-- 
1.9.1