Jose Pinto / foca-modal-remito

Download as
Browse Code »

Commit 3fa566ca2c58cc7b4d8ade6841b5816d0d84e91a

Authored by Jose Pinto
1 parent 9b1e2e85a3
Exists in master

saco maxDate a calendarios

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