From c4a826fa483731c7688a940dc1f8301fa4f42168 Mon Sep 17 00:00:00 2001 From: Luigi Date: Wed, 13 Mar 2019 11:28:39 -0300 Subject: [PATCH] Modal Cancelar --- src/js/controller.js | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 4c4b3a2..bf54505 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -120,19 +120,21 @@ angular.module('focaAbmChofer') $timeout(function() { focaBotoneraLateralService.showSalir(false); focaBotoneraLateralService.showPausar(true); - focaBotoneraLateralService.showCancelar(true); + focaBotoneraLateralService.showCancelar(false); focaBotoneraLateralService.showGuardar(true, $scope.guardar); + focaBotoneraLateralService.addCustomButton('Cancelar', cancelar); + }); $timeout(function() {getLSChofer();}); - + if ($scope.nuevo) { focaAbmChoferService .getTransportistaPorId($routeParams.idTransportista) - .then(function(res) { - var codigo = ('00000' + res.data.COD).slice(-5); - $scope.chofer.idTransportista = res.data.COD; - $scope.chofer.transportista = res.data; + .then(function(res) { + var codigo = ('00000' + res.data.COD).slice(-5); + $scope.chofer.idTransportista = res.data.COD; + $scope.chofer.transportista = res.data; $scope.$broadcast('addCabecera', { label: 'Transportista:', valor: codigo + ' - ' + res.data.NOM @@ -147,7 +149,7 @@ angular.module('focaAbmChofer') $scope.$broadcast('addCabecera', { label: 'Transportista:', valor: codigo + ' - ' + res.data.transportista.NOM - }); + }); } }); @@ -163,7 +165,7 @@ angular.module('focaAbmChofer') }); } function getLSChofer() { - var chofer = JSON.parse($localStorage.chofer || null); + var chofer = JSON.parse($localStorage.chofer || null); if (chofer) { setearChofer(chofer); @@ -171,15 +173,11 @@ angular.module('focaAbmChofer') } } - $scope.cancelar = function() { - $location.path('/chofer'); - }; - - $scope.pausar = function() { - focaBotoneraLateralService.pausar(); + $scope.cancelar = function() { + $location.path('/chofer'); }; - $scope.guardar = function(key) { + $scope.guardar = function(key) { if (!$scope.chofer.nombre) { focaModalService.alert('Ingrese nombre'); @@ -206,7 +204,7 @@ angular.module('focaAbmChofer') } }; - $scope.$watch('chofer', function(newValue) { + $scope.$watch('chofer', function(newValue) { focaBotoneraLateralService.setPausarData({ label: 'chofer', val: { @@ -217,18 +215,32 @@ angular.module('focaAbmChofer') idTipoDocumento: newValue.idTipoDocumento, id: newValue.id } - }); + }); }, true); + function cancelar() { + if ($scope.formChofer.$pristine == false) { + focaModalService.confirm( + '¿Está seguro de que desea salir? Se perderán todos los datos cargados.' + ).then(function(data) { + if (data) { + $location.path('/chofer'); + } + }); + } else { + $location.path('/chofer'); + } + } + function validaDni() { return new Promise(function(resolve, reject) { focaAbmChoferService .getChoferPorDni($scope.chofer.dni) .then(function(res) { - if(res.data.id && + if (res.data.id && $scope.chofer.id !== res.data.id) { reject(res.data); - }else { + } else { resolve(); } }); -- 1.9.1