Jose Pinto / foca-modal-remito

Download as
Browse Code »

Commit d24cb28984456b8a0715b8a256f79ae343c35963

Authored by Pablo Marco del Pont
2 parents 3499947ca9 03fa05eb11
Exists in master

Merge branch 'master' into 'master' 

Master

See merge request modulos-npm/foca-modal-remito!4
Showing 3 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ d24cb28
1 angular.module('focaModalRemito') 1 angular.module('focaModalRemito')
2 .controller('focaModalRemitoController', 2 .controller('focaModalRemitoController',
3 [ 3 [
4 '$filter', 4 '$filter',
5 '$scope', 5 '$scope',
6 '$uibModalInstance', 6 '$uibModalInstance',
7 'focaModalRemitoService', 7 'focaModalRemitoService',
8 'usadoPor',
8 function($filter, $scope, $uibModalInstance, 9 function($filter, $scope, $uibModalInstance,
9 focaModalRemitoService 10 focaModalRemitoService, usadoPor
10 ) { 11 ) {
11 12 var fecha = new Date();
13 $scope.fechaHasta = new Date();
14 $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
12 $scope.filters = ''; 15 $scope.filters = '';
13 $scope.remitos = []; 16 $scope.remitos = [];
14 $scope.primerBusqueda = false; 17 $scope.primerBusqueda = false;
15 $scope.searchLoading = false; 18 $scope.searchLoading = false;
16 // pagination 19 // pagination
17 $scope.numPerPage = 10; 20 $scope.numPerPage = 10;
18 $scope.currentPage = 1; 21 $scope.currentPage = 1;
19 $scope.filteredRemitos = []; 22 $scope.filteredRemitos = [];
20 $scope.currentPageRemitos = []; 23 $scope.currentPageRemitos = [];
21 $scope.selectedRemito = -1; 24 $scope.selectedRemito = -1;
22 25
23 //METODOS 26 //METODOS
24 $scope.busquedaPress = function(key) { 27 $scope.busquedaPress = function(key) {
25 if (key === 13) { 28 if (key === 13) {
29 //TODO Validaciones con alertas de foca
30 if(!$scope.fechaDesde) {
31 alert('INGRESE FECHA DESDE');
32 return;
33 }
34 if(!$scope.fechaHasta) {
35 alert('INGRESE FECHA HASTA');
36 return;
37 }
38 if($scope.fechaDesde > $scope.fechaHasta) {
39 alert('La fecha desde no puede ser mayor a la fecha hasta');
40 return;
41 }
26 $scope.searchLoading = true; 42 $scope.searchLoading = true;
27 focaModalRemitoService.getRemitos().then(llenarDatos); 43 //TODO: usar filtros en vez de toISOString
44 focaModalRemitoService
45 .getRemitos(usadoPor, $scope.fechaDesde.toISOString().split('.')[0],
46 $scope.fechaHasta.toISOString().split('.')[0])
47 .then(llenarDatos);
28 } 48 }
29 }; 49 };
30 function llenarDatos(res) { 50 function llenarDatos(res) {
51 $scope.remitos = [];
52 $scope.filteredRemitos = [];
53 $scope.currentPageRemitos = [];
54 $scope.selectedRemito = -1;
31 $scope.searchLoading = false; 55 $scope.searchLoading = false;
32 $scope.primerBusqueda = true; 56 $scope.primerBusqueda = true;
33 $scope.remitos = res.data; 57 $scope.remitos = res.data;
34 $scope.search(); 58 $scope.search();
35 primera(); 59 primera();
36 } 60 }
37 $scope.search = function() { 61 $scope.search = function() {
38 if($scope.remitos.length > 0) { 62 if($scope.remitos.length > 0) {
39 $scope.filteredRemitos = $filter('filter')( 63 $scope.filteredRemitos = $filter('filter')(
40 $scope.remitos, 64 $scope.remitos,
41 {$: $scope.filters} 65 {$: $scope.filters}
42 ); 66 );
43 67
44 $scope.lastPage = Math.ceil( 68 $scope.lastPage = Math.ceil(
45 $scope.filteredRemitos.length / $scope.numPerPage 69 $scope.filteredRemitos.length / $scope.numPerPage
46 ); 70 );
47 71
48 $scope.resetPage(); 72 $scope.resetPage();
49 } 73 }
50 }; 74 };
51 75
52 $scope.resetPage = function() { 76 $scope.resetPage = function() {
53 $scope.currentPage = 1; 77 $scope.currentPage = 1;
54 $scope.selectPage(1); 78 $scope.selectPage(1);
55 }; 79 };
56 80
57 $scope.selectPage = function(page) { 81 $scope.selectPage = function(page) {
58 var start = (page - 1) * $scope.numPerPage; 82 var start = (page - 1) * $scope.numPerPage;
59 var end = start + $scope.numPerPage; 83 var end = start + $scope.numPerPage;
60 $scope.paginas = []; 84 $scope.paginas = [];
61 $scope.paginas = calcularPages(page); 85 $scope.paginas = calcularPages(page);
62 $scope.currentPageRemitos = $scope.filteredRemitos.slice(start, end); 86 $scope.currentPageRemitos = $scope.filteredRemitos.slice(start, end);
63 $scope.currentPage = page; 87 $scope.currentPage = page;
64 }; 88 };
65 89
66 $scope.select = function(remito) { 90 $scope.select = function(remito) {
67 $uibModalInstance.close(remito); 91 $uibModalInstance.close(remito);
68 }; 92 };
69 93
70 $scope.cancel = function() { 94 $scope.cancel = function() {
71 $uibModalInstance.dismiss('cancel'); 95 $uibModalInstance.dismiss('cancel');
72 }; 96 };
73 97
74 $scope.busquedaDown = function(key) { 98 $scope.busquedaDown = function(key) {
75 if (key === 40) { 99 if (key === 40) {
76 primera(key); 100 primera(key);
77 } 101 }
78 }; 102 };
79 103
80 $scope.itemRemito = function(key) { 104 $scope.itemRemito = function(key) {
81 if (key === 38) { 105 if (key === 38) {
82 anterior(key); 106 anterior(key);
83 } 107 }
84 108
85 if (key === 40) { 109 if (key === 40) {
86 siguiente(key); 110 siguiente(key);
87 } 111 }
88 112
89 if (key === 37) { 113 if (key === 37) {
90 retrocederPagina(); 114 retrocederPagina();
91 } 115 }
92 116
93 if (key === 39) { 117 if (key === 39) {
94 avanzarPagina(); 118 avanzarPagina();
95 } 119 }
96 }; 120 };
97 121
98 function calcularPages(paginaActual) { 122 function calcularPages(paginaActual) {
99 var paginas = []; 123 var paginas = [];
100 paginas.push(paginaActual); 124 paginas.push(paginaActual);
101 125
102 if (paginaActual - 1 > 1) { 126 if (paginaActual - 1 > 1) {
103 127
104 paginas.unshift(paginaActual - 1); 128 paginas.unshift(paginaActual - 1);
105 if (paginaActual - 2 > 1) { 129 if (paginaActual - 2 > 1) {
106 paginas.unshift(paginaActual - 2); 130 paginas.unshift(paginaActual - 2);
107 } 131 }
108 } 132 }
109 133
110 if (paginaActual + 1 < $scope.lastPage) { 134 if (paginaActual + 1 < $scope.lastPage) {
111 paginas.push(paginaActual + 1); 135 paginas.push(paginaActual + 1);
112 if (paginaActual + 2 < $scope.lastPage) { 136 if (paginaActual + 2 < $scope.lastPage) {
113 paginas.push(paginaActual + 2); 137 paginas.push(paginaActual + 2);
114 } 138 }
115 } 139 }
116 140
117 if (paginaActual !== 1) { 141 if (paginaActual !== 1) {
118 paginas.unshift(1); 142 paginas.unshift(1);
119 } 143 }
120 144
121 if (paginaActual !== $scope.lastPage) { 145 if (paginaActual !== $scope.lastPage) {
122 paginas.push($scope.lastPage); 146 paginas.push($scope.lastPage);
123 } 147 }
124 148
125 return paginas; 149 return paginas;
126 } 150 }
127 151
128 function primera() { 152 function primera() {
129 $scope.selectedRemito = 0; 153 $scope.selectedRemito = 0;
130 } 154 }
131 155
132 function anterior() { 156 function anterior() {
133 if ($scope.selectedRemito === 0 && $scope.currentPage > 1) { 157 if ($scope.selectedRemito === 0 && $scope.currentPage > 1) {
134 retrocederPagina(); 158 retrocederPagina();
135 } else { 159 } else {
136 $scope.selectedRemito--; 160 $scope.selectedRemito--;
137 } 161 }
138 } 162 }
139 163
140 function siguiente() { 164 function siguiente() {
141 if ($scope.selectedRemito < $scope.currentPageRemitos.length - 1 ) { 165 if ($scope.selectedRemito < $scope.currentPageRemitos.length - 1 ) {
142 $scope.selectedRemito++; 166 $scope.selectedRemito++;
143 } else { 167 } else {
144 avanzarPagina(); 168 avanzarPagina();
145 } 169 }
146 } 170 }
147 171
148 function retrocederPagina() { 172 function retrocederPagina() {
149 if ($scope.currentPage > 1) { 173 if ($scope.currentPage > 1) {
150 $scope.selectPage($scope.currentPage - 1); 174 $scope.selectPage($scope.currentPage - 1);
151 $scope.selectedRemito = $scope.numPerPage - 1; 175 $scope.selectedRemito = $scope.numPerPage - 1;
152 } 176 }
153 } 177 }
154 178
155 function avanzarPagina() { 179 function avanzarPagina() {
156 if ($scope.currentPage < $scope.lastPage) { 180 if ($scope.currentPage < $scope.lastPage) {
157 $scope.selectPage($scope.currentPage + 1); 181 $scope.selectPage($scope.currentPage + 1);
158 $scope.selectedRemito = 0; 182 $scope.selectedRemito = 0;
159 } 183 }
160 } 184 }
161 } 185 }
162 ] 186 ]
163 ); 187 );
164 188
1 angular.module('focaModalRemito') 1 angular.module('focaModalRemito')
2 .service('focaModalRemitoService', [ 2 .service('focaModalRemitoService', [
3 '$http', 3 '$http',
4 'API_ENDPOINT', 4 'API_ENDPOINT',
5 function($http, API_ENDPOINT) { 5 function($http, API_ENDPOINT) {
6 return { 6 return {
7 getRemitos: function() { 7 getRemitos: function(usadoPor, fechaDesde, fechaHasta) {
8 return $http.get(API_ENDPOINT.URL + '/remito'); 8 var sinHojaRuta = (usadoPor === 'hojaRuta' ? '/sin-hoja-Ruta' : '');
9 return $http.get(API_ENDPOINT.URL + '/remito/listar/' + fechaDesde + '/' +
10 fechaHasta + sinHojaRuta);
9 } 11 }
10 }; 12 };
11 } 13 }
12 ]); 14 ]);
13 15
src/views/foca-modal-remito.html
Diff comments   View file @ d24cb28
1 <div class="modal-header py-1"> 1 <div class="modal-header py-1">
2 <h5 class="modal-title">Busqueda de Remito</h5> 2 <h5 class="modal-title">Busqueda de Remito</h5>
3 </div> 3 </div>
4 <div class="modal-body" id="modal-body"> 4 <div class="modal-body" id="modal-body">
5 <div class="input-group"> 5 <div class="input-group">
6 <small class="col-2 text-left my-1">Fecha Desde</small>
7 <div class="input-group mb-2 col-4">
8 <div class="input-group-prepend">
9 <div class="input-group-text">
10 <i class="fa fa-calendar"></i>
11 </div>
12 </div>
13 <input
14 class="form-control form-control-sm"
15 id="inlineFormInputGroup"
16 ladda="searchLoading"
17 type="date"
18 ng-model="fechaDesde"
19 hasta-hoy
20 ng-required="true"
21 />
22 </div>
23 <small class="col-2 text-left my-1">Fecha Hasta</small>
24 <div class="input-group mb-2 col-4">
25 <div class="input-group-prepend">
26 <div class="input-group-text">
27 <i class="fa fa-calendar"></i>
28 </div>
29 </div>
30 <input
31 class="form-control form-control-sm"
32 id="inlineFormInputGroup"
33 ladda="searchLoading"
34 type="date"
35 ng-model="fechaHasta"
36 ng-required="true"
37 hasta-hoy
38 />
39 </div>
40 </div>
41 <div class="input-group">
6 <input 42 <input
7 ladda="searchLoading" 43 ladda="searchLoading"
8 type="text" 44 type="text"
9 class="form-control" 45 class="form-control form-control-sm"
10 placeholder="Busqueda" 46 placeholder="Razón social"
11 ng-model="filters" 47 ng-model="filters"
12 ng-change="search()" 48 ng-change="search()"
13 ng-keydown="busquedaDown($event.keyCode)" 49 ng-keydown="busquedaDown($event.keyCode)"
14 ng-keypress="busquedaPress($event.keyCode)" 50 ng-keypress="busquedaPress($event.keyCode)"
15 foca-focus="selectedRemito == -1" 51 foca-focus="selectedRemito == -1"
16 ng-focus="selectedRemito = -1" 52 ng-focus="selectedRemito = -1"
53 teclado-virtual
17 > 54 >
18 <div class="input-group-append"> 55 <div class="input-group-append">
19 <button 56 <button
20 ladda="searchLoading" 57 ladda="searchLoading"
21 class="btn btn-outline-secondary" 58 class="btn btn-outline-secondary"
22 type="button" 59 type="button"
23 ng-click="busquedaPress(13)" 60 ng-click="busquedaPress(13)"
24 > 61 >
25 <i class="fa fa-search" aria-hidden="true"></i> 62 <i class="fa fa-search" aria-hidden="true"></i>
26 </button> 63 </button>
27 </div> 64 </div>
28 </div> 65 </div>
29 <table ng-show="primerBusqueda" class="table table-striped table-sm"> 66 <table ng-show="primerBusqueda" class="table table-striped table-sm">
30 <thead> 67 <thead>
31 <tr> 68 <tr>
32 <th>Fecha</th> 69 <th>Fecha</th>
33 <th>Cliente</th> 70 <th>Cliente</th>
34 <th>Comprobante</th> 71 <th>Comprobante</th>
35 <th></th> 72 <th></th>
36 </tr> 73 </tr>
37 </thead> 74 </thead>
38 <tbody> 75 <tbody>
39 <tr ng-show="currentPageRemitos.length == 0 && primerBusqueda"> 76 <tr ng-show="currentPageRemitos.length == 0 && primerBusqueda">
40 <td colspan="5"> 77 <td colspan="5">
41 No se encontraron resultados. 78 No se encontraron resultados.
42 </td> 79 </td>
43 </tr> 80 </tr>
44 <tr class="selectable" 81 <tr class="selectable"
45 ng-repeat="(key, remito) in currentPageRemitos" 82 ng-repeat="(key, remito) in currentPageRemitos"
46 ng-click="select(remito)"> 83 ng-click="select(remito)">
47 <td ng-bind="remito.fechaRemito | date : 'dd/MM/yyyy'"></td> 84 <td ng-bind="remito.fechaRemito | date : 'dd/MM/yyyy'"></td>
48 <td ng-bind="remito.nombreCliente"></td> 85 <td ng-bind="remito.nombreCliente"></td>
49 <td ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></td> 86 <td ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></td>
50 <td> 87 <td>
51 <button 88 <button
52 type="button" 89 type="button"
53 class="btn btn-xs p-1 float-right" 90 class="btn btn-xs p-1 float-right"
54 ng-class="{ 91 ng-class="{
55 'btn-secondary': selectedRemito != key, 92 'btn-secondary': selectedRemito != key,
56 'btn-primary': selectedRemito == key 93 'btn-primary': selectedRemito == key
57 }" 94 }"
58 foca-focus="selectedRemito == {{key}}" 95 foca-focus="selectedRemito == {{key}}"
59 ng-keydown="itemRemito($event.keyCode)" 96 ng-keydown="itemRemito($event.keyCode)"
60 > 97 >
61 <i class="fa fa-arrow-right" aria-hidden="true"></i> 98 <i class="fa fa-arrow-right" aria-hidden="true"></i>
62 </button> 99 </button>
63 </td> 100 </td>
64 </tr> 101 </tr>
65 </tbody> 102 </tbody>
66 </table> 103 </table>
67 <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda"> 104 <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda">
68 <ul class="pagination pagination-sm justify-content mb-0"> 105 <ul class="pagination pagination-sm justify-content mb-0">
69 <li class="page-item" ng-class="{'disabled': currentPage == 1}"> 106 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
70 <a 107 <a
71 class="page-link" 108 class="page-link"
72 href="javascript:void();" 109 href="javascript:void();"
73 ng-click="selectPage(currentPage - 1)" 110 ng-click="selectPage(currentPage - 1)"
74 > 111 >
75 <span aria-hidden="true">&laquo;</span> 112 <span aria-hidden="true">&laquo;</span>
76 <span class="sr-only">Anterior</span> 113 <span class="sr-only">Anterior</span>
77 </a> 114 </a>
78 </li> 115 </li>
79 <li 116 <li
80 class="page-item" 117 class="page-item"
81 ng-repeat="pagina in paginas" 118 ng-repeat="pagina in paginas"
82 ng-class="{'active': pagina == currentPage}" 119 ng-class="{'active': pagina == currentPage}"
83 > 120 >
84 <a 121 <a
85 class="page-link" 122 class="page-link"
86 href="javascript:void();" 123 href="javascript:void();"
87 ng-click="selectPage(pagina)" 124 ng-click="selectPage(pagina)"
88 ng-bind="pagina" 125 ng-bind="pagina"
89 ></a> 126 ></a>
90 </li> 127 </li>
91 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> 128 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
92 <a 129 <a
93 class="page-link" 130 class="page-link"
94 href="javascript:void();" 131 href="javascript:void();"
95 ng-click="selectPage(currentPage + 1)" 132 ng-click="selectPage(currentPage + 1)"
96 > 133 >
97 <span aria-hidden="true">&raquo;</span> 134 <span aria-hidden="true">&raquo;</span>
98 <span class="sr-only">Siguiente</span> 135 <span class="sr-only">Siguiente</span>
99 </a> 136 </a>
100 </li> 137 </li>
101 </ul> 138 </ul>
102 </nav> 139 </nav>
103 </div> 140 </div>
104 <div class="modal-footer py-1"> 141 <div class="modal-footer py-1">
105 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button> 142 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
106 </div> 143 </div>
107 144