Mauricio Cattafi / foca-modal

Download as
Browse Code »

Commit 7d19d80579188fb11995d302a2366bfa5a3e6229

Authored by Jose Pinto
1 parent 9f7ff87cb6
Exists in master and in 1 other branch develop

controller separado, arreglo espacios en blanco

Showing 2 changed files with 72 additions and 75 deletions   Show diff stats
src/js/controller.js
Diff comments   View file @ 7d19d80
... ... @@ -69,79 +69,4 @@ angular.module('focaModal')
69 69 return result;
70 70 }
71 71 }
72   -])
73   -.controller('focaModalMailController', [
74   - '$scope',
75   - '$uibModalInstance',
76   - 'FileSaver',
77   - 'Blob',
78   - 'focaModalEnviarMailService',
79   - 'focaModalService',
80   - 'options',
81   - function($scope, $uibModalInstance, FileSaver, Blob,
82   - focaModalEnviarMailService, focaModalService, options) {
83   -
84   - 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,}))$/;
85   - $scope.descargado = false;
86   - $scope.correoEnviado = false;
87   - $scope.correoNoEnviado = false;
88   - $scope.esperando = false;
89   - $scope.titulo = options.titulo;
90   - $scope.mailCliente = options.envio.mailCliente;
91   -
92   - $scope.aceptar = function() {
93   - $uibModalInstance.close();
94   - };
95   -
96   - $scope.salir = function() {
97   - $uibModalInstance.close($scope.descargado);
98   - };
99   -
100   - $scope.imprimir = function () {
101   - $scope.descargado = true;
102   - $scope.esperando = true;
103   - focaModalEnviarMailService
104   - .imprimirComprobante(options.descarga.url, options.options)
105   - .then(function(res) {
106   - var data = new Blob([res.data], {type: 'application/pdf'});
107   -
108   - FileSaver.saveAs(
109   - data,
110   - options.descarga.nombre
111   - );
112   - $scope.esperando = false;
113   - });
114   - };
115   -
116   - $scope.enviarCorreo = function(key) {
117   - if (key === 13) {
118   - if (!validarMail()) {
119   - focaModalService.alert('Ingrese email/s válido/s');
120   - return;
121   - }
122   - $scope.descargado = true;
123   - $scope.esperando = true;
124   - Object.assign(options.options, {receiver: $scope.mailCliente});
125   -
126   - focaModalEnviarMailService
127   - .enviarCorreo(options.envio.url, options.options)
128   - .then(function() {
129   - $scope.correoEnviado = true;
130   - $scope.esperando = false;
131   - }, function() {
132   - $scope.esperando = false;
133   - $scope.correoNoEnviado = true;
134   - });
135   - }
136   - };
137   -
138   - function validarMail() {
139   - var emails = $scope.mailCliente.split(',');
140   - var result = true;
141   - emails.forEach(function(email) {
142   - if (!regexMail.test(email.trim())) result = false;
143   - });
144   - return result;
145   - }
146   - }
147 72 ]);
src/js/controllerMail.js
Diff comments   View file @ 7d19d80
... ... @@ -0,0 +1,72 @@
  1 +angular.module('focaModal')
  2 + .controller('focaModalMailController', [
  3 + '$scope',
  4 + '$uibModalInstance',
  5 + 'FileSaver',
  6 + 'Blob',
  7 + 'focaModalEnviarMailService',
  8 + 'focaModalService',
  9 + 'options',
  10 + function($scope, $uibModalInstance, FileSaver, Blob,
  11 + focaModalEnviarMailService, focaModalService, options) {
  12 +
  13 + 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,}))$/;
  14 + $scope.descargado = false;
  15 + $scope.correoEnviado = false;
  16 + $scope.correoNoEnviado = false;
  17 + $scope.esperando = false;
  18 + $scope.titulo = options.titulo;
  19 + $scope.mailCliente = options.envio.mailCliente;
  20 +
  21 + $scope.aceptar = function() {
  22 + $uibModalInstance.close();
  23 + };
  24 + $scope.salir = function() {
  25 + $uibModalInstance.close($scope.descargado);
  26 + };
  27 + $scope.imprimir = function () {
  28 + $scope.descargado = true;
  29 + $scope.esperando = true;
  30 + focaModalEnviarMailService
  31 + .imprimirComprobante(options.descarga.url, options.options)
  32 + .then(function(res) {
  33 + var data = new Blob([res.data], {type: 'application/pdf'});
  34 +
  35 + FileSaver.saveAs(
  36 + data,
  37 + options.descarga.nombre
  38 + );
  39 + $scope.esperando = false;
  40 + });
  41 + };
  42 + $scope.enviarCorreo = function(key) {
  43 + if (key === 13) {
  44 + if (!validarMail()) {
  45 + focaModalService.alert('Ingrese email/s válido/s');
  46 + return;
  47 + }
  48 + $scope.descargado = true;
  49 + $scope.esperando = true;
  50 + Object.assign(options.options, {receiver: $scope.mailCliente});
  51 +
  52 + focaModalEnviarMailService
  53 + .enviarCorreo(options.envio.url, options.options)
  54 + .then(function() {
  55 + $scope.correoEnviado = true;
  56 + $scope.esperando = false;
  57 + }, function() {
  58 + $scope.esperando = false;
  59 + $scope.correoNoEnviado = true;
  60 + });
  61 + }
  62 + };
  63 + function validarMail() {
  64 + var emails = $scope.mailCliente.split(',');
  65 + var result = true;
  66 + emails.forEach(function(email) {
  67 + if (!regexMail.test(email.trim())) result = false;
  68 + });
  69 + return result;
  70 + }
  71 + }
  72 + ]);