Commit 49454ac67795365e33382cf6485c3c01aa6ff6e7
Exists in
master
and in
2 other branches
Merge branch 'master' into 'master'
Master(efernandez) See merge request !5
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -318,6 +318,7 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 318 | 318 | focaModalService.alert('Debe cargar al menos un articulo'); |
| 319 | 319 | return; |
| 320 | 320 | } |
| 321 | + $scope.saveLoading = true; | |
| 321 | 322 | var save = { |
| 322 | 323 | remito: { |
| 323 | 324 | id: $scope.remito.id, |
| ... | ... | @@ -370,6 +371,7 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 370 | 371 | data.data.id, $scope.remito.cotizacion.COTIZACION); |
| 371 | 372 | |
| 372 | 373 | focaModalService.alert('Remito creado'); |
| 374 | + $scope.saveLoading = false; | |
| 373 | 375 | //TODO: updatear plazos |
| 374 | 376 | if($scope.remito.id === 0) { |
| 375 | 377 | var plazos = $scope.plazosPagos; |
| ... | ... | @@ -414,6 +416,10 @@ angular.module('focaCrearRemito') .controller('remitoController', |
| 414 | 416 | $scope.notaPedido = { |
| 415 | 417 | id: 0 |
| 416 | 418 | }; |
| 419 | + }, function(error) { | |
| 420 | + focaModalService.alert('Hubo un error al crear el remito'); | |
| 421 | + $scope.saveLoading = false; | |
| 422 | + console.info(error); | |
| 417 | 423 | } |
| 418 | 424 | ); |
| 419 | 425 | }; |
src/views/remito.html
| ... | ... | @@ -481,6 +481,8 @@ |
| 481 | 481 | <div class="row align-items-end"> |
| 482 | 482 | <div class="col-12"> |
| 483 | 483 | <button |
| 484 | + ladda="saveLoading" | |
| 485 | + data-spinner-color="#FF0000" | |
| 484 | 486 | ng-click="crearRemito()" |
| 485 | 487 | type="submit" |
| 486 | 488 | title="Crear nota remito" |
| ... | ... | @@ -502,7 +504,13 @@ |
| 502 | 504 | <div class="row d-md-none fixed-bottom"> |
| 503 | 505 | <div class="w-100 bg-dark d-flex px-3 acciones-mobile"> |
| 504 | 506 | <span class="ml-3 text-muted" ng-click="salir()">Salir</span> |
| 505 | - <span class="mr-3 ml-auto" ng-click="crearRemito()">Guardar</span> | |
| 507 | + <span | |
| 508 | + class="mr-3 ml-auto" | |
| 509 | + ng-class="saveLoading ? 'text-muted' : ''" | |
| 510 | + ng-click="crearRemito()" | |
| 511 | + ladda="saveLoading" | |
| 512 | + data-style="expand-left" | |
| 513 | + >Guardar</span> | |
| 506 | 514 | </div> |
| 507 | 515 | </div> |
| 508 | 516 | </div> |