diff --git a/Dockerfile b/Dockerfile index 241cf9d..073fe63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ ca-certificates \ gnupg2 \ libfontconfig \ - && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_20.x | bash - \ && apt-get install -y --no-install-recommends \ nodejs \ && apt-get purge -y --auto-remove \ @@ -22,6 +22,7 @@ RUN npm install --only=prod COPY js js COPY css css COPY img img +COPY font font COPY \ LICENSE \ README.md \ diff --git a/LICENSE b/LICENSE index aab011a..2a40ad6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2021 - Verdnatura Levante S.L. +Copyright (C) 2023 - Verdnatura Levante S.L. This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/clockIn.html b/clockIn.html index 5aab4aa..949c37d 100644 --- a/clockIn.html +++ b/clockIn.html @@ -6,10 +6,11 @@ and open the template in the editor. --> - FichApp + Time Control + @@ -26,7 +27,7 @@ and open the template in the editor.

Tus fichadas

-

Situación de los ultimos 7 días

+

Situación de los últimos 7 días

@@ -42,24 +43,6 @@ and open the template in the editor.
Fin jornada
-

- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/css/style.css b/css/style.css index c7eb25e..b7df433 100644 --- a/css/style.css +++ b/css/style.css @@ -2,188 +2,177 @@ Created on : 29-jul-2019, 11:30:28 Author : enrique blasco blanquer */ - -*{ +* { margin: 0; padding: 0; box-sizing: border-box; user-select: none; } - -html,body{ +html, body { width: 100%; height: 100%; - font-family: sans-serif; - background: #000; + font-family: 'Poppins', 'Verdana', 'Sans'; + background: #121212; } - - -h1{ +h1 { position: fixed; bottom: 20px; right: 20px; font-size: 1em; - color: #fff; + font-weight: 400; + color: white; + opacity: 50%; } -span{ +span { color: #ED4947; } - - -.total{ +.total { float: right; font-weight: bold; font-size: 1.4em; - margin-top: -40px; + margin-top: -45px; + color: white; } - -ul{ +ul { list-style: none; } - -.pinLogin{ - background-image: url(../img/logo.png); - background-size: cover; - background-position: center; - background-repeat: no-repeat; -} - -#logoVerd{ - width: 200px; - margin: 20px; -} - -#logoVerdHeader{ - width: 50px; - margin: 0; - position: fixed; - top: 12px; - left: 20px; -} - - - -.pinContainer{ - width: 350px; +.pinContainer { + width: 320px; height: 460px; position: fixed; top: 0; - bottom: 0; + bottom: 21%; left: 0; right: 0; margin: auto; text-align: center; + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; } - -#txtPin{ +#txtPin { text-align: center; padding: 15px 5px; - background: rgba(255,255,255,.90); - border: none; - font-weight: bold; + background: white; + line-height: 40px; + font-weight: 400; font-size: 1.5em; - border-radius: 5px; - + border-radius: 50px; display: block; - width: 250px; + width: 310px; + height: 70px; margin: auto; margin-bottom: 10px; + overflow: hidden; + font-size: 26px; } - -.btnPin{ +#logo { + width: 30%; + padding-bottom: 20px; + pointer-events: none; +} +.btnPin { + display: flex; + align-items: center; + justify-content: center; float: left; width: calc(100% / 3); - height: calc(500px/5); + height: calc(500px / 5); padding: 5px; } -.btnPinNum{ +.btnPinNum { width: 100%; height: 100%; font-size: 2.5em; - background: rgba(255,255,255,.90); - padding-top: 21px; - border-radius: 5px; + background: #292929; + color: white; + margin: auto; + border-radius: 48%; + font-weight: 400; + display: flex; + align-items: center; + justify-content: center; } - -.btnPinNum:active{ - background: rgb(255,255,255); +.btnPinNum:active { + background: #333; } - -.btnCancel{ +.btnCancel { width: 100%; height: 100%; - font-size: 2.5em; - padding-top: 20px; + display: flex; + align-items: center; + justify-content: center; background: rgba(237,73,71,.90); - color: #fff; - border-radius: 5px; + color: white; + border-radius: 50%; } -.btnCancel:active{ +.btnCancel:active { background: rgb(172,55,54); } - -.btnOk{ +.btnOk { width: 100%; height: 100%; - font-size: 2.5em; - padding-top: 20px; + display: flex; + align-items: center; + justify-content: center; background: rgba(163,171,38,.90); - color: #fff; - border-radius: 5px; + color: white; + border-radius: 50%; } - -.btnOk:active{ +#invertColor { + filter: invert(100%); + pointer-events: none; +} +.btnOk:active { background: rgb(130, 136, 31); } - - -#txtNombre{ +#txtNombre { padding-top: 0px; padding-left: 10px; float: left; - color: #fff; + color: white; text-align: right; font-size: 1.8em; font-weight: bold; } - -.paneles{ +.paneles { overflow: hidden; width: 100%; } - -.planPanel{ +.planPanel { float: left; width: 100%; padding: 20px 20px 0 20px; height: auto; } -.problemsPanel{ +.problemsPanel { float: left; width: 100%; height: auto; padding: 20px; } -.container{ +.container { width: 100%; height: 100%; - background: rgba(255,255,255,.90); + background: #292929; padding: 20px; overflow: hidden; box-shadow: 0 0 5px rgba(0,0,0,.2); border-radius: 8px; + animation: slideIn 0.4s ease-in-out; } -h2{ +h2 { font-size: 1.3em; + color: white; } -h3{ +h3 { font-size: 1em; color: #9EA7AC; font-weight: normal; } - -.footer{ +.footer { display: none; position: absolute; bottom: 0; @@ -191,23 +180,27 @@ h3{ height: 100px; text-align: center; } - -.in,.inMiddle { +.footer { + animation: faceIn 0.2s ease-in-out; +} +.in, .inMiddle { display: inline; position: static; width: 350px; - background: rgba(0, 204, 10, .90); + background: rgba(69, 171, 38, 0.9); padding: 20px 40px; font-size: 2em; color: #fff; text-align: center; - border-radius: 10px; + border-radius: 50px; } - .in:active { - background: rgb(0, 204, 10); + background: rgb(53, 131, 29); } -.out,.outMiddle{ +.out { + margin-left: 30px; +} +.out, .outMiddle { display: inline; position: static; width: 350px; @@ -216,118 +209,117 @@ h3{ font-size: 2em; color: #fff; text-align: center; - border-radius: 10px; + border-radius: 50px; } - .out:active { background: rgb(237,73,71); } - -.inMiddle{ +.inMiddle { background: rgba(210, 172, 2, 0.9); } - -.outMiddle{ - background: rgba(226, 86, 4, 0.9); +.outMiddle { + background: rgba(210, 172, 2, 0.9); } - -.inMiddle:active{ +.inMiddle:active { background: rgb(210, 172, 2); } - -.outMiddle:active{ - background: rgb(226, 86, 4); +.outMiddle:active { + background: rgb(210, 172, 2); } - -header{ +header { overflow: hidden; padding: 20px 20px 0px 20px; } - -.btnSalir{ +.btnSalir { float: right; background: rgba(237,73,71,.90); padding: 5px 30px; font-size: 1.2em; color: #fff; - border-radius: 5px; + border-radius: 50px; } - -.btnSalir:active{ +.btnSalir:active { background: rgb(237,73,71); } - -#txtIncidencia{ +#txtIncidencia { color: #ED4947; font-weight: bold; font-size: 1.4em; margin-top: 10px; } - - - -.listHorario{ +.listHorario { margin-top: 20px; width: 100%; overflow: hidden; + text-align: center; + justify-content: center; + align-items: center; } -.listHorario .headerLi{ +.listHorario .hrTop { width: 100%; overflow: hidden; border-top: 1px solid #9EA7AC; - padding-bottom: 10px; - + padding-bottom: 5px; } - -.listHorario label{ +/* Transparent borders because
doesn't allow margin */ +.listHorario hr { + padding-top: 5px; + margin-bottom: 15px; + border-bottom: 1px solid #9EA7AC; + border-left: 1px solid transparent; + border-right: 1px solid transparent; + border-top: 1px solid transparent; +} +.listHorario label { float: left; width: calc(100% / 7); text-align: center; font-weight: bold; padding: 5px 0; + color: white; } -.hoy{ +.hoy { background: #9EA7AC; - color: #fff; + border-radius: 25px 25px 0px 0px; + color: black !important; } - -.listHorario .time{ +.listHorario .time { float: left; width: calc(100% / 7); - text-align: center; - padding: 5px 0; font-size: 1.2em; overflow: hidden; - + color: white; } -.listHorario .time img{ +.listHorario .time div { + display: flex; + align-items: center; + justify-content: center; + padding-top: 5px; + padding-bottom: 5px; +} +.listHorario .time img { width: 20px; float: left; margin-right: 5px; - margin-left: 15px; - margin-top: 7px; + filter: invert(100%); + pointer-events: none; } - -.listHorario .time p{ +.listHorario .time p { float: left; - background: #8DD202; - padding: 5px; - border-radius: 7px; + background: #121212; + padding: 2px; + border-radius: 24px; + color: white; + width: 72.5px; + box-shadow: 0 1px 5px #0003,0 2px 2px #00000024,0 3px 1px -2px #0000001f; } - -.impar{ - color: rgba(163,171,38,.90); - font-weight: bold; -} - -.hide{ +.hide { opacity: 0; } -.show{ +.show { opacity: 1; } - .confirm { display: none; position: fixed; @@ -336,13 +328,14 @@ header{ width: 100%; height: 100%; color: #fff; - background: #8DD202; + background: #BBFFBB; + color: #363; } .confirm.confirmKO { - background: rgba(237,73,71); + background: #ffcdd2; + color: #A00; } - -.contConfirm{ +.contConfirm { position: fixed; margin: auto; top:0; @@ -353,13 +346,11 @@ header{ height: 170px; text-align: center; } - -.contConfirm h4{ +.contConfirm h4 { font-size: 2.5em; margin-bottom: 20px; } - -.btnconfirmar{ +.btnconfirmar { float: left; font-size: 1.2em; padding: 18px; @@ -368,110 +359,31 @@ header{ margin: 15px; } -.btnnoconfirm{ - float: left; - font-size: 1.2em; - padding: 18px; - background: rgba(237,73,71,.90); - color: #fff; - margin: 15px; +@keyframes slideIn { + 0% { + transform: translateY(-100%); + opacity: 0; + } + 100% { + transform: translateY(0); + opacity: 1; + } } - -.botonera{ - margin: auto; - width: 310px; - overflow: hidden; -} - -.loading{ - display: none; - top: 0; - left: 0; - position: fixed; - z-index: 999; - width: 100%; - height: 100%; - background: rgba(25,154,166,1); - background: -moz-linear-gradient(45deg, rgba(25,154,166,1) 0%, rgba(39,216,139,1) 100%); - background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(25,154,166,1)), color-stop(100%, rgba(39,216,139,1))); - background: -webkit-linear-gradient(45deg, rgba(25,154,166,1) 0%, rgba(39,216,139,1) 100%); - background: -o-linear-gradient(45deg, rgba(25,154,166,1) 0%, rgba(39,216,139,1) 100%); - background: -ms-linear-gradient(45deg, rgba(25,154,166,1) 0%, rgba(39,216,139,1) 100%); - background: linear-gradient(45deg, rgba(25,154,166,1) 0%, rgba(39,216,139,1) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#199aa6', endColorstr='#27d88b', GradientType=1 ); -} - - -.loadingcontent{ - position: fixed; - height: 50px; - width: 100%; - margin: auto; - top: 0; - bottom: 0; - left: 0; -} - - - -.sk-cube-grid { - width: 40px; - height: 40px; - margin: auto; -} - -.sk-cube-grid .sk-cube { - width: 33%; - height: 33%; - background-color: #fff; - float: left; - -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; - animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; -} -.sk-cube-grid .sk-cube1 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } -.sk-cube-grid .sk-cube2 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } -.sk-cube-grid .sk-cube3 { - -webkit-animation-delay: 0.4s; - animation-delay: 0.4s; } -.sk-cube-grid .sk-cube4 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } -.sk-cube-grid .sk-cube5 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } -.sk-cube-grid .sk-cube6 { - -webkit-animation-delay: 0.3s; - animation-delay: 0.3s; } -.sk-cube-grid .sk-cube7 { - -webkit-animation-delay: 0s; - animation-delay: 0s; } -.sk-cube-grid .sk-cube8 { - -webkit-animation-delay: 0.1s; - animation-delay: 0.1s; } -.sk-cube-grid .sk-cube9 { - -webkit-animation-delay: 0.2s; - animation-delay: 0.2s; } - -@-webkit-keyframes sk-cubeGridScaleDelay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); +@keyframes faceIn { + 0% { + opacity: 0; + } + 100% { + opacity: 1; } } -@keyframes sk-cubeGridScaleDelay { - 0%, 70%, 100% { - -webkit-transform: scale3D(1, 1, 1); - transform: scale3D(1, 1, 1); - } 35% { - -webkit-transform: scale3D(0, 0, 1); - transform: scale3D(0, 0, 1); - } +@font-face { + font-family: 'Poppins'; + src: url('../font/Poppins.ttf') format('truetype'); +} +@font-face { + font-family: 'Poppins'; + src: url('../font/Poppins-Bold.ttf') format('truetype'); + font-weight: bold; } \ No newline at end of file diff --git a/font/Poppins-Bold.ttf b/font/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/font/Poppins-Bold.ttf differ diff --git a/font/Poppins.ttf b/font/Poppins.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/font/Poppins.ttf differ diff --git a/img/close.svg b/img/close.svg new file mode 100644 index 0000000..d26bba6 --- /dev/null +++ b/img/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/done.svg b/img/done.svg new file mode 100644 index 0000000..62fe8fa --- /dev/null +++ b/img/done.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/favicon.ico b/img/favicon.ico new file mode 100644 index 0000000..0de7b90 Binary files /dev/null and b/img/favicon.ico differ diff --git a/img/in.png b/img/in.png deleted file mode 100644 index d9d51b1..0000000 Binary files a/img/in.png and /dev/null differ diff --git a/img/in.svg b/img/in.svg new file mode 100644 index 0000000..4d2fa41 --- /dev/null +++ b/img/in.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/logo.png b/img/logo.png deleted file mode 100644 index cd8e681..0000000 Binary files a/img/logo.png and /dev/null differ diff --git a/img/logo.svg b/img/logo.svg new file mode 100644 index 0000000..b70308d --- /dev/null +++ b/img/logo.svg @@ -0,0 +1,71 @@ + + + + + + + + diff --git a/img/middle.png b/img/middle.png deleted file mode 100644 index 63350a4..0000000 Binary files a/img/middle.png and /dev/null differ diff --git a/img/middle.svg b/img/middle.svg new file mode 100644 index 0000000..f423b4d --- /dev/null +++ b/img/middle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/out.png b/img/out.png deleted file mode 100644 index 7ffa686..0000000 Binary files a/img/out.png and /dev/null differ diff --git a/img/out.svg b/img/out.svg new file mode 100644 index 0000000..bd65760 --- /dev/null +++ b/img/out.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index 86258d7..a06904e 100644 --- a/index.html +++ b/index.html @@ -6,17 +6,18 @@ and open the template in the editor. --> - FichApp + Time Control + -
-

USUARIO

+ +

ID USUARIO

1 @@ -64,7 +65,7 @@ and open the template in the editor.
- ✗ +
@@ -72,31 +73,15 @@ and open the template in the editor. 0
-
+
- ✓ +

developed with ♥ by Verdnatura

- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/js/clockIn.js b/js/clockIn.js index 909c2bf..bb33d19 100644 --- a/js/clockIn.js +++ b/js/clockIn.js @@ -52,10 +52,10 @@ function fichar(direction) { printErrores(msg); setTimeout(function () { cerrar(); - }, 3000); + }, 2000); }else { $(".confirm").fadeIn(200); - $(".txtConfirm").append('FICHADA REGISTRADA'); + $(".txtConfirm").append('Fichada registrada correctamente'); setTimeout(function () { cerrar(); }, 1000); @@ -102,72 +102,85 @@ function printTimetable(timetable) { dated.setDate(dated.getDate() + 1); } $(".listHorario").append(''); - $(".listHorario").append('
  • '); + $(".listHorario").append('
  • '); for (var i = 0; i < timetable.length; i++) { $(".listHorario").append( '
  • ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["6daysAgo"]) + '

    ' + + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["6daysAgo"]) + '

    ' + + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["5daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["5daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["4daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["4daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["3daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["3daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["2daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["2daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["1daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["1daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    ' + - '' + - '

    ' + ifIsEmptyText(timetable[i]["0daysAgo"]) + '

    '+ + '
    ' + + '' + + '

    ' + ifIsEmptyText(timetable[i]["0daysAgo"]) + '

    '+ + '
    ' + '
    ' + '
    • ' ); - } printTotalHours(timetable); - } function printTotalHours(timetable) { - if(timetable.length>0) { + if(timetable.length > 0) { - $(".listHorario").append('
  • '); + $(".listHorario").append('
    '); $(".listHorario").append('
  • ' + secondsToHm(ifIsEmptyText(timetable[0]["6daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["5daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["4daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["3daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["2daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["1daysAgoTotal"])) - + '
    ' + secondsToHm(ifIsEmptyText(timetable[0]["0daysAgoTotal"])) - + '
    • '); + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["5daysAgoTotal"])) + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["4daysAgoTotal"])) + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["3daysAgoTotal"])) + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["2daysAgoTotal"])) + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["1daysAgoTotal"])) + + ' h
    ' + secondsToHm(ifIsEmptyText(timetable[0]["0daysAgoTotal"])) + + ' h
    '); $(".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'); + 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 '); + $(".total").text('Total: 0h'); } } @@ -189,7 +202,7 @@ function weekDays() { function printErrores(errores) { - var error =''; + var error = ''; for (var i = 0; i < errores.length; i++) { if (errores[i].error) { error += errores[i].error + "
    "; @@ -208,9 +221,9 @@ function ifIsEmpty(value) { function ifIsEmptyImage(value) { if (value.trim().length === 0) { - return "img/in.png"; + return "img/in.svg"; } else { - return "img/" + value + ".png"; + return "img/" + value + ".svg"; } } @@ -223,7 +236,6 @@ function ifIsEmptyText(value) { } function cerrar(){ - $(".loading").fadeIn(200); localStorage.removeItem("userData"); setTimeout(function () { window.location='index.html'; diff --git a/js/index.js b/js/index.js index 373da26..577cbaa 100644 --- a/js/index.js +++ b/js/index.js @@ -21,7 +21,7 @@ function setEvents() { $(".btnCancel").on("click", function () { pin = ""; - $("#txtPin").text("USUARIO"); + $("#txtPin").text("ID USUARIO"); }); $(".btnOk").on("click", login); @@ -31,12 +31,10 @@ function setEvents() { setTimeout(function () { window.location = "clockIn.html"; }, 200); - $(".loading").fadeOut(200); }); } function login() { - $(".loading").fadeIn(200); $.post({ urlPath: 'login', jsonData: [pin], @@ -46,8 +44,7 @@ function login() { window.location = "clockIn.html"; }, error: function() { - $(".loading").fadeOut(200); - $("#txtPin").text("USUARIO"); + $("#txtPin").text("ID USUARIO"); pin = ""; } }); diff --git a/js/main.js b/js/main.js index 33d9a8f..a5704d5 100644 --- a/js/main.js +++ b/js/main.js @@ -13,7 +13,7 @@ function printError(msg){ setTimeout(function() { $(".confirm").fadeOut(200); setTimeout(confirmReset, 200); - }, 1500); + }, 2300); } $.ajaxPrefilter(function(xhr) { diff --git a/package-lock.json b/package-lock.json index 8e14c92..c9acfc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,31 @@ { - "name": "es.verdnatura.worker-time-control", - "version": "1.0.1", - "lockfileVersion": 1, + "name": "worker-time-control", + "version": "1.0.2", + "lockfileVersion": 3, "requires": true, - "dependencies": { - "fastclick": { + "packages": { + "": { + "name": "worker-time-control", + "version": "1.0.2", + "license": "GPL-3.0", + "dependencies": { + "fastclick": "^1.0.6", + "jquery": "^3.7.0" + }, + "engines": { + "node": ">=14", + "npm": ">=8" + } + }, + "node_modules/fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=" }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "node_modules/jquery": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" } } } diff --git a/package.json b/package.json index c9d2ef7..65f6a57 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,19 @@ { - "name": "es.verdnatura.worker-time-control", - "version": "1.0.1", + "name": "worker-time-control", + "version": "1.0.2", "author": "Verdnatura Levante SL", - "description": "Fichador", - "displayName": "Fichador", - "main": "index.js", + "description": "Verdnatura Time Control", "license": "GPL-3.0", "repository": { "type": "git", - "url": "https://gitea.verdnatura.es/verdnatura/vn-database" + "url": "https://gitea.verdnatura.es/verdnatura/worker-time-control" }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "engines": { + "node": ">=14", + "npm": ">=8" }, "dependencies": { "fastclick": "^1.0.6", - "jquery": "^3.6.0" + "jquery": "^3.7.0" } }