Commit Graph

95 Commits

Author SHA1 Message Date
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Vicent Llopis beeebbdf9c refs #6013 refactor: siempre se crea una tranacción para cada dia
gitea/salix/pipeline/head Build queued... Details
2023-08-24 09:33:58 +02:00
Vicent Llopis c7c17e6e4a Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 11:18:08 +00:00
Alex Moreno 56cd94feaa refs #5843 fix(timeControl_filter): not use userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 13:26:42 +02:00
Vicent Llopis 251ed36eca refs #6013 feat: mostrar error en el mail
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 10:51:48 +02:00
Vicent Llopis 0054f2d82f refs #6013 fix: codigo no bloqueante
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 15:07:10 +02:00
Vicent Llopis 7367d1cdfe refs #6013 fix: add await
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 14:41:53 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:08:13 +02:00
Alexandre Riera 7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 08:50:53 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Vicent Llopis 186ec2ea41 fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:22:27 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Vicent Llopis 8a297469d6 refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 21b7050cfd refs #4856 otros usuarios pueden actualizar el estado 2023-04-04 09:29:40 +02:00
Vicent Llopis 862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Vicent Llopis e1bfdc3f3c eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 11:13:40 +02:00
Vicent Llopis 5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 08:14:17 +02:00
Vicent Llopis d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 11:27:48 +02:00
Vicent Llopis 79023fbfaf feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:16:53 +01:00
Vicent Llopis 0396d3707c refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:47:10 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Vicent Llopis 475bc2c255 feat: solo puede dar conforme/no confome el propio usuario 2023-02-23 14:33:16 +01:00
Vicent Llopis 05d91ed50e feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 15:12:25 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Vicent Llopis 921b5cf3fb add excluded test
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:54:36 +01:00
Vicent Llopis 92a9004d98 fix: borrada propiedad transaction cuando se hace commit 2023-01-19 08:54:26 +01:00
Vicent Llopis 38e4349e17 borrado comentario
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:25:24 +01:00
Vicent Llopis 2c995208d1 fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:23:05 +01:00
Vicent Llopis 7368b572a0 fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:05:02 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Alexandre Riera 9887f87dd3 refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Vicent Llopis e3e337c02e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 14:28:47 +01:00
Vicent Llopis 4b54cf954b refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 13:56:21 +01:00
Vicent Llopis bf782c3782 fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:09:09 +01:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Vicent Llopis 4d81991d86 delete focus test
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:46:47 +01:00