Commit f907ea1e4241674253b74222698616a59b4eace6
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master See merge request !10
Showing
2 changed files
Show diff stats
src/js/controller.js
... | ... | @@ -48,6 +48,8 @@ angular.module('focaModalPuntoDescarga') |
48 | 48 | $scope.aceptar = function() { |
49 | 49 | if($scope.cargaArticulos) { |
50 | 50 | cargarArticulos(); |
51 | + }else if(!$scope.puntosSeleccionados.length) { | |
52 | + $uibModalInstance.dismiss('cancel'); | |
51 | 53 | }else { |
52 | 54 | verCargaArticulos(); |
53 | 55 | } |
src/views/modal-punto-descarga.html
... | ... | @@ -18,8 +18,6 @@ |
18 | 18 | <tr> |
19 | 19 | <th>Código</th> |
20 | 20 | <th>Descripción</th> |
21 | - <th>Latitud</th> | |
22 | - <th>Longitud</th> | |
23 | 21 | <th></th> |
24 | 22 | </tr> |
25 | 23 | </thead> |
... | ... | @@ -38,12 +36,6 @@ |
38 | 36 | <td |
39 | 37 | ng-bind="puntoDescarga.descripcion" |
40 | 38 | ng-click="seleccionarPunto(key)"></td> |
41 | - <td | |
42 | - ng-bind="puntoDescarga.latitud" | |
43 | - ng-click="seleccionarPunto(key)"></td> | |
44 | - <td | |
45 | - ng-bind="puntoDescarga.longitud" | |
46 | - ng-click="seleccionarPunto(key)"></td> | |
47 | 39 | <td> |
48 | 40 | <input |
49 | 41 | type="checkbox" |