Commit 561c65211f9b23f58eca6d691ce427e731102dd7
Exists in
master
and in
2 other branches
Merge branch 'master' into 'develop'
Master See merge request !24
Showing
2 changed files
Show diff stats
src/js/controller.js
1 | angular.module('focaLogin') | 1 | angular.module('focaLogin') |
2 | .controller('focaLoginController', [ | 2 | .controller('focaLoginController', [ |
3 | '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', 'md5', 'APP', | 3 | '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService', 'md5', 'APP', |
4 | function($scope, focaLoginService, $location, $cookies, focaModalService, md5, APP) { | 4 | function ($scope, focaLoginService, $location, $cookies, focaModalService, md5, APP) { |
5 | $scope.paso = 1; | 5 | $scope.paso = 1; |
6 | $scope.enviar = function() { | 6 | $scope.hidePassword = true; |
7 | $scope.enviar = function () { | ||
7 | angular.element('#password').blur(); | 8 | angular.element('#password').blur(); |
8 | focaLoginService.login({ | 9 | focaLoginService.login({ |
9 | idUsuario: $scope.usuario.idUsuario, | 10 | idUsuario: $scope.usuario.idUsuario, |
10 | clave: APP != 'facturador' ? md5.createHash($scope.usuario.clave) : | 11 | clave: APP != 'facturador' ? md5.createHash($scope.usuario.clave) : |
11 | $scope.usuario.clave | 12 | $scope.usuario.clave |
12 | }).then(function(datos) { | 13 | }).then(function (datos) { |
13 | if (datos.data.chofer && datos.data.chofer.id) { | 14 | if (datos.data.chofer && datos.data.chofer.id) { |
14 | $cookies.put('chofer', datos.data.chofer.id); | 15 | $cookies.put('chofer', datos.data.chofer.id); |
15 | $cookies.put('nombreUsuario', datos.data.chofer.nombre); | 16 | $cookies.put('nombreUsuario', datos.data.chofer.nombre); |
16 | } else if (datos.data.vendedorCobrador && datos.data.vendedorCobrador.id) { | 17 | } else if (datos.data.vendedorCobrador && datos.data.vendedorCobrador.id) { |
17 | $cookies.put('vendedorCobrador', datos.data.vendedorCobrador.id); | 18 | $cookies.put('vendedorCobrador', datos.data.vendedorCobrador.id); |
18 | $cookies.put('nombreUsuario', datos.data.vendedorCobrador.NOM); | 19 | $cookies.put('nombreUsuario', datos.data.vendedorCobrador.NOM); |
19 | } else if (datos.data.vendedorPlaya) { | 20 | } else if (datos.data.vendedorPlaya) { |
20 | $cookies.put('vendedorPlaya', datos.data.vendedorPlaya.CodVen); | 21 | $cookies.put('vendedorPlaya', datos.data.vendedorPlaya.CodVen); |
21 | $cookies.put('nombreUsuario', datos.data.vendedorPlaya.NomVen.trim()); | 22 | $cookies.put('nombreUsuario', datos.data.vendedorPlaya.NomVen.trim()); |
22 | } else { | 23 | } else { |
23 | focaModalService.alert('Existe un error con el usuario ingresado'); | 24 | focaModalService.alert('Existe un error con el usuario ingresado'); |
24 | return; | 25 | return; |
25 | } | 26 | } |
26 | 27 | ||
27 | console.info(datos.data); | 28 | console.info(datos.data); |
28 | $cookies.put('token', datos.data.token); | 29 | $cookies.put('token', datos.data.token); |
29 | $location.path('/'); | 30 | $location.path('/'); |
30 | $scope.$emit('blur'); | 31 | $scope.$emit('blur'); |
31 | }, function(error) { | 32 | }, function (error) { |
32 | if (error.status === 401) { | 33 | if (error.status === 401) { |
33 | focaModalService | 34 | focaModalService |
34 | .alert('El usuario o la contraseña han sido mal introducidos'); | 35 | .alert('El usuario o la contraseña han sido mal introducidos'); |
35 | } | 36 | } |
36 | 37 | ||
37 | if(error.status === -1) { | 38 | if (error.status === -1) { |
38 | focaModalService.alert('Sin servicio'); | 39 | focaModalService.alert('Sin servicio'); |
39 | return; | 40 | return; |
40 | } | 41 | } |
41 | }); | 42 | }); |
42 | }; | 43 | }; |
43 | $scope.irPaso = function(numeroPaso) { | 44 | $scope.irPaso = function (numeroPaso) { |
44 | $scope.paso = numeroPaso; | 45 | $scope.paso = numeroPaso; |
45 | }; | 46 | }; |
46 | } | 47 | } |
47 | ]) | 48 | ]) |
48 | .controller('focaLogoutController', [ | 49 | .controller('focaLogoutController', [ |
49 | '$cookies', '$location', | 50 | '$cookies', '$location', |
50 | function($cookies, $location) { | 51 | function ($cookies, $location) { |
51 | $cookies.remove('chofer'); | 52 | $cookies.remove('chofer'); |
52 | $cookies.remove('vendedorCobrador'); | 53 | $cookies.remove('vendedorCobrador'); |
53 | $cookies.remove('vendedorPlaya'); | 54 | $cookies.remove('vendedorPlaya'); |
54 | $cookies.remove('nombreUsuario'); | 55 | $cookies.remove('nombreUsuario'); |
55 | $cookies.remove('token'); | 56 | $cookies.remove('token'); |
56 | //Cierra ventana | 57 | //Cierra ventana |
57 | window.open('', '_self', ''); //bug fix | 58 | window.open('', '_self', ''); //bug fix |
58 | window.close(); | 59 | window.close(); |
59 | $location.path('/login'); | 60 | $location.path('/login'); |
60 | } | 61 | } |
61 | ]); | 62 | ]); |
62 | 63 |
src/views/foca-login.html
1 | <div class="row justify-content-center align-items-center"> | 1 | <div class="row justify-content-center align-items-center"> |
2 | <div class="col-12 my-2"> | 2 | <div class="col-12 my-2"> |
3 | <img src="img/logo.png" class="img-login mx-auto d-block"> | 3 | <img src="img/logo.png" class="img-login mx-auto d-block"> |
4 | </div> | 4 | </div> |
5 | <div class="col-8 col-sm-6 col-md-4 col-lg-3 my-2 align-self-stretch"> | 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"> | 6 | <div class="bg-gradient-login border-0 rounded shadow-sm text-center"> |
7 | <form class="p-3 m-0" name="login"> | 7 | <form class="p-3 m-0" name="login"> |
8 | <div class="pt-3 pb-2 border-bottom border-white"> | 8 | <div class="pt-3 pb-2 mb-3 border-bottom border-white"> |
9 | <span>Ingreso de usuario</span> | 9 | <span>Ingreso de usuario</span> |
10 | </div> | 10 | </div> |
11 | <!-- USUARIO --> | 11 | <!-- USUARIO --> |
12 | <div class="form-group my-2"> | 12 | <label |
13 | <label | 13 | for="user" |
14 | for="user" | 14 | class="login-small-text m-0"> |
15 | class="login-small-text m-0"> | 15 | Usuario |
16 | Usuario | 16 | </label> |
17 | </label> | 17 | <div class="input-group mb-2"> |
18 | <input | 18 | <input |
19 | class="form-control form-control-sm badge-pill text-transform-none" | 19 | class="form-control form-control-sm rounded-pill text-transform-none" |
20 | type="text" | 20 | type="text" |
21 | id="user" | 21 | id="user" |
22 | ng-model="usuario.idUsuario" | 22 | ng-model="usuario.idUsuario" |
23 | ng-focus="paso = 1" | 23 | ng-focus="paso = 1" |
24 | foca-focus="paso === 1" | 24 | foca-focus="paso === 1" |
25 | ng-keyup="$event.keyCode == 13 && irPaso(2)" | 25 | ng-keyup="$event.keyCode == 13 && irPaso(2)" |
26 | ladda="loginLoading" | 26 | ladda="loginLoading" |
27 | teclado-virtual | 27 | teclado-virtual |
28 | /> | 28 | /> |
29 | </div> | 29 | </div> |
30 | <!-- CONTRASEÑA --> | 30 | <!-- CONTRASEÑA --> |
31 | <div class="form-group my-2"> | 31 | <label |
32 | <label | 32 | for="password" |
33 | for="password" | 33 | class="login-small-text m-0"> |
34 | class="login-small-text m-0"> | 34 | Contraseña |
35 | Contraseña | 35 | </label> |
36 | </label> | 36 | <div class="input-group mb-2"> |
37 | <input | 37 | <input |
38 | class="form-control form-control-sm badge-pill" | 38 | class="form-control form-control-sm rounded-pill text-transform-none pr-5" |
39 | id="password" | 39 | id="password" |
40 | type="password" | 40 | type="{{hidePassword ? 'password' : 'text'}}" |
41 | ng-model="usuario.clave" | 41 | ng-model="usuario.clave" |
42 | foca-focus="paso == 2" | 42 | foca-focus="paso == 2" |
43 | ng-keyup="$event.keyCode == 13 && enviar()" | 43 | ng-keyup="$event.keyCode == 13 && enviar()" |
44 | ladda="loginLoading" | 44 | ladda="loginLoading" |
45 | teclado-virtual | 45 | teclado-virtual |
46 | /> | 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> | ||
47 | </div> | 55 | </div> |
48 | <button | 56 | <button |
49 | type="button" | 57 | type="button" |
50 | ng-click="enviar()" | 58 | ng-click="enviar()" |
51 | class="btn btn-primary btn-block my-3" | 59 | class="btn btn-primary btn-block my-3" |
52 | ladda="loginLoading"> | 60 | ladda="loginLoading"> |
53 | Ingresar | 61 | Ingresar |
54 | </button> | 62 | </button> |
55 | <img | 63 | <img |
56 | src="img/logo-foca.png" | 64 | src="img/logo-foca.png" |
57 | class="w-50 rounded mx-auto py-2 d-block"> | 65 | class="w-50 rounded mx-auto py-2 d-block"> |
58 | </form> | 66 | </form> |
59 | </div> | 67 | </div> |
60 | </div> | 68 | </div> |
61 | </div> | 69 | </div> |
62 | 70 |