From 1460dc1e50ba69cb619938bf5ba6d362a016b72e Mon Sep 17 00:00:00 2001
From: Jose Pinto <ejosepintog@gmail.com>
Date: Thu, 6 Dec 2018 16:43:57 -0300
Subject: [PATCH]  buscador en header, paginado en footer, cambio icons

---
 package.json                     |   6 +-
 src/views/foca-modal-remito.html | 131 ++++++++++++++++++++-------------------
 2 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index 7d4dde3..a105fb5 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.5",
diff --git a/src/views/foca-modal-remito.html b/src/views/foca-modal-remito.html
index f46353d..fb3d852 100644
--- a/src/views/foca-modal-remito.html
+++ b/src/views/foca-modal-remito.html
@@ -1,5 +1,35 @@
 <div class="modal-header py-1">
-    <h5 class="modal-title">Busqueda de Remito</h5>
+    <div class="row w-100">
+        <div class="col-lg-6">
+            <h5 class="modal-title my-1">Busqueda de Remito</h5>
+        </div>
+        <div class="input-group col-lg-6 pr-0 my-2">
+            <input
+                ladda="searchLoading"
+                type="text"
+                class="form-control form-control-sm"
+                placeholder="Razón social"
+                ng-model="filters"
+                ng-change="search()"
+                ng-keydown="busquedaDown($event.keyCode)"
+                ng-keypress="busquedaPress($event.keyCode)"
+                foca-focus="selectedRemito == -1"
+                ng-focus="selectedRemito = -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">
@@ -38,31 +68,6 @@
             />
         </div>
     </div>
-    <div class="input-group">
-        <input
-            ladda="searchLoading"
-            type="text"
-            class="form-control form-control-sm"
-            placeholder="Razón social"
-            ng-model="filters"
-            ng-change="search()"
-            ng-keydown="busquedaDown($event.keyCode)"
-            ng-keypress="busquedaPress($event.keyCode)"
-            foca-focus="selectedRemito == -1"
-            ng-focus="selectedRemito = -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,49 +100,49 @@
                         foca-focus="selectedRemito == {{key}}"
                         ng-keydown="itemRemito($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="currentPageRemitos.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 py-1">
+        <nav ng-show="currentPageRemitos.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" type="button" ng-click="cancel()">Cancelar</button>
 </div>
-- 
1.9.1