Mauricio Cattafi / foca-modal

Browse Code »

Commit 0f3656aa5d4e21c7de1241e73ab1a1deb1068e61

Authored by Benjamin Rodriguez 2019-09-18 15:48:11 -0300

1 parent a2da28e6e5

Exists in develop

Creo modalInfo para el modal de informacion

Showing 4 changed files with 46 additions and 0 deletions Show diff stats

package.json

Diff comments View file @ 0f3656a

 {
   "name": "foca-modal",
   "version": "0.0.1",
   "description": "Modales de foca",
   "main": "index.js",
   "scripts": {
+    "refresh": "gulp uglify && cp tmp/foca-modal.js ../wrapper-demo/node_modules/foca-modal/dist/foca-modal.min.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "gulp-pre-commit": "gulp pre-commit",
     "compile": "gulp uglify",
     "postinstall": "npm run compile && gulp clean-post-install",
     "install-dev": "npm install -D angular gulp gulp-angular-templatecache gulp-clean gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jshint pump git+http://git.focasoftware.com/npm/foca-directivas.git"
   },
   "pre-commit": [
     "gulp-pre-commit"
   ],
   "repository": {
     "type": "git",
     "url": "http://git.focasoftware.com/npm/foca-modal.git"
   },
   "author": "Foca Software",
   "license": "ISC",
   "peerDependencies": {
     "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git"
   },
   "devDependencies": {
     "angular": "^1.7.5",
     "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.2.5",
     "gulp-clean": "^0.4.0",
     "gulp-connect": "^5.7.0",
     "gulp-htmlmin": "^5.0.1",
     "gulp-jshint": "^2.1.0",
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
     "gulp-uglify": "^3.0.1",
     "jshint": "^2.9.7",
     "pump": "^3.0.0"
   }
 }

src/js/controller.js

Diff comments View file @ 0f3656a

 angular.module('focaModal')
 .controller('focaModalConfirmController', [
     '$uibModalInstance', '$scope', 'textoModal',
     function($uibModalInstance, $scope, textoModal) {
         $scope.textoModal = textoModal;
         $scope.cancelar = function() {
             $uibModalInstance.dismiss(false);
         };
         $scope.aceptar = function() {
             $uibModalInstance.close(true);
         };
     }
 ])
+.controller('focaModalInfoController', [
+    '$uibModalInstance', '$scope', 'textoModal',
+    function($uibModalInstance, $scope, textoModal) {
+        $scope.textoModal = textoModal;
+        $scope.aceptar = function() {
+            $uibModalInstance.close(true);
+        };
+    }
+])
 .controller('focaModalAlertController', [
     '$uibModalInstance', '$scope', 'textoModal',
     function($uibModalInstance, $scope, textoModal) {
         $scope.textoModal = textoModal;
         $scope.aceptar = function() {
             $uibModalInstance.close(true);
         };
     }
 ])
 .controller('focaModalFechaController', [
     '$uibModalInstance', '$scope', 'parametros',
     function($uibModalInstance, $scope, parametros) {
         $scope.parametros = parametros;
         $scope.fecha = new Date();
         $scope.options = {};
         if (parametros.minDate) $scope.options.minDate = parametros.minDate;
         $scope.cancelar = function() {
             $uibModalInstance.dismiss();
         };
         $scope.aceptar = function() {
             $uibModalInstance.close($scope.fecha);
         };
     }
 ])
 .controller('focaModalPromptController', [
     '$uibModalInstance', '$scope', 'options', 'focaModalService',
     function($uibModalInstance, $scope, options, focaModalService) {
         $scope.options = options;
         if (!$scope.options.tipo) {
             $scope.options.tipo = 'text'
         }
         $scope.cancelar = function() {
             $uibModalInstance.dismiss();
         };
         $scope.aceptar = function(key) {
             if (key === 13) {
                 if (options.email && !validateEmails($scope.options.value)) {
                     focaModalService.alert('Ingrese email/s válido/s');
                     return;
                 }
                 $uibModalInstance.close($scope.options.value);
             }
         };
         function validateEmails(emails) {
             var re = /^(([^<>()\[\]\\.,;:\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,}))$/;
             var arr = emails.split(',');
             var result = true;
             arr.forEach(function(email) {
                 var val = String(email).trim().toLowerCase();
                 if (!re.test(val)) result = false;
             });
             return result;
         }
     }
 ]);

src/js/service.js

