Luigi / foca-modal-domicilio

Download as
Browse Code ยป

Commit 5f5b23670be490aad90761dab2575d2b41ceffeb

Authored by Marcelo Puebla
2 parents 2ac0fc6058 7745e40787
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 5f5b236
... ... @@ -9,8 +9,9 @@ angular.module('focaModalDomicilio')
9 9 '$uibModal',
10 10 'idCliente',
11 11 'esNuevo',
  12 + 'focaModalService',
12 13 function($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService,
13   - $uibModal, idCliente, esNuevo) {
  14 + $uibModal, idCliente, esNuevo, focaModalService) {
14 15  
15 16 $scope.buscar = function() {
16 17 focaModalDomicilioService
... ... @@ -35,8 +36,8 @@ angular.module('focaModalDomicilio')
35 36 $scope.currentPageDomicilios = [];
36 37 $scope.selectedDomicilio = -1;
37 38 $scope.focused = 1;
38   - var puntosDescarga = [];
39   -
  39 + $scope.domicilio = {};
  40 +
40 41 //METODOS
41 42 $scope.search = function(pressed) {
42 43 $scope.filteredDomicilios = $filter('filter')(
... ... @@ -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   - dato: $scope.domicilio.latitud
  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   - dato: $scope.domicilio.longitud
  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)
... ... @@ -165,6 +185,10 @@ angular.module('focaModalDomicilio')
165 185 $scope.buscar();
166 186 $scope.ingreso = false;
167 187 $scope.domicilio = {};
  188 + })
  189 + .catch(function() {
  190 + focaModalService.alert('Hubo un error al crear el domicilio');
  191 + $scope.ingreso = false;
168 192 });
169 193 });
170 194 };
... ... @@ -205,7 +229,7 @@ angular.module('focaModalDomicilio')
205 229 };
206 230  
207 231 $scope.next = function(key) {
208   - if(key === 13) $scope.focused++;
  232 + if (key === 13) $scope.focused++;
209 233 };
210 234  
211 235 function calcularPages(paginaActual) {
src/views/modal-domicilio.html
Diff comments   View file @ 5f5b236
... ... @@ -267,8 +267,7 @@
267 267 ng-show="ingreso"
268 268 class="btn btn-sm btn-primary"
269 269 type="button"
270   - ng-click="agregarDomicilio()"
271   - ng-disabled="!formDomicilio.$valid"
  270 + ng-click="agregarDomicilio()"
272 271 >Agregar domicilio
273 272 </button>
274 273 </div>