From 1e517a46b473ccf37943dff3a80476c85c8ea8d6 Mon Sep 17 00:00:00 2001 From: Luigi Date: Wed, 12 Jun 2019 15:25:32 -0300 Subject: [PATCH] fechas - validar articulos cisterna --- src/js/controller.js | 11 +++++++++-- src/js/controllerDetalles.js | 4 +--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index dc1b825..f8d91cf 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -118,6 +118,8 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', var isBotoneraDirty = $scope.botonera.find(function (boton) { return boton.checked; }); + + config(); if (isBotoneraDirty) { $scope.$broadcast('cleanCabecera'); @@ -150,7 +152,9 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', var isBotoneraDirty = $scope.botonera.find(function (boton) { return boton.checked; }); - + + config(); + if (isBotoneraDirty) { $scope.$broadcast('cleanCabecera'); focaModalService.confirm('Se perderan los cambios') @@ -179,7 +183,9 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', var isBotoneraDirty = $scope.botonera.find(function (boton) { return boton.checked; }); - + + config(); + if (isBotoneraDirty) { focaModalService.confirm('Se perderan los cambios') .then(function () { @@ -948,6 +954,7 @@ angular.module('focaCrearHojaRuta').controller('hojaRutaCtrl', hojasRutas: function () { return hojasRutas; } }, size: 'lg', + backdrop: false } ); return modalInstance.result.then(function (res) { diff --git a/src/js/controllerDetalles.js b/src/js/controllerDetalles.js index da1d178..9355a91 100644 --- a/src/js/controllerDetalles.js +++ b/src/js/controllerDetalles.js @@ -49,8 +49,6 @@ angular.module('focaCrearHojaRuta') }, ], }).then(function (res) { - console.log('Res: ', res); - var newArt = { id: 0, @@ -90,7 +88,7 @@ angular.module('focaCrearHojaRuta') $scope.guardar = function () { var cisternasFilter = $scope.hojasRutas.vehiculo.cisternas.filter(function (cisterna) { - return parseInt(cisterna.disponible) > 0; + return parseInt(cisterna.disponible) > 0 || cisterna.articuloSeleccionado; }); -- 1.9.1