Mauricio Cattafi / foca-login

Browse Code »

Commit 34508b29f1753182ff4082b4ca7140aebd4f1620

Authored by Mauricio Cattafi 2019-10-24 13:44:05 -0300

2 parents eccbb58579 561c65211f

Exists in master

Merge branch 'develop' of git.focasoftware.com:npm/foca-login

Showing 4 changed files Show diff stats

package.json

Diff comments View file @ 34508b2

 {
     "name": "foca-login",
     "version": "0.0.1",
     "description": "Login",
     "main": "dist/foca-login.js",
     "scripts": {
+        "refresh": "gulp uglify && cp tmp/foca-login.js ../wrapper-demo/node_modules/foca-login/dist/foca-login.min.js",
         "test": "echo \"Error: no test specified\" && exit 1",
         "gulp-pre-commit": "gulp pre-commit",
         "postinstall": "gulp uglify && gulp clean-post-install",
         "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify gulp-replace jquery jshint pump && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "https://debo.suite.repo/modulos-npm/foca-login.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "angular": "^1.7.x",
         "bootstrap": "^4.1.x",
         "jquery": "^3.3.x",
         "font-awesome": "^4.7.x",
         "gulp": "^3.9.x",
         "gulp-concat": "2.6.x",
         "gulp-jshint": "^2.1.x",
         "gulp-rename": "^1.4.x",
         "gulp-replace": "^1.0.x",
         "gulp-uglify-es": "^1.0.x",
         "jshint": "^2.9.x",
         "pump": "^3.0.x",
         "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git"
     },
     "devDependencies": {
         "angular": "^1.7.5",
         "angular-cookies": "^1.7.5",
         "angular-route": "^1.7.5",
         "bootstrap": "^4.1.3",
         "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git",
         "font-awesome": "^4.7.0",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.2",
         "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-sequence": "^1.0.0",
         "gulp-uglify": "^3.0.1",
         "jasmine-core": "^3.3.0",
         "jquery": "^3.3.1",
         "jshint": "^2.9.7",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/js/controller.js

Diff comments View file @ 34508b2

 angular.module('focaLogin')
     .controller('focaLoginController', [
-        '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', 'md5',
+        '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', 'md5', 'APP',
-        function($scope, focaLoginService, $location, $cookies, focaModalService, md5) {
+        function ($scope, focaLoginService, $location, $cookies, focaModalService, md5, APP) {
             $scope.paso = 1;
-            $scope.enviar = function() {
+            $scope.hidePassword = true;
+            $scope.enviar = function () {
                 angular.element('#password').blur();
                 focaLoginService.login({
                     idUsuario: $scope.usuario.idUsuario,
-                    clave: md5.createHash($scope.usuario.clave)
+                    clave: APP != 'facturador' ? md5.createHash($scope.usuario.clave) :
-                }).then(function(datos) {
+                        $scope.usuario.clave
+                }).then(function (datos) {
                     if (datos.data.chofer && datos.data.chofer.id) {
                         $cookies.put('chofer', datos.data.chofer.id);
                         $cookies.put('nombreUsuario', datos.data.chofer.nombre);
                     } else if (datos.data.vendedorCobrador && datos.data.vendedorCobrador.id) {
                         $cookies.put('vendedorCobrador', datos.data.vendedorCobrador.id);
                         $cookies.put('nombreUsuario', datos.data.vendedorCobrador.NOM);
+                    } else if (datos.data.vendedorPlaya) {
+                        $cookies.put('vendedorPlaya', datos.data.vendedorPlaya.CodVen);
+                        $cookies.put('nombreUsuario', datos.data.vendedorPlaya.NomVen.trim());
                     } else {
                         focaModalService.alert('Existe un error con el usuario ingresado');
                         return;
                     }
                     console.info(datos.data);
                     $cookies.put('token', datos.data.token);
                     $location.path('/');
                     $scope.$emit('blur');
-                }, function(error) {
+                }, function (error) {
                     if (error.status === 401) {
                         focaModalService
                             .alert('El usuario o la contraseña han sido mal introducidos');
                     }
-                    if(error.status === -1) {
+                    if (error.status === -1) {
                         focaModalService.alert('Sin servicio');
                         return;
                     }
                 });
             };
-            $scope.irPaso = function(numeroPaso) {
+            $scope.irPaso = function (numeroPaso) {
                 $scope.paso = numeroPaso;
             };
         }
     ])
     .controller('focaLogoutController', [
         '$cookies', '$location',
-        function($cookies, $location) {
+        function ($cookies, $location) {
             $cookies.remove('chofer');
             $cookies.remove('vendedorCobrador');
+            $cookies.remove('vendedorPlaya');
             $cookies.remove('nombreUsuario');
             $cookies.remove('token');
             //Cierra ventana
             window.open('', '_self', ''); //bug fix
             window.close();
             $location.path('/login');
         }
     ]);

src/js/service.js

Diff comments View file @ 34508b2

 angular.module('focaLogin')
     .factory('focaLoginService', [
         '$http', 'API_ENDPOINT', 'APP', '$cookies',
         function($http, API_ENDPOINT, APP, $cookies) {
             return {
                 login: function(usuario) {
                     var param = '';
                     if (APP) {
                         param = '/' + APP;
                     }
                     return $http.post(API_ENDPOINT.URL + '/usuario/login' + param , usuario);
                 },
                 getLoginData: function() {
                     if ($cookies.get('chofer')) {
                         return {chofer: $cookies.get('chofer')};
                     }
                     if ($cookies.get('vendedorCobrador')) {
                         return {vendedorCobrador: $cookies.get('vendedorCobrador')};
                     }
+                    if ($cookies.get('vendedorPlaya')) {
+                        return {vendedorPlaya: $cookies.get('vendedorPlaya')};
+                    }
                 }
             };
         }
     ]);

src/views/foca-login.html

Diff comments View file @ 34508b2

1	<div class="login">	1	<div class="row justify-content-center align-items-center">
2	<form name="login">	2	<div class="col-12 my-2">
3	<div class="login-titulo">	3	<img src="img/logo.png" class="img-login mx-auto d-block">
4	<span>Ingreso de usuario</span>	4	</div>
		5	<div class="col-8 col-sm-6 col-md-4 col-lg-3 my-2 align-self-stretch">
		6	<div class="bg-gradient-login border-0 rounded shadow-sm text-center">
		7	<form class="p-3 m-0" name="login">
		8	<div class="pt-3 pb-2 mb-3 border-bottom border-white">
		9	<span>Ingreso de usuario</span>
		10	</div>
		11	<!-- USUARIO -->
		12	<label
		13	for="user"
		14	class="login-small-text m-0">
		15	Usuario
		16	</label>
		17	<div class="input-group mb-2">
		18	<input
		19	class="form-control form-control-sm rounded-pill text-transform-none"
		20	type="text"
		21	id="user"
		22	ng-model="usuario.idUsuario"
		23	ng-focus="paso = 1"
		24	foca-focus="paso === 1"
		25	ng-keyup="$event.keyCode == 13 && irPaso(2)"
		26	ladda="loginLoading"
		27	teclado-virtual
		28	/>
		29	</div>
		30	<!-- CONTRASEÑA -->
		31	<label
		32	for="password"
		33	class="login-small-text m-0">
		34	Contraseña
		35	</label>
		36	<div class="input-group mb-2">
		37	<input
		38	class="form-control form-control-sm rounded-pill text-transform-none pr-5"
		39	id="password"
		40	type="{{hidePassword ? 'password' : 'text'}}"
		41	ng-model="usuario.clave"
		42	foca-focus="paso == 2"
		43	ng-keyup="$event.keyCode == 13 && enviar()"
		44	ladda="loginLoading"
		45	teclado-virtual
		46	/>
		47	<div class="input-icon px-3">
		48	<div ng-show="!hidePassword" ng-click="hidePassword = !hidePassword">
		49	<i class="fade-in fa fa-eye"></i>
		50	</div>
		51	<div ng-show="hidePassword" ng-click="hidePassword = !hidePassword">
		52	<i class="fade-in fa fa-eye-slash"></i>
		53	</div>
		54	</div>
		55	</div>
		56	<button
		57	type="button"
		58	ng-click="enviar()"
		59	class="btn btn-primary btn-block my-3"
		60	ladda="loginLoading">
		61	Ingresar
		62	</button>
		63	<img
		64	src="img/logo-foca.png"
		65	class="w-50 rounded mx-auto py-2 d-block">
		66	</form>
5	</div>	67	</div>
6	<div class="login-campo">	68	</div>
7	<label>Usuario</label>
8	<input