Commit 2168366bdd4c974ffcca7958b1b7ebfaf8ef3338
1 parent
1e517a46b4
Exists in
master
and in
2 other branches
botonera principal (diferencias al guardar)
Showing
1 changed file
with
6 additions
and
6 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -21,12 +21,8 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', |
| 21 | 21 | |
| 22 | 22 | $scope.botoneraPrincipal = focaCrearHojaRutaService.getBotones(); |
| 23 | 23 | $scope.botonera = []; |
| 24 | - | |
| 25 | 24 | $scope.datepickerAbierto = false; |
| 26 | 25 | $scope.show = false; |
| 27 | - $scope.precargado = false; | |
| 28 | - $scope.cargaRemito = false; | |
| 29 | - $scope.remitoAbierto = false; | |
| 30 | 26 | $scope.cisternaCargas = []; |
| 31 | 27 | $scope.cargando = true; |
| 32 | 28 | $scope.articulos = []; |
| ... | ... | @@ -114,13 +110,14 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', |
| 114 | 110 | $scope.seleccionarRemitoAbierto = function () { |
| 115 | 111 | $scope.remitoAbierto = true; |
| 116 | 112 | $scope.cargaRemito = false; |
| 113 | + $scope.precargado = false; | |
| 117 | 114 | |
| 118 | 115 | var isBotoneraDirty = $scope.botonera.find(function (boton) { |
| 119 | 116 | return boton.checked; |
| 120 | 117 | }); |
| 121 | 118 | |
| 122 | 119 | config(); |
| 123 | - | |
| 120 | + | |
| 124 | 121 | if (isBotoneraDirty) { |
| 125 | 122 | $scope.$broadcast('cleanCabecera'); |
| 126 | 123 | focaModalService.confirm('Se perderan los cambios') |
| ... | ... | @@ -148,6 +145,8 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', |
| 148 | 145 | |
| 149 | 146 | $scope.seleccionarCargarRemitos = function () { |
| 150 | 147 | $scope.cargaRemito = true; |
| 148 | + $scope.remitoAbierto = false; | |
| 149 | + $scope.precargado = false; | |
| 151 | 150 | |
| 152 | 151 | var isBotoneraDirty = $scope.botonera.find(function (boton) { |
| 153 | 152 | return boton.checked; |
| ... | ... | @@ -180,6 +179,8 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', |
| 180 | 179 | |
| 181 | 180 | $scope.seleccionarPrecargados = function () { |
| 182 | 181 | $scope.precargado = true; |
| 182 | + $scope.cargaRemito = false; | |
| 183 | + $scope.remitoAbierto = false; | |
| 183 | 184 | var isBotoneraDirty = $scope.botonera.find(function (boton) { |
| 184 | 185 | return boton.checked; |
| 185 | 186 | }); |
| ... | ... | @@ -370,7 +371,6 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', |
| 370 | 371 | |
| 371 | 372 | function guardarHojaRuta(idRemito) { |
| 372 | 373 | |
| 373 | - | |
| 374 | 374 | var save2 = { |
| 375 | 375 | hojaRuta: { |
| 376 | 376 | id: 0, |