Commit 93dad1280a5939996e3421a173f378669ef1e890
Exists in
master
Merge remote-tracking branch 'upstream/master'
Showing
2 changed files
 
Show diff stats
src/js/controller.js
| 1 | 1 | angular.module('focaModalPuntoDescarga') | 
| 2 | 2 | .controller('focaModalPuntoDescargaController', [ | 
| 3 | - '$timeout', | |
| 4 | - '$filter', | |
| 5 | 3 | '$scope', | 
| 6 | 4 | '$uibModalInstance', | 
| 7 | 5 | 'focaModalPuntoDescargaService', | 
| 8 | 6 | 'filters', | 
| 9 | 7 | 'focaModalService', | 
| 10 | - function($timeout, $filter, $scope, $uibModalInstance, | |
| 8 | + function($scope, $uibModalInstance, | |
| 11 | 9 | focaModalPuntoDescargaService, filters, focaModalService) { | 
| 12 | 10 | |
| 11 | + console.log('filters', filters); | |
| 12 | + | |
| 13 | 13 | $scope.cantidadArticulo = 0; | 
| 14 | 14 | $scope.articuloSeleccionado = 0; | 
| 15 | 15 | $scope.ivas = []; | 
| ... | ... | @@ -28,7 +28,7 @@ angular.module('focaModalPuntoDescarga') | 
| 28 | 28 | articulo.restante = articulo.cantidad; | 
| 29 | 29 | }); | 
| 30 | 30 | actualizarTabla(); | 
| 31 | - cargarPuntos(filters.puntosDescarga); | |
| 31 | + // cargarPuntos(filters.puntosDescarga); | |
| 32 | 32 | |
| 33 | 33 | $scope.cancel = function() { | 
| 34 | 34 | if ($scope.ingreso) { | 
src/views/modal-punto-descarga.html
| ... | ... | @@ -3,7 +3,7 @@ | 
| 3 | 3 | <h5 class="modal-title my-1" ng-show="ingreso">Crear punto de descarga</h5> | 
| 4 | 4 | <h5 class="modal-title my-1" ng-show="cargaArticulos">Cargar artículos en puntos de descarga</h5> | 
| 5 | 5 | <button | 
| 6 | - class="btn btn-primary" | |
| 6 | + class="btn btn-outline-debo" | |
| 7 | 7 | title="Nuevo" | 
| 8 | 8 | ng-click="ingreso = true" | 
| 9 | 9 | ng-hide="ingreso || cargaArticulos"> | 
| ... | ... | @@ -43,6 +43,7 @@ | 
| 43 | 43 | id="checkSelect{{key}}" | 
| 44 | 44 | ng-model="puntoDescarga.seleccionado" | 
| 45 | 45 | ng-change="seleccionarPunto(key, true)" | 
| 46 | + teclado-virtual | |
| 46 | 47 | > | 
| 47 | 48 | <label | 
| 48 | 49 | class="custom-control-label float-right" | 
| ... | ... | @@ -176,7 +177,9 @@ | 
| 176 | 177 | ng-model="puntoDescarga.descripcion" | 
| 177 | 178 | foca-focus="ingreso" | 
| 178 | 179 | ng-keypress="guardar($event.keyCode)" | 
| 179 | - uppercase-only> | |
| 180 | + uppercase-only | |
| 181 | + teclado-virtual | |
| 182 | + /> | |
| 180 | 183 | </div> | 
| 181 | 184 | </div> | 
| 182 | 185 | <div class="row"> | 
| ... | ... | @@ -188,6 +191,7 @@ | 
| 188 | 191 | ng-model="puntoDescarga.latitud" | 
| 189 | 192 | ng-required="true" | 
| 190 | 193 | ng-readonly="editando" | 
| 194 | + teclado-virtual | |
| 191 | 195 | /> | 
| 192 | 196 | </div> | 
| 193 | 197 | <div class="col-6"> | 
| ... | ... | @@ -198,6 +202,7 @@ | 
| 198 | 202 | ng-model="puntoDescarga.longitud" | 
| 199 | 203 | ng-required="true" | 
| 200 | 204 | ng-readonly="editando" | 
| 205 | + teclado-virtual | |
| 201 | 206 | /> | 
| 202 | 207 | </div> | 
| 203 | 208 | </div> |