Commit 7745e407875104c2c3088d325a3c303e580a9592
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master See merge request !11
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -36,6 +36,7 @@ angular.module('focaModalDomicilio') |
| 36 | 36 | $scope.currentPageDomicilios = []; |
| 37 | 37 | $scope.selectedDomicilio = -1; |
| 38 | 38 | $scope.focused = 1; |
| 39 | + $scope.domicilio = {}; | |
| 39 | 40 | |
| 40 | 41 | //METODOS |
| 41 | 42 | $scope.search = function(pressed) { |
| ... | ... | @@ -44,8 +45,8 @@ angular.module('focaModalDomicilio') |
| 44 | 45 | {$: $scope.filters} |
| 45 | 46 | ); |
| 46 | 47 | |
| 47 | - if(pressed) { | |
| 48 | - if($scope.filteredDomicilios.length === 0) { | |
| 48 | + if (pressed) { | |
| 49 | + if ($scope.filteredDomicilios.length === 0) { | |
| 49 | 50 | $timeout(function() { |
| 50 | 51 | angular.element('#search')[0].focus(); |
| 51 | 52 | $scope.filters = ''; |
| ... | ... | @@ -115,44 +116,63 @@ angular.module('focaModalDomicilio') |
| 115 | 116 | }; |
| 116 | 117 | |
| 117 | 118 | $scope.agregarDomicilio = function() { |
| 119 | + | |
| 118 | 120 | $scope.domicilio.valores = []; |
| 119 | 121 | $scope.domicilio.idCliente = $scope.idCliente; |
| 120 | - if($scope.domicilio.calle) { | |
| 122 | + if ($scope.domicilio.calle) { | |
| 121 | 123 | $scope.domicilio.valores.push({ |
| 122 | 124 | ID_ADAC_1: 1, |
| 123 | 125 | dato: $scope.domicilio.calle |
| 124 | 126 | }); |
| 125 | 127 | } |
| 126 | - if($scope.domicilio.numeroCalle) { | |
| 128 | + if ($scope.domicilio.numeroCalle) { | |
| 127 | 129 | $scope.domicilio.valores.push({ |
| 128 | 130 | ID_ADAC_1: 2, |
| 129 | 131 | dato: $scope.domicilio.numeroCalle |
| 130 | 132 | }); |
| 131 | 133 | } |
| 132 | - if($scope.domicilio.localidad) { | |
| 134 | + if ($scope.domicilio.localidad) { | |
| 133 | 135 | $scope.domicilio.valores.push({ |
| 134 | 136 | ID_ADAC_1: 3, |
| 135 | 137 | dato: $scope.domicilio.localidad |
| 136 | 138 | }); |
| 137 | 139 | } |
| 138 | - if($scope.domicilio.provincia) { | |
| 140 | + if ($scope.domicilio.provincia) { | |
| 139 | 141 | $scope.domicilio.valores.push({ |
| 140 | 142 | ID_ADAC_1: 4, |
| 141 | 143 | dato: $scope.domicilio.provincia |
| 142 | 144 | }); |
| 143 | 145 | } |
| 144 | - if($scope.domicilio.latitud) { | |
| 146 | + if ($scope.domicilio.latitud) { | |
| 145 | 147 | $scope.domicilio.valores.push({ |
| 146 | 148 | ID_ADAC_1: 23, |
| 147 | 149 | dato: $scope.domicilio.latitud.toString() |
| 148 | 150 | }); |
| 149 | 151 | } |
| 150 | - if($scope.domicilio.longitud) { | |
| 152 | + if ($scope.domicilio.longitud) { | |
| 151 | 153 | $scope.domicilio.valores.push({ |
| 152 | 154 | ID_ADAC_1: 24, |
| 153 | 155 | dato: $scope.domicilio.longitud.toString() |
| 154 | 156 | }); |
| 155 | 157 | } |
| 158 | + | |
| 159 | + if (!$scope.domicilio.titulo) { | |
| 160 | + focaModalService.alert('Ingrese titulo'); | |
| 161 | + return; | |
| 162 | + } else if (!$scope.domicilio.calle) { | |
| 163 | + focaModalService.alert('Ingrese calle'); | |
| 164 | + return; | |
| 165 | + } else if (!$scope.domicilio.numeroCalle) { | |
| 166 | + focaModalService.alert('Ingrese numero de calle'); | |
| 167 | + return; | |
| 168 | + } else if (!$scope.domicilio.localidad) { | |
| 169 | + focaModalService.alert('Ingrese localidad'); | |
| 170 | + return; | |
| 171 | + } else if (!$scope.domicilio.provincia) { | |
| 172 | + focaModalService.alert('Ingrese provincia'); | |
| 173 | + return; | |
| 174 | + } | |
| 175 | + | |
| 156 | 176 | //domicilios de entrega corresponden al 1 |
| 157 | 177 | focaModalDomicilioService |
| 158 | 178 | .obtenerUltimoPorNivelPadre(1) |
| ... | ... | @@ -209,7 +229,7 @@ angular.module('focaModalDomicilio') |
| 209 | 229 | }; |
| 210 | 230 | |
| 211 | 231 | $scope.next = function(key) { |
| 212 | - if(key === 13) $scope.focused++; | |
| 232 | + if (key === 13) $scope.focused++; | |
| 213 | 233 | }; |
| 214 | 234 | |
| 215 | 235 | function calcularPages(paginaActual) { |
src/views/modal-domicilio.html