From faaeecf95f46850c39fbce57dd37de4b4c4ee10b Mon Sep 17 00:00:00 2001
From: Benjamin <brodriguez@focasoftware.com>
Date: Mon, 23 Sep 2019 10:22:01 -0300
Subject: [PATCH] cambio en busqueda-busqueda por cliente o remito

---
 src/js/controller.js             | 33 +++++++++++++++++++++++++++++----
 src/views/foca-modal-remito.html | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index a1f4c55..8151944 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -14,7 +14,8 @@ angular.module('focaModalRemito')
                 var fecha = new Date();
                 $scope.fechaHasta = new Date();
                 $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
-                $scope.filters = '';
+                $scope.filtersCliente = '';
+                $scope.filtersRemito = '';
                 $scope.remitos = [];
                 $scope.isCollapsed = false;
                 $scope.verProductos = {};
@@ -53,6 +54,7 @@ angular.module('focaModalRemito')
                             .then(llenarDatos);
                     }
                 };
+                
                 function llenarDatos(res) {
                     $scope.remitos = [];
                     $scope.filteredRemitos = [];
@@ -64,17 +66,40 @@ angular.module('focaModalRemito')
                     $scope.search(true);
                     primera();
                 }
-                $scope.search = function(pressed) {
+
+                $scope.searchRemito = function(pressed) {
+                    if($scope.remitos.length > 0) {
+                        $scope.filteredRemitos = $filter('filter')(
+                            $scope.remitos,
+                            {numeroRemito: $scope.filtersRemito}
+                        );
+
+                        if(pressed && $scope.filteredRemitos.length === 0){
+                            $timeout(function() {
+                                angular.element('#search')[0].focus();
+                                $scope.filtersRemito = '';
+                            });
+                        }
+
+                        $scope.lastPage = Math.ceil(
+                            $scope.filteredRemitos.length / $scope.numPerPage
+                        );
+
+                        $scope.resetPage();
+                    }
+                }
+
+                $scope.searchCliente = function(pressed) {
                     if($scope.remitos.length > 0) {
                         $scope.filteredRemitos = $filter('filter')(
                             $scope.remitos,
-                            {$: $scope.filters}
+                            {nombreCliente: $scope.filtersCliente}
                         );
 
                         if(pressed && $scope.filteredRemitos.length === 0){
                             $timeout(function() {
                                 angular.element('#search')[0].focus();
-                                $scope.filters = '';
+                                $scope.filtersCliente = '';
                             });
                         }
 
diff --git a/src/views/foca-modal-remito.html b/src/views/foca-modal-remito.html
index efc25f1..605e6a4 100644
--- a/src/views/foca-modal-remito.html
+++ b/src/views/foca-modal-remito.html
@@ -4,13 +4,37 @@
             <h5 class="modal-title my-1">Búsqueda de Remito</h5>
         </div>
         <div class="input-group col-lg-6 pr-0 my-2">
+            <div class="mr-4">
+                <input
+                    ladda="searchLoading"
+                    type="text"
+                    class="form-control form-control-sm"
+                    placeholder="CLIENTE"
+                    ng-model="filtersCliente"
+                    ng-change="searchCliente()"
+                    ng-keydown="busquedaDown($event.keyCode)"
+                    ng-keypress="busquedaPress($event.keyCode)"
+                    foca-focus="selectedRemito == -1"
+                    ng-focus="selectedRemito = -1"
+                    id="search"
+                    teclado-virtual
+                >
+                <button 
+                    ng-show="filtersCliente.length >= 1"
+                    type="button"
+                    class="clear-input"
+                    ng-click="filtersCliente = ''"
+                >
+                    <i class="fa fa-times"></i>
+                </button>
+            </div>
             <input
                 ladda="searchLoading"
                 type="text"
                 class="form-control form-control-sm"
-                placeholder="Razón social"
-                ng-model="filters"
-                ng-change="search()"
+                placeholder="REMITO"
+                ng-model="filtersRemito"
+                ng-change="searchRemito()"
                 ng-keydown="busquedaDown($event.keyCode)"
                 ng-keypress="busquedaPress($event.keyCode)"
                 foca-focus="selectedRemito == -1"
@@ -18,14 +42,15 @@
                 id="search"
                 teclado-virtual
             >
+            
             <button 
-                ng-show="filters.length >= 1"
+                ng-show="filtersRemito.length >= 1"
                 type="button"
                 class="clear-input"
-                ng-click="filters = ''"
+                ng-click="filtersRemito = ''"
             >
                 <i class="fa fa-times"></i>
-            </button>  
+            </button>
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"
@@ -37,9 +62,9 @@
                     <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">
-- 
1.9.1