From 72406e4b5fa4fccbf378817f2e689b1c481f1c72 Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Tue, 13 Nov 2018 17:16:05 -0300
Subject: [PATCH] agrego date's

---
 src/js/controller.js             | 17 ++++++++++++++---
 src/js/service.js                |  6 ++++--
 src/views/foca-modal-remito.html | 41 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 6039014..e0ebcfa 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -5,10 +5,13 @@ angular.module('focaModalRemito')
             '$scope',
             '$uibModalInstance',
             'focaModalRemitoService',
+            'usadoPor',
             function($filter, $scope, $uibModalInstance,
-                focaModalRemitoService
+                focaModalRemitoService, usadoPor
             ) {
-
+                var fecha = new Date();
+                $scope.fechaHasta = new Date();
+                $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
                 $scope.filters = '';
                 $scope.remitos = [];
                 $scope.primerBusqueda = false;
@@ -24,10 +27,18 @@ angular.module('focaModalRemito')
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
                         $scope.searchLoading = true;
-                        focaModalRemitoService.getRemitos().then(llenarDatos);
+                        //TODO: usar filtros en vez de toISOString
+                        focaModalRemitoService
+                            .getRemitos(usadoPor, $scope.fechaDesde.toISOString().split('.')[0],
+                                $scope.fechaHasta.toISOString().split('.')[0])
+                            .then(llenarDatos);
                     }
                 };
                 function llenarDatos(res) {
+                    $scope.remitos = [];
+                    $scope.filteredRemitos = [];
+                    $scope.currentPageRemitos = [];
+                    $scope.selectedRemito = -1;
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
                     $scope.remitos = res.data;
diff --git a/src/js/service.js b/src/js/service.js
index 519dc8c..d5d3109 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -4,8 +4,10 @@ angular.module('focaModalRemito')
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
-                getRemitos: function() {
-                    return $http.get(API_ENDPOINT.URL + '/remito');
+                getRemitos: function(usadoPor, fechaDesde, fechaHasta) {
+                    var sinHojaRuta = (usadoPor === 'hojaRuta' ? '/sin-hoja-Ruta' : '');
+                    return $http.get(API_ENDPOINT.URL + '/remito/listar/' + fechaDesde + '/' +
+                        fechaHasta + sinHojaRuta);
                 }
             };
         }
diff --git a/src/views/foca-modal-remito.html b/src/views/foca-modal-remito.html
index 93b2fe2..51f4abe 100644
--- a/src/views/foca-modal-remito.html
+++ b/src/views/foca-modal-remito.html
@@ -3,17 +3,54 @@
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group">
+        <small class="col-2 text-left my-1">Fecha Desde</small>
+        <div class="input-group mb-2 col-4">
+            <div class="input-group-prepend">
+                <div class="input-group-text">
+                    <i class="fa fa-calendar"></i>
+                </div>
+            </div>
+            <input
+                class="form-control form-control-sm"
+                id="inlineFormInputGroup"
+                ladda="searchLoading"
+                type="date"
+                ng-model="fechaDesde"
+                hasta-hoy
+                ng-required="true"
+            />
+        </div>
+        <small class="col-2 text-left my-1">Fecha Hasta</small>
+        <div class="input-group mb-2 col-4">
+            <div class="input-group-prepend">
+                <div class="input-group-text">
+                    <i class="fa fa-calendar"></i>
+                </div>
+            </div>
+            <input
+                class="form-control form-control-sm"
+                id="inlineFormInputGroup"
+                ladda="searchLoading"
+                type="date"
+                ng-model="fechaHasta"
+                ng-required="true"
+                hasta-hoy
+            />
+        </div>
+    </div>
+    <div class="input-group">
         <input
             ladda="searchLoading"
             type="text"
-            class="form-control"
-            placeholder="Busqueda"
+            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
-- 
1.9.1