Skip to content

R
RegistroAsistenciasDesktop
Commit bd66543f by Felipe Escala Torres
Options

gitignore+

parent b29a1e65
Showing with 131 additions and 67 deletions
.gitignore 0 → 100644
#directories
bower_components
node_modules
dist
#files
*.tgz
*.log
@klavestad
\ No newline at end of file
.vscode/tasks.json 0 → 100644
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "install",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
\ No newline at end of file
css/pages/index.css
...@@ -80,7 +80,12 @@ input.error { ...@@ -80,7 +80,12 @@ input.error {
} }
.login-container .page-container .login-form { .login-container .page-container .login-form {
width: 400px !important; width: 300px !important;
height: auto;
}
.login-container .page-container .singing-form {
width: 800px !important;
height: auto; height: auto;
} }
...@@ -150,4 +155,14 @@ body { ...@@ -150,4 +155,14 @@ body {
left: 0; left: 0;
bottom: 0; bottom: 0;
right: 0; right: 0;
}
.absolute-center-singing {
/* height: must be declared */
margin: auto;
/* position: absolute !important; */
top: 0;
left: 0;
bottom: 0;
right: 0;
} }
\ No newline at end of file
html/content.html
<!-- Content area --> <!-- Content area -->
<div class="content absolute-center"> <div class="content">
<!-- Advanced login --> <!-- Advanced login -->
<input type="hidden" id="aux"> <input type="hidden" id="aux">
<form action="#" onsubmit="return false" autocomplete="off"> <form action="#" onsubmit="return false" autocomplete="off">
<div class="some-class text-center">b <div class="some-class text-center">
<div class="dyclock-digital dyclock-container"></div> <div class="dyclock-digital dyclock-container"></div>
</div> </div>
<div class="login-form containerMe panel-zoom"> <div class="absolute-center-singing singing-form containerMe panel-zoom">
<div class="translucentMe"></div> <div class="translucentMe"></div>
<div class="contentMe"> <div class="contentMe">
<div class="text-center"> <div class="text-center">
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
</div> </div>
</div> </div>
</form> </form>
<br>
<!--MESSAGE ERROR--> <!--MESSAGE ERROR-->
<div id="dataUserError" style="display: none" class="login-form containerMe panel-zoom"> <div id="dataUserError" style="display: none" class="absolute-center-singing singing-form containerMe panel-zoom">
<div class="msgTranslucent card-3" style="background-color: #821c25"></div> <div class="msgTranslucent card-3" style="background-color: #821c25"></div>
<div class="contentMe text-center"> <div class="contentMe text-center">
<div class="row titleFont"> <div class="row titleFont">
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<!--MESSAGE ERROR--> <!--MESSAGE ERROR-->
<!--MESSAGE SUCCESS--> <!--MESSAGE SUCCESS-->
<div id="dataUserSuccess" style="display: none" class="login-form containerMe panel-zoom"> <div id="dataUserSuccess" style="display: none" class="absolute-center-singing singing-form containerMe panel-zoom">
<div class="msgTranslucent card-3" style="background-color: #4adb58"></div> <div class="msgTranslucent card-3" style="background-color: #4adb58"></div>
<div class="contentMe"> <div class="contentMe">
<div class="row text-center titleFont"> <div class="row text-center titleFont">
......
html/login.html
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
</div> </div>
<div class="form-group has-feedback has-feedback-left"> <div class="form-group has-feedback has-feedback-left">
<input id="username" type="text" class="form-control" placeholder="Usuario"> <input id="username" name="username" type="text" class="form-control" placeholder="Usuario">
<div class="form-control-feedback"> <div class="form-control-feedback">
<i class="icon-user text-muted"></i> <i class="icon-user text-muted"></i>
</div> </div>
</div> </div>
<div class="form-group has-feedback has-feedback-left"> <div class="form-group has-feedback has-feedback-left">
<input id="password" type="text" class="form-control" placeholder="Contraseña"> <input id="password" type="password" class="form-control" placeholder="Contraseña">
<div class="form-control-feedback"> <div class="form-control-feedback">
<i class="icon-lock2 text-muted"></i> <i class="icon-lock2 text-muted"></i>
</div> </div>
......
index.html
...@@ -22,19 +22,19 @@ ...@@ -22,19 +22,19 @@
</head> </head>
<body class="login-container "> <body class="login-container">
<!-- Page container --> <!-- Page container -->
<div class="page-container absolute-center"> <div class="page-container">
<!-- Page content --> <!-- Page content -->
<div class="page-content"> <div class="page-content">
<!-- Main content --> <!-- Main content -->
<div class="content-wrapper "> <div class="content-wrapper">
<div id="login" style="display: none"> <div id="login" style="display: none">
</div> </div>
......
index.js
...@@ -9,12 +9,12 @@ function createWindow() { ...@@ -9,12 +9,12 @@ function createWindow() {
height: 600, height: 600,
frame: false, frame: false,
kiosk: true, kiosk: true,
icon:'./img/checkList.ico' icon: './img/checkList.ico'
}) })
win.loadFile('index.html') win.loadFile('index.html')
// open devtools // open devtools
win.webContents.openDevTools() win.webContents.openDevTools()
win.setMenu(null) // win.setMenu(null)
// win.setFullScreen(true) // win.setFullScreen(true)
// win.maximize() // win.maximize()
......
js/lib/validateAlfi.js
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
exp = 'abcdefghijklmnñopqrstuvwxyzáéíóú ' exp = 'abcdefghijklmnñopqrstuvwxyzáéíóú '
break break
case 'numbers': case 'numbers':
exp = '1234567890.' exp = '1234567890'
break break
case 'date': case 'date':
exp = '1234567890/' exp = '1234567890/'
......
js/pages/index.js
// const MacAddress = require('get-mac-address'); // const MacAddress = require('get-mac-address');
const macaddress = require('macaddress') const macaddress = require('macaddress')
const nodeMachineId = require(`node-machine-id`) const nodeMachineId = require(`node-machine-id`)
const { shell } = require('electron') const {
shell
} = require('electron')
let ids = {} let ids = {}
let _this = require('electron').remote.getCurrentWindow() let _this = require('electron').remote.getCurrentWindow()
...@@ -53,31 +55,31 @@ const helpers = { ...@@ -53,31 +55,31 @@ const helpers = {
}, 1700) }, 1700)
}, },
alertSuccess(message, callback) { alertSuccess(message, callback) {
let action = callback || function () { } let action = callback || function () {}
swal(message || '¡Correcto!', { swal(message || '¡Correcto!', {
icon: 'success', icon: 'success',
button: 'Aceptar' button: 'Aceptar'
}) })
.then(data => { .then(data => {
action() action()
}) })
}, },
alertError(message, callback) { alertError(message, callback) {
let action = callback || function () { } let action = callback || function () {}
swal(message || '¡Advertencia!', { swal(message || '¡Advertencia!', {
icon: 'danger', icon: 'danger',
button: 'Aceptar' button: 'Aceptar'
}) })
.then(data => { .then(data => {
action() action()
}) })
}, },
alertConfirm(message, callback) { alertConfirm(message, callback) {
swal('¡ADVERTENCIA!', message, { swal('¡ADVERTENCIA!', message, {
icon: 'warning', icon: 'warning',
confirmButtonText: 'Aceptar', confirmButtonText: 'Aceptar',
cancelButtonText: 'Cancelar' cancelButtonText: 'Cancelar'
}) })
.then(data => { .then(data => {
if (data.value) { if (data.value) {
callback(true) callback(true)
...@@ -110,7 +112,8 @@ const httpRequest = { ...@@ -110,7 +112,8 @@ const httpRequest = {
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
loader.terminarLoader() loader.terminarLoader()
resolve(data) resolve(data)
}, error: function (jqXHR, textStatus, errorThrown) { },
error: function (jqXHR, textStatus, errorThrown) {
loader.terminarLoader() loader.terminarLoader()
reject('Error en la petición') reject('Error en la petición')
} }
...@@ -132,7 +135,8 @@ const httpRequest = { ...@@ -132,7 +135,8 @@ const httpRequest = {
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
loader.terminarLoader() loader.terminarLoader()
resolve(data) resolve(data)
}, error: function (jqXHR, textStatus, errorThrown) { },
error: function (jqXHR, textStatus, errorThrown) {
loader.terminarLoader() loader.terminarLoader()
reject('Error en la petición') reject('Error en la petición')
} }
...@@ -192,7 +196,8 @@ const httpRequest = { ...@@ -192,7 +196,8 @@ const httpRequest = {
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
loader.terminarLoader() loader.terminarLoader()
resolve(data) resolve(data)
}, error: function (jqXHR, textStatus, errorThrown) { },
error: function (jqXHR, textStatus, errorThrown) {
loader.terminarLoader() loader.terminarLoader()
reject('Error en la petición') reject('Error en la petición')
} }
...@@ -214,7 +219,8 @@ const httpRequest = { ...@@ -214,7 +219,8 @@ const httpRequest = {
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
loader.terminarLoader() loader.terminarLoader()
resolve(data) resolve(data)
}, error: function (jqXHR, textStatus, errorThrown) { },
error: function (jqXHR, textStatus, errorThrown) {
loader.terminarLoader() loader.terminarLoader()
reject('Error en la petición') reject('Error en la petición')
} }
...@@ -290,30 +296,36 @@ const DOMEvents = { ...@@ -290,30 +296,36 @@ const DOMEvents = {
registrarSede() { registrarSede() {
$('#btnLogin').click(() => { $('#btnLogin').click(() => {
httpRequest.validarRegistro({ httpRequest.validarRegistro({
idMachine: ids.idMachine, idMachine: ids.idMachine,
macMachine: ids.macMachine, macMachine: ids.macMachine,
username: $('#username').val(), username: $('#username').val(),
password: $('#password').val(), password: $('#password').val(),
}) })
.then(data => { .then(data => {
if (data.status) { if (data.status) {
param = {
codigoUsuario: data.data.codigoUsuario,
codigoSede: data.data.codigoSede,
idMachine: ids.idMachine,
macMachine: ids.macMachine
}
if (data.aditional) { if (data.aditional) {
param = { msnConfirm('Ya hay una máquina registrada para esta sede, si continua dicha máquina será eliminada.<br> ¿Desea continuar?', (option) => {
codigoUsuario: data.data.codigoUsuario, if (option) {
codigoSede: data.data.codigoSede, param.aditional = true
idMachine: ids.idMachine, initRequest.registrarSede(param)
macMachine: ids.macMachine }
} })
alert('Su sede ya tiene registrada una máquina, si continua los cambios se sobrescribiran')
initRequest.registrarSede(param)
} else { } else {
initRequest.registrarSede(param) initRequest.registrarSede(param)
} }
} else { } else {
if (data.aditional) { if (data.aditional) {
alert('Esta maquina ya esta registrada para una sede') msnError(data.message, () => {
helpers.refreshBW(_this)
})
} else { } else {
alert('Usuario no existe o no tiene permisos') msnError(data.message)
} }
} }
}) })
...@@ -333,14 +345,16 @@ const initRequest = { ...@@ -333,14 +345,16 @@ const initRequest = {
}, },
registrarSede(json) { registrarSede(json) {
httpRequest.registrarSede({ httpRequest.registrarSede({
codigoUsuario: json.codigoUsuario, codigoUsuario: json.codigoUsuario,
codigoSede: json.codigoSede, codigoSede: json.codigoSede,
idMachine: json.idMachine, idMachine: json.idMachine,
macMachine: json.macMachine macMachine: json.macMachine,
}) aditional: json.aditional
})
.then(data => { .then(data => {
alert('Registro exitoso') msnSuccess('Registro exitoso', () => {
helpers.refreshBW(_this) helpers.refreshBW(_this)
})
}) })
.catch(err => console.log(err)) .catch(err => console.log(err))
}, },
...@@ -348,10 +362,8 @@ const initRequest = { ...@@ -348,10 +362,8 @@ const initRequest = {
httpRequest.getLogin() httpRequest.getLogin()
.then(data => { .then(data => {
$('#login').html(data) $('#login').html(data)
$('body').addClass('login-container') $('.page-container').toggleClass('absolute-center')
$("#login").fadeIn("slow"); $("#login").fadeIn("slow");
// $('#login').modal('show')
// $('.modal-backdrop').removeClass("modal-backdrop")
DOMEvents.linkDirectorio() DOMEvents.linkDirectorio()
DOMEvents.registrarSede() DOMEvents.registrarSede()
}) })
...@@ -379,7 +391,10 @@ const initComponents = { ...@@ -379,7 +391,10 @@ const initComponents = {
digitalClock.start(); digitalClock.start();
}, },
initValidate() { initValidate() {
new Input({ el: '#dniUsuario', param: 'numbers' }).validate() new Input({
el: '#dniUsuario',
param: 'numbers'
}).validate()
} }
} }
...@@ -393,20 +408,25 @@ $(window).ready(() => { ...@@ -393,20 +408,25 @@ $(window).ready(() => {
httpRequest.checkIds() httpRequest.checkIds()
.then(data => { .then(data => {
if (data.status === true) { if (data.status === true) {
initRequest.pasteContent() if (data.aditional) {
msnError('¡Ocurrió un error!<br/>Contáctese con el area de sistemas')
} else {
initRequest.pasteContent()
}
} else { } else {
if (data.aditional === true) { if ((data.message).includes('--->')) {
helpers.alert('Contactese con el area de sistemas') msnError('Ha ocurrido un error inesperado.<br/>Contáctese con el area de sistemas.')
console.log(data.message);
} else { } else {
alert('La sesion se ha perdido') if (data.aditional === true) {
initRequest.pasteLogin() msnError('¡Ocurrió un error!<br/>Contáctese con el area de sistemas.')
} else {
initRequest.pasteLogin()
}
} }
} }
}) })
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
}) })
}) })
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment