From 7d19d80579188fb11995d302a2366bfa5a3e6229 Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Fri, 22 Mar 2019 12:27:35 -0300 Subject: [PATCH] controller separado, arreglo espacios en blanco --- src/js/controller.js | 75 ------------------------------------------------ src/js/controllerMail.js | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 75 deletions(-) create mode 100644 src/js/controllerMail.js diff --git a/src/js/controller.js b/src/js/controller.js index f3486eb..b55ef10 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -69,79 +69,4 @@ angular.module('focaModal') return result; } } -]) -.controller('focaModalMailController', [ - '$scope', - '$uibModalInstance', - 'FileSaver', - 'Blob', - 'focaModalEnviarMailService', - 'focaModalService', - 'options', - function($scope, $uibModalInstance, FileSaver, Blob, - focaModalEnviarMailService, focaModalService, options) { - - var regexMail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - $scope.descargado = false; - $scope.correoEnviado = false; - $scope.correoNoEnviado = false; - $scope.esperando = false; - $scope.titulo = options.titulo; - $scope.mailCliente = options.envio.mailCliente; - - $scope.aceptar = function() { - $uibModalInstance.close(); - }; - - $scope.salir = function() { - $uibModalInstance.close($scope.descargado); - }; - - $scope.imprimir = function () { - $scope.descargado = true; - $scope.esperando = true; - focaModalEnviarMailService - .imprimirComprobante(options.descarga.url, options.options) - .then(function(res) { - var data = new Blob([res.data], {type: 'application/pdf'}); - - FileSaver.saveAs( - data, - options.descarga.nombre - ); - $scope.esperando = false; - }); - }; - - $scope.enviarCorreo = function(key) { - if (key === 13) { - if (!validarMail()) { - focaModalService.alert('Ingrese email/s válido/s'); - return; - } - $scope.descargado = true; - $scope.esperando = true; - Object.assign(options.options, {receiver: $scope.mailCliente}); - - focaModalEnviarMailService - .enviarCorreo(options.envio.url, options.options) - .then(function() { - $scope.correoEnviado = true; - $scope.esperando = false; - }, function() { - $scope.esperando = false; - $scope.correoNoEnviado = true; - }); - } - }; - - function validarMail() { - var emails = $scope.mailCliente.split(','); - var result = true; - emails.forEach(function(email) { - if (!regexMail.test(email.trim())) result = false; - }); - return result; - } - } ]); diff --git a/src/js/controllerMail.js b/src/js/controllerMail.js new file mode 100644 index 0000000..ea591c7 --- /dev/null +++ b/src/js/controllerMail.js @@ -0,0 +1,72 @@ +angular.module('focaModal') + .controller('focaModalMailController', [ + '$scope', + '$uibModalInstance', + 'FileSaver', + 'Blob', + 'focaModalEnviarMailService', + 'focaModalService', + 'options', + function($scope, $uibModalInstance, FileSaver, Blob, + focaModalEnviarMailService, focaModalService, options) { + + var regexMail = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + $scope.descargado = false; + $scope.correoEnviado = false; + $scope.correoNoEnviado = false; + $scope.esperando = false; + $scope.titulo = options.titulo; + $scope.mailCliente = options.envio.mailCliente; + + $scope.aceptar = function() { + $uibModalInstance.close(); + }; + $scope.salir = function() { + $uibModalInstance.close($scope.descargado); + }; + $scope.imprimir = function () { + $scope.descargado = true; + $scope.esperando = true; + focaModalEnviarMailService + .imprimirComprobante(options.descarga.url, options.options) + .then(function(res) { + var data = new Blob([res.data], {type: 'application/pdf'}); + + FileSaver.saveAs( + data, + options.descarga.nombre + ); + $scope.esperando = false; + }); + }; + $scope.enviarCorreo = function(key) { + if (key === 13) { + if (!validarMail()) { + focaModalService.alert('Ingrese email/s válido/s'); + return; + } + $scope.descargado = true; + $scope.esperando = true; + Object.assign(options.options, {receiver: $scope.mailCliente}); + + focaModalEnviarMailService + .enviarCorreo(options.envio.url, options.options) + .then(function() { + $scope.correoEnviado = true; + $scope.esperando = false; + }, function() { + $scope.esperando = false; + $scope.correoNoEnviado = true; + }); + } + }; + function validarMail() { + var emails = $scope.mailCliente.split(','); + var result = true; + emails.forEach(function(email) { + if (!regexMail.test(email.trim())) result = false; + }); + return result; + } + } + ]); -- 1.9.1