Diff comments View file @ 0f3656a

 angular.module('focaModal')
     .factory('focaModalService', [
         '$uibModal', 'API_ENDPOINT', '$http',
         function($uibModal, API_ENDPOINT, $http) {
             return {
                 confirm: function(textoModal) {
                     return $uibModal.open({
                         templateUrl: 'modal-confirm.html',
                         controller: 'focaModalConfirmController',
                         animation: false,
                         backdrop: false,
                         resolve: { textoModal: function() { return textoModal; } }
                     })
                         .result.then(
                             function(resultado) {
                                 return resultado;
                             }
                         );
                 },
+                info: function(textoModal){
+                    return $uibModal.open({
+                        templateUrl: 'modal-info.html',
+                        controller: 'focaModalInfoController',
+                        animation: false,
+                        backdrop: false,
+                        resolve: { textoModal: function() { return textoModal; } }
+                    })
+                        .result.then(
+                            function(resultado) {
+                                return resultado;
+                            }
+                        );
+                },
                 alert: function(textoModal) {
                     return $uibModal.open({
                         templateUrl: 'modal-alert.html',
                         controller: 'focaModalAlertController',
                         animation: false,
                         backdrop: false,
                         resolve: { textoModal: function() { return textoModal; } }
                     })
                         .result.then(
                             function(resultado) {
                                 return resultado;
                             }
                         );
                 },
                 modal: function(parametrosModal) {
                     parametrosModal.size = (typeof parametrosModal.size  === 'undefined') ?
                         'lg' : parametrosModal.size;
                     return $uibModal.open({
                         templateUrl: 'foca-modal.html',
                         controller: 'focaModalController',
                         size: parametrosModal.size,
                         resolve: {
                             parametrosModal: function() { return parametrosModal; }
                         }
                     })
                         .result.then(
                             function(resultado) {
                                 return resultado;
                             }
                         );
                 },
                 getEntidad: function(filters, query, tipo, json) {
                     if (tipo === 'POST') {
                         return $http.post(API_ENDPOINT.URL + query, json);
                     } else {
                         return $http.get(API_ENDPOINT.URL + query, {nombre: filters});
                     }
                 },
                 modalFecha: function(parametros) {
                     return $uibModal.open({
                         templateUrl: 'foca-fecha.html',
                         controller: 'focaModalFechaController',
                         size: 'md',
                         resolve: {
                             parametros: function() { return parametros; }
                         }
                     })
                     .result.then(
                         function(resultado) {
                             return resultado;
                         }
                     );
                 },
                 prompt: function(options) {
                     return $uibModal.open({
                         templateUrl: 'modal-prompt.html',
                         controller: 'focaModalPromptController',
                         size: 'md',
                         resolve: {
                             options: function() {return options;},
                         }
                     })
                     .result.then(
                         function(resultado) {
                             return resultado;
                         }
                     );
                 },
                 mail: function(options) {
                     return $uibModal.open({
                         templateUrl: 'modal-mail.html',
                         controller: 'focaModalMailController',
                         size: 'md',
                         resolve: {
                             options: function() {return options;},
                         }
                     })
                     .result.then(
                         function(resultado) {
                             return resultado;
                         }
                     );
                 },
                 imprimirComprobante: function(url, options) {
                     return $http.post(
                         API_ENDPOINT.URL + url,
                         options,
                         {responseType: 'arraybuffer'}
                     );
                 },
                 enviarCorreo: function(url, options) {
                     return $http.post(API_ENDPOINT.URL + url, options);
                 }
             };
         }
     ]);

src/views/modal-info.html

Diff comments View file @ 0f3656a

File was created	1	<div>
	2
	3	<div class="modal-header">
	4	<h4>Información</h4>
	5	</div>
	6
	7	<div class="modal-body">
	8	<p ng-bind="textoModal" class="line-break">
	9	</p>
	10	<!-- La versión está tipeada, después habria que hacer que se haga una consulta y devuelva la versión -->
	11	<p class="mt-1">Debo Distribuidores: Versión 2.0</p>
	12	<p class="mt-1">Ante un inconveniente con el sistema,</br>
	13	comuniquese con nuestra <a href="http://focasoftware.com" target="__blank">mesa de ayuda</a></p>
	14	<a href="http://focasoftware.com" target="__blank">
	15	<img src="img/logo-foca.png" class="w-25 rounded mx-auto d-block mt-4">
	16	</a>
	17	</div>
	18	<div class="modal-footer">
	19	<button class="btn btn-primary" ng-click="aceptar()" foca-focus="true">Aceptar</button>
	20	</div>
	21	</div>
	22
	23