verdnatura/worker-time-control
verdnatura
/
worker-time-control
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request '#6555 refactor to js' (#28) from 6555-refactorToJs into test
gitea/worker-time-control/pipeline/head There was a failure building this commit Details 

Reviewed-on: #28
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-10-10 13:51:46 +00:00
parent 08830756d1 5e1a5f313a
commit 1db067a65a
8 changed files with 832 additions and 640 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clockIn.html
View File

@ -11,7 +11,6 @@ and open the template in the editor.
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="css/style.css" rel="stylesheet" type="text/css"/> <link href="css/style.css" rel="stylesheet" type="text/css"/>
<link rel="icon" type="image/png" href="img/favicon.ico"> <link rel="icon" type="image/png" href="img/favicon.ico">
<script src="node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script>
<script src="node_modules/fastclick/lib/fastclick.js" type="text/javascript"></script> <script src="node_modules/fastclick/lib/fastclick.js" type="text/javascript"></script>
</head> </head>
<body class="pinLogin"> <body class="pinLogin">
@ -36,12 +35,12 @@ and open the template in the editor.
</div> </div>
<div class="footer"> <footer>
<div class="in">Inicio jornada</div> <div class="in">Inicio jornada</div>
<div class="inMiddle">Inicio descanso</div> <div class="inMiddle">Inicio descanso</div>
<div class="outMiddle">Fin descanso</div> <div class="outMiddle">Fin descanso</div>
<div class="out">Fin jornada</div> <div class="out">Fin jornada</div>
</div> </footer>
<div class="confirm"> <div class="confirm">
<div class="contConfirm"> <div class="contConfirm">

30
css/style.css
View File

@ -193,17 +193,15 @@ h3 {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.footer { footer {
display: none;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 100px; height: 115px;
text-align: center; text-align: center;
animation: fadeIn 0.2s ease-in-out;
} }
.footer {
animation: faceIn 0.2s ease-in-out;
}
.in, .inMiddle { .in, .inMiddle {
display: inline; display: inline;
position: static; position: static;
@ -342,7 +340,7 @@ header {
opacity: 1; opacity: 1;
} }
.confirm { .confirm {
display: none; visibility: hidden;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
@ -371,6 +369,14 @@ header {
font-size: 2.5em; font-size: 2.5em;
margin-bottom: 20px; margin-bottom: 20px;
} }
.fade-in {
visibility: visible;
animation: fadeIn 0.2s ease-in-out forwards;
}
.fade-out {
visibility: hidden;
animation: fadeOut 0.2s ease-in-out forwards;
}
@keyframes slideIn { @keyframes slideIn {
0% { 0% {
@ -382,7 +388,7 @@ header {
opacity: 1; opacity: 1;
} }
} }
@keyframes faceIn { @keyframes fadeIn {
0% { 0% {
opacity: 0; opacity: 0;
} }
@ -390,6 +396,14 @@ header {
opacity: 1; opacity: 1;
} }
} }
@keyframes fadeOut {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}
@font-face { @font-face {
font-family: 'Poppins'; font-family: 'Poppins';

3
index.html
View File

@ -11,7 +11,6 @@ and open the template in the editor.
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="css/style.css" rel="stylesheet" type="text/css"/> <link href="css/style.css" rel="stylesheet" type="text/css"/>
<link rel="icon" type="image/png" href="img/favicon.ico"> <link rel="icon" type="image/png" href="img/favicon.ico">
<script src="node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script>
<script src="node_modules/fastclick/lib/fastclick.js" type="text/javascript"></script> <script src="node_modules/fastclick/lib/fastclick.js" type="text/javascript"></script>
</head> </head>
<body class="pinLogin"> <body class="pinLogin">
@ -80,7 +79,7 @@ and open the template in the editor.
</div> </div>
</div> </div>
<h1> <h1>
developed by Verdnatura with<span class="heart"></span> powered by Verdnatura with<span class="heart"></span>
</h1> </h1>
<h2 class="device"> <h2 class="device">
<p id="deviceLabel"></p> <p id="deviceLabel"></p>

291
js/clockIn.js
View File

@ -1,237 +1,142 @@
let userData = ""; let userData = "";
const footer = document.querySelector("footer");
const txtName = document.querySelector("#txtNombre");
const inBtn = document.querySelector(".in");
const inMiddleBtn = document.querySelector(".inMiddle");
const outMiddleBtn = document.querySelector(".outMiddle");
const outBtn = document.querySelector(".out");
const timetableList = document.querySelector(".listHorario");
const weekDays = ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"];
$(document).ready(function () { document.addEventListener("DOMContentLoaded", () => {
userData = JSON.parse(localStorage.getItem("userData")); userData = JSON.parse(localStorage.getItem("userData"));
FastClick.attach(document.body);
setView(); setView();
setEvents(); setEvents();
}); });
function setEvents() { function setEvents() {
document.querySelector(".btnSalir").addEventListener("click", close);
$(".btnSalir").on("click", function () { inBtn.addEventListener("click", () => clockIn("in"));
cerrar(); inMiddleBtn.addEventListener("click", () => clockIn("middle"));
}); outMiddleBtn.addEventListener("click", () => clockIn("middle"));
outBtn.addEventListener("click", () => clockIn("out"));
$(".in").on("click", function () { setTimeout(close, 5000);
fichar('in');
});
$(".inMiddle").on("click", function () {
fichar('middle');
});
$(".outMiddle").on("click", function () {
fichar('middle');
});
$(".out").on("click", function () {
fichar('out');
});
setTimeout(function () {
cerrar();
}, 5000);
} }
function setView() { async function clockIn(direction) {
$(".footer").hide(); let timeout = 1000;
$("#txtNombre").text(userData["name"] + " " + userData["surname"]); const data = await call("WorkerTimeControls/clockIn", {
getInfo(); method: "POST",
$("." + userData["button1"]).show(); body: {
$("." + userData["button2"]).show(); workerFk: userData["userFk"],
}
function fichar(direction) {
const data = {
workerFk: userData['userFk'],
direction, direction,
device: localStorage.getItem("device") device: localStorage.getItem("device"),
},
});
if (data.error) {
let msg = "";
for (const val of data) if (val.error) msg += `${val.error}\n`;
printError(msg);
} else {
document.querySelector(".confirm").classList.add("fade-in");
txtConfirm.textContent = "Fichada registrada correctamente";
timeout = 2000;
} }
$.post({ setTimeout(close, timeout);
urlPath: 'WorkerTimeControls/clockIn',
jsonData: data,
processData: false,
success: function (msg) {
if (msg.error){
printErrores(msg);
setTimeout(function () {
cerrar();
}, 2000);
}else {
$(".confirm").fadeIn(200);
$(".txtConfirm").append('Fichada registrada correctamente');
setTimeout(function () {
cerrar();
}, 1000);
}
}
});
} }
function setView() { function setView() {
$(".footer").hide(); footer.style.hidden = true;
$(".in").hide(); inBtn.style.display = "none";
$(".inMiddle").hide(); inMiddleBtn.style.display = "none";
$(".outMiddle").hide(); outMiddleBtn.style.display = "none";
$(".out").hide(); outBtn.style.display = "none";
$("#txtNombre").text(userData["name"] + " " + userData["surname"]);
txtName.textContent = `${userData.name} ${userData.surname}`;
getInfo(); getInfo();
if(userData["button1"] === null && userData["button2"] === null ) {
printError ("Contacta con tu responsable") if (userData.button1 === null && userData.button2 === null) return printError("Contacta con tu responsable");
} else {
$("." + userData["button1"]).show(); document.querySelector(`.${userData.button1}`).style.display = "inline-block";
$("." + userData["button2"]).show(); if (userData.button2) document.querySelector(`.${userData.button2}`).style.display = "inline-block";
}
} }
function getInfo() { async function getInfo() {
const queryString = $.param({ workerFk: userData['userFk'] }); const data = await call("WorkerTimeControls/getClockIn", { params: { workerFk: userData["userFk"] } });
footer.style.hidden = false;
$.get({
urlPath: `WorkerTimeControls/getClockIn?${queryString}`,
processData: false,
success: function (data) {
$('.footer').show();
printTimetable(data); printTimetable(data);
}
});
} }
function printTimetable(timetable) { function printTimetable(timetable) {
const listWeekName = [ const dated = new Date();
'Domingo',
'Lunes',
'Martes',
'Miércoles',
'Jueves',
'Viernes',
'Sábado'
];;
let dated = new Date();
dated.setDate(dated.getDate() - 6); dated.setDate(dated.getDate() - 6);
for (let i = 0; i < 6; i++) { const table = document.createDocumentFragment();
$(".listHorario").append('<label>' + listWeekName[dated.getDay()] +'</label>'); const totalEl = document.querySelector(".total");
let totalHr = 0;
for (let day = 0; day < weekDays.length - 1; day++) {
const label = createElement("label", { text: weekDays[dated.getDay()] });
table.append(label);
dated.setDate(dated.getDate() + 1); dated.setDate(dated.getDate() + 1);
} }
$(".listHorario").append('<label class="hoy">HOY</label>');
$(".listHorario").append('<li class="hrTop"></li>');
for (let i = 0; i < timetable.length; i++) { table.append(createElement("label", { text: "HOY", classes: ["hoy"] }), createElement("li", { classes: ["hrTop"] }));
$(".listHorario").append( const liContent = createElement("li", {});
'<li>' + const liTotals = createElement("li", {});
'<div class="time ' + ifIsEmpty(timetable[i]["6daysAgo"]) + '">' + timetable.forEach((row, index) => {
'<div>' + for (let day = weekDays.length - 1; day >= 0; day--) {
'<img src="' + ifIsEmptyImage(timetable[i]["6daysAgoDirection"]) + '" />' + const img = createElement("img", { attrs: { src: isEmpty(row[`${day}daysAgoDirection`], "image") } });
'<p>' + ifIsEmptyText(timetable[i]["6daysAgo"]) + '</p>' + const p = createElement("p", { text: isEmpty(row[`${day}daysAgo`], "text") });
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["5daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["5daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["5daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["4daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["4daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["4daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["3daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["3daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["3daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["2daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["2daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["2daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["1daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["1daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["1daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'<div class="time ' + ifIsEmpty(timetable[i]["0daysAgo"]) + '">' +
'<div>' +
'<img src="' + ifIsEmptyImage(timetable[i]["0daysAgoDirection"]) + '" />' +
'<p>' + ifIsEmptyText(timetable[i]["0daysAgo"]) + '</p>'+
'</div>' +
'</div>' +
'</li>'
);
}
printTotalHours(timetable);
}
function printTotalHours(timetable) { const innerDiv = createElement("div", { childs: [img, p] });
if(timetable.length > 0) { const outerDiv = createElement("div", { classes: ["time", isEmpty(row[`${day}daysAgo`])], childs: [innerDiv] });
liContent.append(outerDiv);
$(".listHorario").append('<hr>'); if (index === 0) {
$(".listHorario").append('<li><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["6daysAgoTotal"])) const div = createElement("div", { classes: ["time"], text: secondsToHm(timetable[0][`${day}daysAgoTotal`]) });
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["5daysAgoTotal"])) liTotals.append(div);
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["4daysAgoTotal"])) totalHr += timetable[0][`${day}daysAgoTotal`] || 0;
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["3daysAgoTotal"]))
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["2daysAgoTotal"]))
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["1daysAgoTotal"]))
+ ' h</div><div class="time">' + secondsToHm(ifIsEmptyText(timetable[0]["0daysAgoTotal"]))
+ ' h</div></li>');
$(".total").text('Total: ' +
secondsToHm(
Number(timetable[0]["6daysAgoTotal"] == null) +
Number(timetable[0]["5daysAgoTotal"]) +
Number(timetable[0]["4daysAgoTotal"]) +
Number(timetable[0]["3daysAgoTotal"]) +
Number(timetable[0]["2daysAgoTotal"]) +
Number(timetable[0]["1daysAgoTotal"]) +
Number(timetable[0]["0daysAgoTotal"])
) + ' h');
} else{
$(".total").text('Total: 0h');
}
}
function printErrores(errores) {
let error = '';
for (let i = 0; i < errores.length; i++) {
if (errores[i].error) {
error += errores[i].error + "<br>";
} }
} }
printError(error); table.append(liContent);
if (index === timetable.length - 1) table.append(createElement("hr", {}), liTotals);
});
totalEl.innerText = `Total: ${totalHr ? secondsToHm(totalHr) : 0} h`;
timetableList.append(table);
} }
function ifIsEmpty(value) { const isEmpty = (value, type) => {
return value.trim() ? "show" : "hide"; const val = value?.toString()?.trim();
} if (!type) return val ? "show" : "hide";
if (type === "image") return val ? `img/${val}.svg` : "img/in.svg";
if (type === "text") return val ? val : "00:00";
};
function ifIsEmptyImage(value) { function close() {
return value.trim() ? `img/${value}.svg` :"img/in.svg";
}
function ifIsEmptyText(value) {
return value.toString().trim() ? value : "00:00";
}
function cerrar(){
localStorage.removeItem("userData"); localStorage.removeItem("userData");
setTimeout(function () { setTimeout(() => (window.location = "index.html"), 200);
window.location='index.html';
}, 200);
} }
function secondsToHm(seconds) { function secondsToHm(seconds) {
seconds = Number(seconds); seconds = +seconds;
let hours = Math.floor(seconds / 3600); let hours = Math.floor(seconds / 3600);
let minutes = Math.floor(seconds % 3600 / 60); let minutes = Math.floor((seconds % 3600) / 60);
return hours.toString().padStart(2, '0') + ':' + minutes.toString().padStart(2, '0'); return hours.toString().padStart(2, "0") + ":" + minutes.toString().padStart(2, "0");
}
function createElement(tag, { classes = [], text, attrs = {}, childs = [] }) {
const el = document.createElement(tag);
if (classes) el.classList.add(...classes);
if (text) el.textContent = text;
for (const [key, value] of Object.entries(attrs)) el.setAttribute(key, value);
if (childs) el.append(...childs);
return el;
} }

84
js/index.js
View File

@ -1,73 +1,63 @@
let pin = ""; let pin = "";
if ("addEventListener" in document) {
$(document).ready(function () { document.addEventListener("DOMContentLoaded", () => {
FastClick.attach(document.body); FastClick.attach(document.body);
setEvents();
});
function setEvents() { const heartEl = document.querySelector("body > h1 > span");
const heartEl = document.querySelector('body > h1 > span'); const txtPin = document.querySelector("#txtPin");
refreshDeviceLabel() refreshDeviceLabel();
heartEl.addEventListener('click', function() { heartEl.addEventListener("click", () => {
Swal.fire({ Swal.fire({
title: 'Iniciar sesión', title: "Iniciar sesión",
html: html: `
`<input id="device" class="swal2-input" type="text" placeholder="Dispositivo" value="${localStorage.getItem('device') ?? ''}"> <input id="device" class="swal2-input" type="text" placeholder="Dispositivo" value="${localStorage.getItem("device") ?? ""}">
<input id="user" class="swal2-input" type="text" placeholder="Usuario" value="${localStorage.getItem('user') ?? ''}"> <input id="user" class="swal2-input" type="text" placeholder="Usuario" value="${localStorage.getItem("user") ?? ""}">
<input id="pass" class="swal2-input" type="password" placeholder="Contraseña">`, <input id="pass" class="swal2-input" type="password" placeholder="Contraseña">`,
confirmButtonText: 'Login', confirmButtonText: "Login",
showCloseButton: true, showCloseButton: true,
showCancelButton: false, showCancelButton: false,
}).then(async (result) => { }).then(async (result) => {
if(result.isConfirmed) { if (result.isConfirmed)
const user = $('#user').val(); signIn(document.querySelector("#user").value, document.querySelector("#pass").value, document.querySelector("#device").value);
const pass = $('#pass').val();
const device = $('#device').val();
signIn(user, pass, device);
}
}); });
}); });
$(".btnnum").on("click", function () { document.querySelectorAll(".btnnum").forEach((btn) => {
pin += parseInt($(this).children().html()); btn.addEventListener("click", (e) => {
$("#txtPin").text(pin); pin += +e.currentTarget.children[0].innerHTML;
txtPin.textContent = pin;
});
}); });
$(".btnCancel").on("click", function () { document.querySelector(".btnCancel").addEventListener("click", () => {
pin = ""; pin = "";
$("#txtPin").text("ID USUARIO"); txtPin.textContent = "ID USUARIO";
}); });
$(".btnOk").on("click", function () { document.querySelector(".btnOk").addEventListener("click", () => pin && login());
if (pin) {
login();
};
}); });
} }
function login() { async function login() {
$.post({ try {
urlPath: 'WorkerTimeControls/login', const data = await call("WorkerTimeControls/login", {
jsonData: {pin}, method: "POST",
processData: false, body: { pin },
success: function (data) { });
localStorage.setItem("userData", JSON.stringify(data)); localStorage.setItem("userData", JSON.stringify(data));
window.location = "clockIn.html"; window.location = "clockIn.html";
}, } catch (e) {
error: function() { document.querySelector("#txtPin").textContent = "ID USUARIO";
$("#txtPin").text("ID USUARIO");
pin = ""; pin = "";
} }
});
} }
function signIn(user, password, device) { async function signIn(user, password, device) {
$.post({ const data = await call("vnUsers/sign-in", {
urlPath: 'vnUsers/sign-in', method: "POST",
jsonData: {user, password}, body: { user, password },
processData: false, });
success: function (data) {
localStorage.setItem("token", data.token); localStorage.setItem("token", data.token);
localStorage.setItem("ttl", data.ttl); localStorage.setItem("ttl", data.ttl);
localStorage.setItem("user", user); localStorage.setItem("user", user);
@ -75,10 +65,6 @@ function signIn(user, password, device) {
localStorage.setItem("created", Date.now()); localStorage.setItem("created", Date.now());
getTokenConfig(); getTokenConfig();
refreshDeviceLabel(); refreshDeviceLabel();
},
})
} }
function refreshDeviceLabel() { const refreshDeviceLabel = () => (document.querySelector("#deviceLabel").textContent = localStorage.getItem("device") ?? "");
$("#deviceLabel").text(localStorage.getItem('device') ?? '')
}

156
js/main.js
View File

@ -1,130 +1,124 @@
const renewPeriod = localStorage.getItem('renewPeriod'); const renewPeriod = localStorage.getItem("renewPeriod");
let intervalId, isCheckingToken; let intervalId, isCheckingToken;
const txtConfirm = document.querySelector(".txtConfirm");
const confirmBtn = document.querySelector(".confirm");
function confirmReset() { function confirmReset() {
$(".confirm").removeClass('confirmKO'); confirmBtn.classList.remove("confirmKO", "fade-in", "fade-out");
$(".txtConfirm").empty(); confirmBtn.style.hidden = true;
txtConfirm.textContent = "";
} }
function printError(msg){ function printError(msg) {
confirmReset(); confirmReset();
$(".txtConfirm").append(msg); const txtConfirm = document.querySelector(".txtConfirm");
$(".confirm").addClass('confirmKO'); txtConfirm.textContent = msg;
$(".confirm").fadeIn(200); confirmBtn.classList.add("confirmKO");
setTimeout(function() { confirmBtn.style.hidden = false;
$(".confirm").fadeOut(200);
confirmBtn.classList.add("fade-in");
setTimeout(() => {
confirmBtn.classList.add("fade-out");
setTimeout(confirmReset, 200); setTimeout(confirmReset, 200);
}, 2300); }, 2300);
} }
function renewToken() { async function renewToken() {
$.post({ const data = await call("vnUsers/renewToken", { method: "POST" });
urlPath: 'vnUsers/renewToken',
processData: false,
success: function (data) {
localStorage.setItem("token", data.id);
localStorage.setItem("ttl", data.ttl); localStorage.setItem("ttl", data.ttl);
localStorage.setItem("created", Date.now()); localStorage.setItem("created", Date.now());
},
})
} }
function getTokenConfig() { async function getTokenConfig() {
const filter = {fields: ['renewInterval', 'renewPeriod']}; const data = await call("AccessTokenConfigs/findOne", {
$.get({ params: { filter: { fields: ["renewInterval", "renewPeriod"] } },
urlPath: 'AccessTokenConfigs/findOne', });
jsonData: filter,
processData: false,
success: function (data) {
if (!data) return; if (!data) return;
localStorage.setItem('renewPeriod', data.renewPeriod);
clearInterval(intervalId);
intervalId = setInterval(() => checkValidity(), data.renewInterval * 1000);
},
})
}
function checkValidity() { localStorage.setItem("renewPeriod", data.renewPeriod);
const created = +localStorage.getItem('created'); clearInterval(intervalId);
const ttl = localStorage.getItem('ttl');
intervalId = setInterval(() => {
const created = +localStorage.getItem("created");
const ttl = localStorage.getItem("ttl");
if (isCheckingToken || !created) return; if (isCheckingToken || !created) return;
isCheckingToken = true; isCheckingToken = true;
const renewPeriodInSeconds = Math.min(ttl, renewPeriod) * 1000; const renewPeriodInSeconds = Math.min(ttl, renewPeriod) * 1000;
const maxDate = created + renewPeriodInSeconds; const maxDate = created + renewPeriodInSeconds;
const now = new Date();
if (now.getTime() <= maxDate) return isCheckingToken = false; if (new Date().getTime() <= maxDate) return (isCheckingToken = false);
renewToken(); renewToken();
isCheckingToken = false; isCheckingToken = false;
}, data.renewInterval * 1000);
} }
$.ajaxPrefilter(function(xhr) { async function call(url, { method = "GET", body = {}, params = {} }) {
const orgErrorHandler = xhr.error; const controller = new AbortController();
const token = localStorage.getItem('token') const { signal } = controller;
const timeoutId = setTimeout(() => controller.abort(), 2000);
Object.assign(xhr, { const opts = {
url: `/api/${xhr.urlPath}`, method,
headers: { headers: {
Authorization : token Authorization: localStorage.getItem("token"),
"Content-Type": "application/json; charset=utf-8",
}, },
timeout: 2000, signal,
contentType: 'application/json; charset=utf-8', };
dataType: 'json',
processData: false, if (method === "GET") {
data: JSON.stringify(xhr.jsonData), const searchParams = new URLSearchParams();
error: function(xhr, textStatus, err) { for (let [key, value] of Object.entries(params)) {
if (orgErrorHandler) { searchParams.append(key, typeof value === "object" ? JSON.stringify(value) : value);
}
url += "?" + searchParams.toString();
} else if (method === "POST") opts.body = JSON.stringify(body);
try { try {
orgErrorHandler(xhr, textStatus, err); const res = await fetch(`/api/${url}`, opts);
const data = await res.json();
if (res.ok) return data;
clearTimeout(timeoutId);
throw data.error;
} catch (e) { } catch (e) {
err = e; let mensaje = "Ha ocurrido un error, consulta con informática";
}
}
if(xhr?.responseJSON?.error?.code == 'periodNotExceeded') return; switch (e.name) {
case "SyntaxError":
switch (textStatus){ mensaje = "Requested JSON parse failed";
case 'parsererror':
mensaje = 'Requested JSON parse failed';
break; break;
case 'timeout': case "TimeoutError":
mensaje = 'Time out error'; mensaje = "Time out error";
break; break;
case 'abort': case "AbortError":
mensaje = 'Ajax request aborted'; mensaje = "Ajax request aborted";
break; break;
case 'error': case "UserError":
if (xhr?.responseJSON?.error?.name == 'UserError') { mensaje = e.message;
mensaje = xhr.responseJSON.error.message;
break; break;
} default:
switch (xhr.status){ switch (e.statusCode) {
case 0: case 0:
mensaje = 'Not connect: Verify Network'; mensaje = "Not connect: Verify Network";
break; break;
case 504: case 504:
mensaje = 'No se ha podido conectar con Salix, consulta con informática'; mensaje = "No se ha podido conectar con Salix, consulta con informática";
break; break;
case 555: case 555:
mensaje = JSON.parse(xhr.statusText).Message; mensaje = "Error 555";
break; break;
default: default:
if (xhr.status >= 400 && xhr.status < 500) if (e.statusCode >= 400 && e.statusCode < 500) mensaje = e.message;
mensaje = xhr.statusText;
else
mensaje = 'Ha ocurrido un error, consulta con informática';
} }
break;
default:
mensaje = 'Ha ocurrido un error, consulta con informática';
} }
printError(mensaje); printError(mensaje);
throw e;
} }
}); }
});
if(renewPeriod) getTokenConfig(); if (renewPeriod) getTokenConfig();

760
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
View File

@ -18,11 +18,10 @@
"dependencies": { "dependencies": {
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"fastclick": "^1.0.6", "fastclick": "^1.0.6",
"jquery": "^3.7.0", "sweetalert2": "^11.6.13"
"sweetalert2": "11.10.1"
}, },
"devDependencies": { "devDependencies": {
"express": "^4.18.2", "express": "^4.19.2",
"http-proxy-middleware": "^2.0.6" "http-proxy-middleware": "^2.0.6"
} }
} }