Commit c6087bddf3d0ea581e505910fced6b8cd5f12067

Authored by Marcelo Puebla
Exists in demo

Merge branch 'facturador' into 'demo'

Facturador(mpuebla)

See merge request !25
src/js/controller.js
1 1 angular.module('focaLogin')
2 2 .controller('focaLoginController', [
3 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 5 $scope.paso = 1;
6   - $scope.enviar = function() {
  6 + $scope.hidePassword = true;
  7 + $scope.enviar = function () {
7 8 angular.element('#password').blur();
8 9 focaLoginService.login({
9 10 idUsuario: $scope.usuario.idUsuario,
10 11 clave: APP != 'facturador' ? md5.createHash($scope.usuario.clave) :
11 12 $scope.usuario.clave
12   - }).then(function(datos) {
  13 + }).then(function (datos) {
13 14 if (datos.data.chofer && datos.data.chofer.id) {
14 15 $cookies.put('chofer', datos.data.chofer.id);
15 16 $cookies.put('nombreUsuario', datos.data.chofer.nombre);
... ... @@ -28,26 +29,26 @@ angular.module('focaLogin')
28 29 $cookies.put('token', datos.data.token);
29 30 $location.path('/');
30 31 $scope.$emit('blur');
31   - }, function(error) {
  32 + }, function (error) {
32 33 if (error.status === 401) {
33 34 focaModalService
34 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 39 focaModalService.alert('Sin servicio');
39 40 return;
40 41 }
41 42 });
42 43 };
43   - $scope.irPaso = function(numeroPaso) {
  44 + $scope.irPaso = function (numeroPaso) {
44 45 $scope.paso = numeroPaso;
45 46 };
46 47 }
47 48 ])
48 49 .controller('focaLogoutController', [
49 50 '$cookies', '$location',
50   - function($cookies, $location) {
  51 + function ($cookies, $location) {
51 52 $cookies.remove('chofer');
52 53 $cookies.remove('vendedorCobrador');
53 54 $cookies.remove('vendedorPlaya');
src/views/foca-login.html
1   -<div class="row mt-5 overflow-hidden">
2   - <div class="col p-0">
3   - <div class="row mt-5 justify-content-center">
4   - <div class="col-auto p-0">
5   - <img src="./img/logofoca.png" alt="Debo Logo">
6   - </div>
7   - </div>
8   -
9   - <div class="row justify-content-center m-5">
10   - <div class="col col-sm-10 col-md-5 col-lg-4 bg-gray-gradient shadow rounded-2">
11   - <form name="login">
12   - <div class="row my-2 justify-content-center">
13   - <div class="col border-bottom border-white">
14   - <p class="mb-2 text-center">Ingreso de usuario</p>
15   - </div>
16   - </div>
17   - <div class="row mb-2">
18   - <div class="col px-4">
19   - <p class="mb-0 text-center">Usuario</p>
20   - <input
21   - class="form-control form-control-sm"
22   - type="text"
23   - ng-model="usuario.idUsuario"
24   - ng-focus="paso = 1"
25   - foca-focus="paso == 1"
26   - ng-keyup="$event.keyCode == 13 && irPaso(2)"
27   - ladda="loginLoading"
28   - teclado-virtual
29   - />
30   - </div>
31   - </div>
32   - <div class="row mb-3">
33   - <div class="col px-4">
34   - <p class="mb-0 text-center">Contraseña</p>
35   - <input
36   - class="form-control form-control-sm"
37   - id="password"
38   - type="password"
39   - ng-model="usuario.clave"
40   - foca-focus="paso == 2"
41   - ng-keyup="$event.keyCode == 13 && enviar()"
42   - ladda="loginLoading"
43   - teclado-virtual
44   - />
  1 +<div class="row justify-content-center align-items-center">
  2 + <div class="col-12 my-2">
  3 + <img src="img/logo.png" class="img-login mx-auto d-block">
  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>
45 50 </div>
46   - </div>
47   - <div class="row mb-5">
48   - <div class="col px-4">
49   - <button
50   - type="button"
51   - ng-click="enviar()"
52   - class="btn btn-primary btn-block"
53   - ladda="loginLoading">
54   - Ingresar
55   - </button>
  51 + <div ng-show="hidePassword" ng-click="hidePassword = !hidePassword">
  52 + <i class="fade-in fa fa-eye-slash"></i>
56 53 </div>
57 54 </div>
58   - </form>
59   - </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/logofoca.png"
  65 + class="w-50 rounded mx-auto py-2 d-block">
  66 + </form>
60 67 </div>
61 68 </div>
62 69 </div>