diff --git a/src/js/controller.js b/src/js/controller.js index 6cf861a..64f8286 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -93,9 +93,9 @@ angular.module('focaAbmVehiculo') ]) .controller('focaAbmVehiculoController', [ '$scope', 'focaAbmVehiculoService', '$routeParams', '$location', '$uibModal', - 'focaModalService', '$timeout', 'focaBotoneraLateralService', '$window', + 'focaModalService', '$timeout', 'focaBotoneraLateralService', function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal, - focaModalService, $timeout, focaBotoneraLateralService, $window) { + focaModalService, $timeout, focaBotoneraLateralService) { $scope.nuevo = $routeParams.idVehiculo === '0' ? true : false; $scope.now = new Date(); $scope.focused = 1; @@ -162,8 +162,16 @@ angular.module('focaAbmVehiculo') } }; $scope.guardar = function(key) { + key = (typeof key === 'undefined') ? 13 : key; + if(key === 13) { + + if($scope.formVehiculo.$pristine) { + $scope.cancelar(); + return; + } + //Valida si existe numero de unidad if(!validaTotalCargas() && !$scope.nuevo) { focaModalService.alert('La suma de las capacidades de las cisternas' + @@ -233,7 +241,7 @@ angular.module('focaAbmVehiculo') total += parseInt(cisterna.capacidad); } }); - return $scope.vehiculo.capacidad == total; + return $scope.vehiculo.capacidad === total; } function guardarCisternas() { diff --git a/src/js/controllerCisterna.js b/src/js/controllerCisterna.js index 72e5163..c679843 100644 --- a/src/js/controllerCisterna.js +++ b/src/js/controllerCisterna.js @@ -1,9 +1,9 @@ angular.module('focaAbmVehiculo') .controller('focaAbmVehiculoCisternaController', [ '$scope', 'focaAbmVehiculoService', '$routeParams', '$location', '$uibModal', - 'focaModalService', 'focaBotoneraLateralService', '$timeout', '$window', + 'focaModalService', 'focaBotoneraLateralService', '$timeout', function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal, - focaModalService, focaBotoneraLateralService, $timeout, $window) { + focaModalService, focaBotoneraLateralService, $timeout) { $scope.nuevo = ($routeParams.idx > -1) ? false : true; $scope.editar = false; $scope.now = new Date(); @@ -54,6 +54,12 @@ angular.module('focaAbmVehiculo') $location.path('/vehiculo/' + $routeParams.idVehiculo); }; $scope.guardar = function() { + + if($scope.formCisterna.$pristine) { + $scope.cancelar(); + return; + } + if(!$scope.cisterna.unidadMedida) { focaModalService.alert('Ingrese unidad de medida'); return; @@ -101,11 +107,11 @@ angular.module('focaAbmVehiculo') cisternas.forEach(function(cisterna, idx) { //SI EL CODIGO YA EXISTE if(cisterna.codigo === $scope.cisterna.codigo && - idx != $routeParams.idx && + idx !== $routeParams.idx && !cisterna.desactivado) { reject('Código de cisterna existente'); } - if(idx != $routeParams.idx && + if(idx !== $routeParams.idx && !cisterna.desactivado) { totalCargado += cisterna.capacidad; }