Commit 8c22a9c2e2a0bbb6bd43b643d8481ea634dc9b63
Exists in
master
Merge branch 'develop' into 'master'
Develop See merge request !15
Showing
2 changed files
Show diff stats
src/js/controller.js
1 | angular.module('focaModalDomicilio') | 1 | angular.module('focaModalDomicilio') |
2 | .controller('focaModalDomicilioController', | 2 | .controller('focaModalDomicilioController', |
3 | [ | 3 | [ |
4 | '$timeout', | 4 | '$timeout', |
5 | '$filter', | 5 | '$filter', |
6 | '$scope', | 6 | '$scope', |
7 | '$uibModalInstance', | 7 | '$uibModalInstance', |
8 | 'focaModalDomicilioService', | 8 | 'focaModalDomicilioService', |
9 | '$uibModal', | 9 | '$uibModal', |
10 | 'idCliente', | 10 | 'idCliente', |
11 | 'esNuevo', | 11 | 'esNuevo', |
12 | 'focaModalService', | 12 | 'focaModalService', |
13 | function($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService, | 13 | function($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService, |
14 | $uibModal, idCliente, esNuevo, focaModalService) { | 14 | $uibModal, idCliente, esNuevo, focaModalService) { |
15 | 15 | ||
16 | $scope.buscar = function() { | 16 | $scope.buscar = function() { |
17 | focaModalDomicilioService | 17 | focaModalDomicilioService |
18 | .getDomiciliosEntregaByIdCliente($scope.idCliente) | 18 | .getDomiciliosEntregaByIdCliente($scope.idCliente) |
19 | .then(function(res) { | 19 | .then(function(res) { |
20 | $scope.domicilios = res.data; | 20 | $scope.domicilios = res.data; |
21 | $scope.search(); | 21 | $scope.search(); |
22 | $scope.primerBusqueda = true; | 22 | $scope.primerBusqueda = true; |
23 | } | 23 | } |
24 | ); | 24 | ); |
25 | }; | 25 | }; |
26 | $scope.filters = ''; | 26 | $scope.filters = ''; |
27 | $scope.idCliente = idCliente; | 27 | $scope.idCliente = idCliente; |
28 | $scope.buscar(); | 28 | $scope.buscar(); |
29 | $scope.ingreso = esNuevo; | 29 | $scope.ingreso = esNuevo; |
30 | $scope.primerBusqueda = false; | 30 | $scope.primerBusqueda = false; |
31 | $scope.contactos = [{}]; | 31 | $scope.contactos = [{}]; |
32 | // pagination | 32 | // pagination |
33 | $scope.numPerPage = 5; | 33 | $scope.numPerPage = 5; |
34 | $scope.currentPage = 1; | 34 | $scope.currentPage = 1; |
35 | $scope.filteredDomicilios = []; | 35 | $scope.filteredDomicilios = []; |
36 | $scope.currentPageDomicilios = []; | 36 | $scope.currentPageDomicilios = []; |
37 | $scope.selectedDomicilio = -1; | 37 | $scope.selectedDomicilio = -1; |
38 | $scope.focused = 1; | 38 | $scope.focused = 1; |
39 | $scope.domicilio = {}; | 39 | $scope.domicilio = {}; |
40 | 40 | ||
41 | //METODOS | 41 | //METODOS |
42 | $scope.search = function(pressed) { | 42 | $scope.search = function(pressed) { |
43 | $scope.filteredDomicilios = $filter('filter')( | 43 | $scope.filteredDomicilios = $filter('filter')( |
44 | $scope.domicilios, | 44 | $scope.domicilios, |
45 | {$: $scope.filters} | 45 | {$: $scope.filters} |
46 | ); | 46 | ); |
47 | 47 | ||
48 | if (pressed) { | 48 | if (pressed) { |
49 | if ($scope.filteredDomicilios.length === 0) { | 49 | if ($scope.filteredDomicilios.length === 0) { |
50 | $timeout(function() { | 50 | $timeout(function() { |
51 | angular.element('#search')[0].focus(); | 51 | angular.element('#search')[0].focus(); |
52 | $scope.filters = ''; | 52 | $scope.filters = ''; |
53 | }); | 53 | }); |
54 | }else { | 54 | } else { |
55 | primera(); | 55 | primera(); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | $scope.lastPage = Math.ceil( | 59 | $scope.lastPage = Math.ceil( |
60 | $scope.filteredDomicilios.length / $scope.numPerPage | 60 | $scope.filteredDomicilios.length / $scope.numPerPage |
61 | ); | 61 | ); |
62 | 62 | ||
63 | $scope.resetPage(); | 63 | $scope.resetPage(); |
64 | }; | 64 | }; |
65 | 65 | ||
66 | $scope.resetPage = function() { | 66 | $scope.resetPage = function() { |
67 | $scope.currentPage = 1; | 67 | $scope.currentPage = 1; |
68 | $scope.selectPage(1); | 68 | $scope.selectPage(1); |
69 | }; | 69 | }; |
70 | 70 | ||
71 | $scope.selectPage = function(page) { | 71 | $scope.selectPage = function(page) { |
72 | var start = (page - 1) * $scope.numPerPage; | 72 | var start = (page - 1) * $scope.numPerPage; |
73 | var end = start + $scope.numPerPage; | 73 | var end = start + $scope.numPerPage; |
74 | $scope.paginas = []; | 74 | $scope.paginas = []; |
75 | $scope.paginas = calcularPages(page); | 75 | $scope.paginas = calcularPages(page); |
76 | $scope.currentPageDomicilios = $scope.filteredDomicilios.slice(start, end); | 76 | $scope.currentPageDomicilios = $scope.filteredDomicilios.slice(start, end); |
77 | $scope.currentPage = page; | 77 | $scope.currentPage = page; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | $scope.select = function(domicilio) { | 80 | $scope.select = function(domicilio) { |
81 | $uibModalInstance.close(domicilio); | 81 | $uibModalInstance.close(domicilio); |
82 | }; | 82 | }; |
83 | 83 | ||
84 | $scope.cancel = function() { | 84 | $scope.cancel = function() { |
85 | $uibModalInstance.dismiss('cancel'); | 85 | $uibModalInstance.dismiss('cancel'); |
86 | }; | 86 | }; |
87 | 87 | ||
88 | $scope.busquedaDown = function(key) { | 88 | $scope.busquedaDown = function(key) { |
89 | if (key === 40) { | 89 | if (key === 40) { |
90 | primera(key); | 90 | primera(key); |
91 | } | 91 | } |
92 | }; | 92 | }; |
93 | 93 | ||
94 | $scope.busquedaPress = function(key) { | 94 | $scope.busquedaPress = function(key) { |
95 | if (key === 13) { | 95 | if (key === 13) { |
96 | $scope.search(true); | 96 | $scope.search(true); |
97 | } | 97 | } |
98 | }; | 98 | }; |
99 | 99 | ||
100 | $scope.itemDomicilio = function(key) { | 100 | $scope.itemDomicilio = function(key) { |
101 | if (key === 38) { | 101 | if (key === 38) { |
102 | anterior(key); | 102 | anterior(key); |
103 | } | 103 | } |
104 | 104 | ||
105 | if (key === 40) { | 105 | if (key === 40) { |
106 | siguiente(key); | 106 | siguiente(key); |
107 | } | 107 | } |
108 | 108 | ||
109 | if (key === 37) { | 109 | if (key === 37) { |
110 | retrocederPagina(); | 110 | retrocederPagina(); |
111 | } | 111 | } |
112 | 112 | ||
113 | if (key === 39) { | 113 | if (key === 39) { |
114 | avanzarPagina(); | 114 | avanzarPagina(); |
115 | } | 115 | } |
116 | }; | 116 | }; |
117 | 117 | ||
118 | $scope.agregarDomicilio = function() { | 118 | $scope.agregarDomicilio = function() { |
119 | 119 | ||
120 | $scope.domicilio.valores = []; | 120 | $scope.domicilio.valores = []; |
121 | $scope.domicilio.idCliente = $scope.idCliente; | 121 | $scope.domicilio.idCliente = $scope.idCliente; |
122 | if ($scope.domicilio.calle) { | 122 | if ($scope.domicilio.calle) { |
123 | $scope.domicilio.valores.push({ | 123 | $scope.domicilio.valores.push({ |
124 | ID_ADAC_1: 1, | 124 | ID_ADAC_1: 1, |
125 | dato: $scope.domicilio.calle | 125 | dato: $scope.domicilio.calle |
126 | }); | 126 | }); |
127 | } | 127 | } |
128 | if ($scope.domicilio.numeroCalle) { | 128 | if ($scope.domicilio.numeroCalle) { |
129 | $scope.domicilio.valores.push({ | 129 | $scope.domicilio.valores.push({ |
130 | ID_ADAC_1: 2, | 130 | ID_ADAC_1: 2, |
131 | dato: $scope.domicilio.numeroCalle | 131 | dato: $scope.domicilio.numeroCalle |
132 | }); | 132 | }); |
133 | } | 133 | } |
134 | if ($scope.domicilio.localidad) { | 134 | if ($scope.domicilio.localidad) { |
135 | $scope.domicilio.valores.push({ | 135 | $scope.domicilio.valores.push({ |
136 | ID_ADAC_1: 3, | 136 | ID_ADAC_1: 3, |
137 | dato: $scope.domicilio.localidad | 137 | dato: $scope.domicilio.localidad |
138 | }); | 138 | }); |
139 | } | 139 | } |
140 | if ($scope.domicilio.provincia) { | 140 | if ($scope.domicilio.provincia) { |
141 | $scope.domicilio.valores.push({ | 141 | $scope.domicilio.valores.push({ |
142 | ID_ADAC_1: 4, | 142 | ID_ADAC_1: 4, |
143 | dato: $scope.domicilio.provincia | 143 | dato: $scope.domicilio.provincia |
144 | }); | 144 | }); |
145 | } | 145 | } |
146 | if ($scope.domicilio.latitud) { | 146 | if ($scope.domicilio.latitud) { |
147 | $scope.domicilio.valores.push({ | 147 | $scope.domicilio.valores.push({ |
148 | ID_ADAC_1: 23, | 148 | ID_ADAC_1: 23, |
149 | dato: $scope.domicilio.latitud.toString() | 149 | dato: $scope.domicilio.latitud.toString() |
150 | }); | 150 | }); |
151 | } | 151 | } |
152 | if ($scope.domicilio.longitud) { | 152 | if ($scope.domicilio.longitud) { |
153 | $scope.domicilio.valores.push({ | 153 | $scope.domicilio.valores.push({ |
154 | ID_ADAC_1: 24, | 154 | ID_ADAC_1: 24, |
155 | dato: $scope.domicilio.longitud.toString() | 155 | dato: $scope.domicilio.longitud.toString() |
156 | }); | 156 | }); |
157 | } | 157 | } |
158 | 158 | ||
159 | if (!$scope.domicilio.titulo) { | 159 | if (!$scope.domicilio.titulo) { |
160 | focaModalService.alert('Ingrese titulo'); | 160 | focaModalService.alert('Ingrese titulo'); |
161 | return; | 161 | return; |
162 | } else if (!$scope.domicilio.calle) { | 162 | } else if (!$scope.domicilio.calle) { |
163 | focaModalService.alert('Ingrese calle'); | 163 | focaModalService.alert('Ingrese calle'); |
164 | return; | 164 | return; |
165 | } else if (!$scope.domicilio.numeroCalle) { | 165 | } else if (!$scope.domicilio.numeroCalle) { |
166 | focaModalService.alert('Ingrese numero de calle'); | 166 | focaModalService.alert('Ingrese numero de calle'); |
167 | return; | 167 | return; |
168 | } else if (!$scope.domicilio.localidad) { | 168 | } else if (!$scope.domicilio.localidad) { |
169 | focaModalService.alert('Ingrese localidad'); | 169 | focaModalService.alert('Ingrese localidad'); |
170 | return; | 170 | return; |
171 | } else if (!$scope.domicilio.provincia) { | 171 | } else if (!$scope.domicilio.provincia) { |
172 | focaModalService.alert('Ingrese provincia'); | 172 | focaModalService.alert('Ingrese provincia'); |
173 | return; | 173 | return; |
174 | } | 174 | } |
175 | 175 | ||
176 | //domicilios de entrega corresponden al 1 | 176 | //domicilios de entrega corresponden al 1 |
177 | focaModalDomicilioService | 177 | focaModalDomicilioService |
178 | .obtenerUltimoPorNivelPadre(1) | 178 | .obtenerUltimoPorNivelPadre(1) |
179 | .then(function(res) { | 179 | .then(function(res) { |
180 | $scope.domicilio.nivel1 = 1;//domicilio de entrega corresponde 1 | 180 | $scope.domicilio.nivel1 = 1;//domicilio de entrega corresponde 1 |
181 | $scope.domicilio.nivel2 = res.data[0].ultimo + 1; | 181 | $scope.domicilio.nivel2 = res.data[0].ultimo + 1; |
182 | focaModalDomicilioService | 182 | focaModalDomicilioService |
183 | .guardarDomicilio($scope.domicilio) | 183 | .guardarDomicilio($scope.domicilio) |
184 | .then(function() { | 184 | .then(function() { |
185 | $scope.buscar(); | 185 | $scope.buscar(); |
186 | $scope.ingreso = false; | 186 | $scope.ingreso = false; |
187 | $scope.domicilio = {}; | 187 | $scope.domicilio = {}; |
188 | }) | 188 | }) |
189 | .catch(function() { | 189 | .catch(function() { |
190 | focaModalService.alert('Hubo un error al crear el domicilio'); | 190 | focaModalService.alert('Hubo un error al crear el domicilio'); |
191 | $scope.ingreso = false; | 191 | $scope.ingreso = false; |
192 | }); | 192 | }); |
193 | }); | 193 | }); |
194 | }; | 194 | }; |
195 | 195 | ||
196 | $scope.verPuntosDescarga = function(key) { | 196 | $scope.verPuntosDescarga = function(key) { |
197 | 197 | ||
198 | $scope.currentPageDomicilios[key].verPuntos = true; | 198 | $scope.currentPageDomicilios[key].verPuntos = true; |
199 | $scope.select($scope.currentPageDomicilios[key]); | 199 | $scope.select($scope.currentPageDomicilios[key]); |
200 | }; | 200 | }; |
201 | 201 | ||
202 | $scope.localizarDomicilio = function(localizar) { | 202 | $scope.localizarDomicilio = function(localizar) { |
203 | var direccion = null; | 203 | var direccion = null; |
204 | if(localizar) { | 204 | if (localizar) { |
205 | direccion = { | 205 | direccion = { |
206 | calle: $scope.domicilio.calle, | 206 | calle: $scope.domicilio.calle, |
207 | numero: $scope.domicilio.numeroCalle, | 207 | numero: $scope.domicilio.numeroCalle, |
208 | localidad: $scope.domicilio.localidad, | 208 | localidad: $scope.domicilio.localidad, |
209 | provincia: $scope.domicilio.provincia | 209 | provincia: $scope.domicilio.provincia |
210 | }; | 210 | }; |
211 | } | 211 | } |
212 | var modalInstance = $uibModal.open( | 212 | var modalInstance = $uibModal.open( |
213 | { | 213 | { |
214 | ariaLabelledBy: 'Buscar domicilio', | 214 | ariaLabelledBy: 'Buscar domicilio', |
215 | templateUrl: 'modal-localizar.html', | 215 | templateUrl: 'modal-localizar.html', |
216 | controller: 'focaModalLocalizarController', | 216 | controller: 'focaModalLocalizarController', |
217 | size: 'lg', | 217 | size: 'lg', |
218 | resolve: { | 218 | resolve: { |
219 | direccion: direccion | 219 | parametros: { |
220 | direccion: direccion, | ||
221 | latitud: $scope.domicilio.latitud, | ||
222 | longitud: $scope.domicilio.longitud | ||
223 | } | ||
220 | } | 224 | } |
221 | } | 225 | } |
222 | ); | 226 | ); |
223 | modalInstance.result.then(function(res) { | 227 | modalInstance.result.then(function(res) { |
224 | $scope.domicilio.latitud = res.latitud; | 228 | $scope.domicilio.latitud = res.latitud; |
225 | $scope.domicilio.longitud = res.longitud; | 229 | $scope.domicilio.longitud = res.longitud; |
226 | }, function() { | 230 | }, function() { |
227 | //TODO: función llamada cuando cancela el modal | 231 | //TODO: función llamada cuando cancela el modal |
228 | }); | 232 | }); |
229 | }; | 233 | }; |
230 | 234 | ||
231 | $scope.next = function(key) { | 235 | $scope.next = function(key) { |
232 | if (key === 13) $scope.focused++; | 236 | if (key === 13) $scope.focused++; |
233 | }; | 237 | }; |
234 | 238 | ||
235 | function calcularPages(paginaActual) { | 239 | function calcularPages(paginaActual) { |
236 | var paginas = []; | 240 | var paginas = []; |
237 | paginas.push(paginaActual); | 241 | paginas.push(paginaActual); |
238 | 242 | ||
239 | if (paginaActual - 1 > 1) { | 243 | if (paginaActual - 1 > 1) { |
240 | 244 | ||
241 | paginas.unshift(paginaActual - 1); | 245 | paginas.unshift(paginaActual - 1); |
242 | if (paginaActual - 2 > 1) { | 246 | if (paginaActual - 2 > 1) { |
243 | paginas.unshift(paginaActual - 2); | 247 | paginas.unshift(paginaActual - 2); |
244 | } | 248 | } |
245 | } | 249 | } |
246 | 250 | ||
247 | if (paginaActual + 1 < $scope.lastPage) { | 251 | if (paginaActual + 1 < $scope.lastPage) { |
248 | paginas.push(paginaActual + 1); | 252 | paginas.push(paginaActual + 1); |
249 | if (paginaActual + 2 < $scope.lastPage) { | 253 | if (paginaActual + 2 < $scope.lastPage) { |
250 | paginas.push(paginaActual + 2); | 254 | paginas.push(paginaActual + 2); |
251 | } | 255 | } |
252 | } | 256 | } |
253 | 257 | ||
254 | if (paginaActual !== 1) { | 258 | if (paginaActual !== 1) { |
255 | paginas.unshift(1); | 259 | paginas.unshift(1); |
256 | } | 260 | } |
257 | 261 | ||
258 | if (paginaActual !== $scope.lastPage) { | 262 | if (paginaActual !== $scope.lastPage) { |
259 | paginas.push($scope.lastPage); | 263 | paginas.push($scope.lastPage); |
260 | } | 264 | } |
261 | 265 | ||
262 | return paginas; | 266 | return paginas; |
263 | } | 267 | } |
264 | 268 | ||
265 | function primera() { | 269 | function primera() { |
266 | $scope.selectedDomicilio = 0; | 270 | $scope.selectedDomicilio = 0; |
267 | } | 271 | } |
268 | 272 | ||
269 | function anterior() { | 273 | function anterior() { |
270 | if ($scope.selectedDomicilio === 0 && $scope.currentPage > 1) { | 274 | if ($scope.selectedDomicilio === 0 && $scope.currentPage > 1) { |
271 | retrocederPagina(); | 275 | retrocederPagina(); |
272 | } else { | 276 | } else { |
273 | $scope.selectedDomicilio--; | 277 | $scope.selectedDomicilio--; |
274 | } | 278 | } |
275 | } | 279 | } |
276 | 280 | ||
277 | function siguiente() { | 281 | function siguiente() { |
278 | if ($scope.selectedDomicilio < $scope.currentPageDomicilios.length ) { | 282 | if ($scope.selectedDomicilio < $scope.currentPageDomicilios.length ) { |
279 | $scope.selectedDomicilio++; | 283 | $scope.selectedDomicilio++; |
280 | } else { | 284 | } else { |
281 | avanzarPagina(); | 285 | avanzarPagina(); |
282 | } | 286 | } |
283 | } | 287 | } |
284 | 288 | ||
285 | function retrocederPagina() { | 289 | function retrocederPagina() { |
286 | if ($scope.currentPage > 1) { | 290 | if ($scope.currentPage > 1) { |
287 | $scope.selectPage($scope.currentPage - 1); | 291 | $scope.selectPage($scope.currentPage - 1); |
288 | $scope.selectedDomicilio = $scope.numPerPage - 1; | 292 | $scope.selectedDomicilio = $scope.numPerPage - 1; |
289 | } | 293 | } |
290 | } | 294 | } |
291 | 295 | ||
292 | function avanzarPagina() { | 296 | function avanzarPagina() { |
293 | if ($scope.currentPage < $scope.lastPage) { | 297 | if ($scope.currentPage < $scope.lastPage) { |
294 | $scope.selectPage($scope.currentPage + 1); | 298 | $scope.selectPage($scope.currentPage + 1); |
295 | $scope.selectedDomicilio = 0; | 299 | $scope.selectedDomicilio = 0; |
296 | } | 300 | } |
297 | } | 301 | } |
298 | } | 302 | } |
299 | ] | 303 | ] |
300 | ); | 304 | ); |
301 | 305 |
src/views/modal-domicilio.html
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" ng-hide="ingreso">Búsqueda de Domicilios</h5> | 4 | <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5> |
5 | <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilio</h5> | 5 | <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5> |
6 | </div> | 6 | </div> |
7 | <div class="input-group col-lg-6 pr-0 my-2"> | 7 | <div class="input-group col-lg-6 pr-0 my-2"> |
8 | <button | ||
9 | class="btn btn-outline-debo mr-2" | ||
10 | ng-click="ingreso = true" | ||
11 | ng-show="!ingreso" | ||
12 | title="Nuevo"> | ||
13 | <i class="fa fa-plus" aria-hidden="true"></i> | ||
14 | </button> | ||
8 | <input | 15 | <input |
9 | type="text" | 16 | type="text" |
10 | class="form-control form-control-sm" | 17 | class="form-control form-control-sm" |
11 | id="search" | 18 | id="search" |
12 | placeholder="Búsqueda" | 19 | placeholder="Búsqueda" |
13 | ng-model="filters" | 20 | ng-model="filters" |
14 | ng-change="search()" | 21 | ng-change="search()" |
15 | ng-keydown="busquedaDown($event.keyCode)" | 22 | ng-keydown="busquedaDown($event.keyCode)" |
16 | ng-keypress="busquedaPress($event.keyCode)" | 23 | ng-keypress="busquedaPress($event.keyCode)" |
17 | foca-focus="selectedDomicilio == -1" | 24 | foca-focus="selectedDomicilio == -1" |
18 | ng-focus="selectedDomicilio = -1" | 25 | ng-focus="selectedDomicilio = -1" |
19 | teclado-virtual | 26 | teclado-virtual |
20 | > | 27 | > |
21 | <div class="input-group-append"> | 28 | <div class="input-group-append"> |
22 | <button | 29 | <button |
23 | ladda="searchLoading" | 30 | ladda="searchLoading" |
24 | class="btn btn-outline-secondary" | 31 | class="btn btn-outline-secondary" |
25 | type="button" | 32 | type="button" |
26 | ng-click="busquedaPress(13)" | 33 | ng-click="busquedaPress(13)" |
27 | > | 34 | > |
28 | <i class="fa fa-search" aria-hidden="true"></i> | 35 | <i class="fa fa-search" aria-hidden="true"></i> |
29 | </button> | 36 | </button> |
30 | </div> | 37 | </div> |
31 | </div> | 38 | </div> |
32 | </div> | 39 | </div> |
33 | </div> | 40 | </div> |
34 | <div class="modal-body" id="modal-body"> | 41 | <div class="modal-body" id="modal-body"> |
35 | 42 | ||
36 | <div ng-show="!primerBusqueda"> | 43 | <div ng-show="!primerBusqueda"> |
37 | Debe realizar una primer búsqueda. | 44 | Debe realizar una primer búsqueda. |
38 | </div> | 45 | </div> |
39 | 46 | ||
40 | <div ng-show="!ingreso"> | 47 | <div ng-show="!ingreso"> |
41 | <table ng-show="!ingreso" class="table table-striped table-sm"> | 48 | <table ng-show="!ingreso" class="table table-striped table-sm"> |
42 | <thead> | 49 | <thead> |
43 | <tr> | 50 | <tr> |
44 | <th>Titulo</th> | 51 | <th>Titulo</th> |
45 | <th>Calle</th> | 52 | <th>Calle</th> |
46 | <th>Localidad</th> | 53 | <th>Localidad</th> |
47 | <th>Provincia</th> | 54 | <th>Provincia</th> |
48 | <th></th> | 55 | <th></th> |
49 | <th></th> | 56 | <th></th> |
50 | </tr> | 57 | </tr> |
51 | </thead> | 58 | </thead> |
52 | <tbody> | 59 | <tbody> |
53 | <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda"> | 60 | <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda"> |
54 | <td colspan="5"> | 61 | <td colspan="5"> |
55 | No se encontraron resultados. | 62 | No se encontraron resultados. |
56 | </td> | 63 | </td> |
57 | </tr> | 64 | </tr> |
58 | <tr> | ||
59 | <td colspan="6" ng-show="!ingreso"> | ||
60 | <input | ||
61 | class="form-control form-control-sm" | ||
62 | type="text" | ||
63 | placeholder="Nuevo domicilio" | ||
64 | readonly | ||
65 | ng-click="ingreso = !ingreso" | ||
66 | /> | ||
67 | </td> | ||
68 | </tr> | ||
69 | <tr class="selectable" | 65 | <tr class="selectable" |
70 | ng-repeat="(key,domicilio) in currentPageDomicilios"> | 66 | ng-repeat="(key,domicilio) in currentPageDomicilios"> |
71 | <td | 67 | <td |
72 | ng-bind="domicilio.titulo" | 68 | ng-bind="domicilio.titulo" |
73 | ng-click="select(domicilio)" | 69 | ng-click="select(domicilio)" |
74 | ></td> | 70 | ></td> |
75 | <td | 71 | <td |
76 | ng-bind="domicilio.Calle + ' ' + domicilio.Numero" | 72 | ng-bind="domicilio.Calle + ' ' + domicilio.Numero" |
77 | ng-click="select(domicilio)" | 73 | ng-click="select(domicilio)" |
78 | ></td> | 74 | ></td> |
79 | <td | 75 | <td |
80 | ng-bind="domicilio.Localidad" | 76 | ng-bind="domicilio.Localidad" |
81 | ng-click="select(domicilio)" | 77 | ng-click="select(domicilio)" |
82 | ></td> | 78 | ></td> |
83 | <td | 79 | <td |
84 | ng-bind="domicilio.Provincia" | 80 | ng-bind="domicilio.Provincia" |
85 | ng-click="select(domicilio)" | 81 | ng-click="select(domicilio)" |
86 | ></td> | 82 | ></td> |
87 | <td> | 83 | <td> |
88 | <button | 84 | <button |
89 | type="button" | 85 | type="button" |
90 | class="btn btn-sm p-1 float-right btn-secondary" | 86 | class="btn btn-sm p-1 float-right btn-secondary" |
91 | ng-click="verPuntosDescarga(key)" | 87 | ng-click="verPuntosDescarga(key)" |
92 | title="Puntos de descarga" | 88 | title="Puntos de descarga" |
93 | > | 89 | > |
94 | <small>PD</small> | 90 | <small>PD</small> |
95 | </button> | 91 | </button> |
96 | </td> | 92 | </td> |
97 | <td> | 93 | <td> |
98 | <button | 94 | <button |
99 | type="button" | 95 | type="button" |
100 | class="btn btn-sm p-1 float-right" | 96 | class="btn btn-sm p-1 float-right" |
101 | ng-class="{ | 97 | ng-class="{ |
102 | 'btn-secondary': selectedDomicilio != key + 1, | 98 | 'btn-secondary': selectedDomicilio != key + 1, |
103 | 'btn-primary': selectedDomicilio == key + 1 | 99 | 'btn-primary': selectedDomicilio == key + 1 |
104 | }" | 100 | }" |
105 | foca-focus="selectedDomicilio == {{key + 1}}" | 101 | foca-focus="selectedDomicilio == {{key + 1}}" |
106 | ng-keydown="itemDomicilio($event.keyCode)" | 102 | ng-keydown="itemDomicilio($event.keyCode)" |
107 | ng-click="select(domicilio)" | 103 | ng-click="select(domicilio)" |
108 | title="Seleccionar" | 104 | title="Seleccionar" |
109 | > | 105 | > |
110 | <i class="fa fa-circle-thin" aria-hidden="true"></i> | 106 | <i class="fa fa-circle-thin" aria-hidden="true"></i> |
111 | </button> | 107 | </button> |
112 | </td> | 108 | </td> |
113 | </tr> | 109 | </tr> |
114 | </tbody> | 110 | </tbody> |
115 | </table> | 111 | </table> |
116 | </div> | 112 | </div> |
117 | <form name="formDomicilio" ng-show="ingreso"> | 113 | <form name="formDomicilio" ng-show="ingreso"> |
118 | <input | 114 | <input |
119 | type="hidden" | 115 | type="hidden" |
120 | ng-model="domicilio.latitud" | 116 | ng-model="domicilio.latitud" |
121 | ng-required="true"> | 117 | ng-required="true"> |
122 | <input | 118 | <input |
123 | type="hidden" | 119 | type="hidden" |
124 | ng-model="domicilio.longitud" | 120 | ng-model="domicilio.longitud" |
125 | ng-required="true"> | 121 | ng-required="true"> |
126 | <div class="row"> | 122 | <div class="row"> |
127 | <div class="col-4"> | 123 | <div class="col-4"> |
128 | <label>Tipo</label> | 124 | <label>Tipo</label> |
129 | <select | 125 | <select |
130 | class="form-control" | 126 | class="form-control" |
131 | ng-disabled="true" | 127 | ng-disabled="true" |
132 | > | 128 | > |
133 | <option ng-value="2">Entrega</option> | 129 | <option ng-value="2">Entrega</option> |
134 | </select> | 130 | </select> |
135 | </div> | 131 | </div> |
136 | <div class="col-8"> | 132 | <div class="col-8"> |
137 | <label>Titulo</label> | 133 | <label>Titulo</label> |
138 | <input | 134 | <input |
139 | type="text" | 135 | type="text" |
140 | foca-focus="ingreso" | 136 | foca-focus="ingreso" |
141 | class="form-control" | 137 | class="form-control" |
142 | ng-model="domicilio.titulo" | 138 | ng-model="domicilio.titulo" |
143 | placeholder="Ingrese título" | 139 | placeholder="Ingrese título" |
144 | ng-required="true" | 140 | ng-required="true" |
145 | ng-keypress="next($event.keyCode)" | 141 | ng-keypress="next($event.keyCode)" |
146 | ng-focus="focused = 1" | 142 | ng-focus="focused = 1" |
147 | foca-focus="focused == 1" | 143 | foca-focus="focused == 1" |
148 | teclado-virtual | 144 | teclado-virtual |
149 | /> | 145 | /> |
150 | </div> | 146 | </div> |
151 | <div class="col-9"> | 147 | <div class="col-9"> |
152 | <label>Calle</label> | 148 | <label>Calle</label> |
153 | <input | 149 | <input |
154 | type="text" | 150 | type="text" |
155 | class="form-control" | 151 | class="form-control" |
156 | ng-model="domicilio.calle" | 152 | ng-model="domicilio.calle" |
157 | placeholder="Ingrese calle" | 153 | placeholder="Ingrese calle" |
158 | ng-required="true" | 154 | ng-required="true" |
159 | ng-keypress="next($event.keyCode)" | 155 | ng-keypress="next($event.keyCode)" |
160 | ng-focus="focused = 2" | 156 | ng-focus="focused = 2" |
161 | foca-focus="focused == 2" | 157 | foca-focus="focused == 2" |
162 | teclado-virtual | 158 | teclado-virtual |
163 | /> | 159 | /> |
164 | </div> | 160 | </div> |
165 | <div class="col-3"> | 161 | <div class="col-3"> |
166 | <label>Nº</label> | 162 | <label>Nº</label> |
167 | <input | 163 | <input |
168 | type="text" | 164 | type="text" |
169 | class="form-control" | 165 | class="form-control" |
170 | ng-model="domicilio.numeroCalle" | 166 | ng-model="domicilio.numeroCalle" |
171 | placeholder="Ingrese Numero" | 167 | placeholder="Ingrese Numero" |
172 | ng-required="true" | 168 | ng-required="true" |
173 | ng-keypress="next($event.keyCode)" | 169 | ng-keypress="next($event.keyCode)" |
174 | ng-focus="focused = 3" | 170 | ng-focus="focused = 3" |
175 | foca-focus="focused == 3" | 171 | foca-focus="focused == 3" |
176 | teclado-virtual | 172 | teclado-virtual |
177 | /> | 173 | /> |
178 | </div> | 174 | </div> |
179 | <div class="col-6"> | 175 | <div class="col-6"> |
180 | <label>Localidad</label> | 176 | <label>Localidad</label> |
181 | <input | 177 | <input |
182 | type="text" | 178 | type="text" |
183 | class="form-control" | 179 | class="form-control" |
184 | ng-model="domicilio.localidad" | 180 | ng-model="domicilio.localidad" |
185 | placeholder="Ingrese localidad" | 181 | placeholder="Ingrese localidad" |
186 | ng-required="true" | 182 | ng-required="true" |
187 | ng-keypress="next($event.keyCode)" | 183 | ng-keypress="next($event.keyCode)" |
188 | ng-focus="focused = 4" | 184 | ng-focus="focused = 4" |
189 | foca-focus="focused == 4" | 185 | foca-focus="focused == 4" |
190 | teclado-virtual | 186 | teclado-virtual |
191 | /> | 187 | /> |
192 | </div> | 188 | </div> |
193 | <div class="col-6"> | 189 | <div class="col-6"> |
194 | <label>Provincia</label> | 190 | <label>Provincia</label> |
195 | <input | 191 | <input |
196 | type="text" | 192 | type="text" |
197 | class="form-control" | 193 | class="form-control" |
198 | ng-model="domicilio.provincia" | 194 | ng-model="domicilio.provincia" |
199 | placeholder="Ingrese provincia" | 195 | placeholder="Ingrese provincia" |
200 | ng-required="true" | 196 | ng-required="true" |
201 | ng-keypress="next($event.keyCode)" | 197 | ng-keypress="next($event.keyCode)" |
202 | ng-focus="focused = 5" | 198 | ng-focus="focused = 5" |
203 | foca-focus="focused == 5" | 199 | foca-focus="focused == 5" |
204 | teclado-virtual | 200 | teclado-virtual |
205 | /> | 201 | /> |
206 | </div> | 202 | </div> |
207 | </div> | 203 | </div> |
208 | <div class="row mt-3"> | 204 | <div class="row mt-3"> |
209 | <div class="col-12"> | 205 | <div class="col-12"> |
210 | <button | 206 | <button |
211 | type="button" | 207 | type="button" |
212 | class="btn btn-primary float-right ml-3" | 208 | class="btn btn-primary float-right ml-3" |
213 | ng-click="localizarDomicilio()">Buscar</button> | 209 | ng-click="localizarDomicilio()">Buscar</button> |
214 | <button | 210 | <button |
215 | type="button" | 211 | type="button" |
216 | class="btn btn-primary float-right" | 212 | class="btn btn-primary float-right" |
217 | ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia" | 213 | ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia" |
218 | ng-click="localizarDomicilio(true)">Localizar</button> | 214 | ng-click="localizarDomicilio(true)">Localizar</button> |
219 | </div> | 215 | </div> |
220 | </div> | 216 | </div> |
221 | </form> | 217 | </form> |
222 | </div> | 218 | </div> |
223 | <div class="modal-footer"> | 219 | <div class="modal-footer"> |
224 | <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto"> | 220 | <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto"> |
225 | <ul class="pagination pagination-sm mb-0 justify-content-end"> | 221 | <ul class="pagination pagination-sm mb-0 justify-content-end"> |
226 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> | 222 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> |
227 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> | 223 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> |
228 | <span aria-hidden="true">«</span> | 224 | <span aria-hidden="true">«</span> |
229 | <span class="sr-only">Anterior</span> | 225 | <span class="sr-only">Anterior</span> |
230 | </a> | 226 | </a> |
231 | </li> | 227 | </li> |
232 | <li | 228 | <li |
233 | class="page-item" | 229 | class="page-item" |
234 | ng-repeat="pagina in paginas" | 230 | ng-repeat="pagina in paginas" |
235 | ng-class="{'active': pagina == currentPage}" | 231 | ng-class="{'active': pagina == currentPage}" |
236 | > | 232 | > |
237 | <a | 233 | <a |
238 | class="page-link" | 234 | class="page-link" |
239 | href="javascript:void();" | 235 | href="javascript:void();" |
240 | ng-click="selectPage(pagina)" | 236 | ng-click="selectPage(pagina)" |
241 | ng-bind="pagina" | 237 | ng-bind="pagina" |
242 | ></a> | 238 | ></a> |
243 | </li> | 239 | </li> |
244 | <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> | 240 | <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> |
245 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> | 241 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> |
246 | <span aria-hidden="true">»</span> | 242 | <span aria-hidden="true">»</span> |
247 | <span class="sr-only">Siguiente</span> | 243 | <span class="sr-only">Siguiente</span> |
248 | </a> | 244 | </a> |
249 | </li> | 245 | </li> |
250 | </ul> | 246 | </ul> |
251 | </nav> | 247 | </nav> |
252 | <button | 248 | <button |
253 | ng-show="!ingreso" | 249 | ng-show="!ingreso" |
254 | class="btn btn-sm btn-secondary" | 250 | class="btn btn-sm btn-secondary" |
255 | type="button" | 251 | type="button" |
256 | ng-click="cancel()" | 252 | ng-click="cancel()" |
257 | >Volver | 253 | >Volver |
258 | </button> | 254 | </button> |
259 | <button | 255 | <button |
260 | ng-show="ingreso" | 256 | ng-show="ingreso" |
261 | class="btn btn-secondary btn-sm" | 257 | class="btn btn-secondary btn-sm" |
262 | type="button" | 258 | type="button" |
263 | ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]" | 259 | ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]" |
264 | >Cancelar | 260 | >Cancelar |
265 | </button> | 261 | </button> |
266 | <button | 262 | <button |
267 | ng-show="ingreso" | 263 | ng-show="ingreso" |