Commit Graph

458 Commits

Author SHA1 Message Date
Carlos Satorres 5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-02 08:21:14 +02:00
Carlos Satorres 04780e211d refs #5334 test front & 1/2 back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 16:03:55 +02:00
Carlos Satorres bb5247c49b refs #5334 tree
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:50 +02:00
Alex Moreno 69bf26433d fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 13:19:34 +02:00
Carlos Satorres f37c66304f refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 12:00:15 +02:00
Carlos Satorres 4c7c7f5c96 refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 11:30:28 +02:00
Carlos Satorres 0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:52:21 +02:00
Carlos Satorres 967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:46:19 +02:00
Carlos Satorres eb6953a2b6 refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:50:02 +02:00
Carlos Satorres d1a61b3e0d refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:26:49 +02:00
Carlos Satorres 489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-31 12:04:26 +02:00
Carlos Satorres e38bf4f1b3 refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:02:22 +02:00
Alex Moreno 9ebac5a3f8 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 09:40:32 +00:00
Alex Moreno f0024346a8 refs #5712 openDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 11:32:37 +02:00
Carlos Satorres 0774a94d8b refs #5334 params
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 11:24:11 +02:00
Carlos Satorres 2c3869d961 refs #5398 capital letters
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:48:09 +02:00
Carlos Satorres 0fd7f4183e refs #5334 fk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:36:39 +02:00
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 15:34:11 +02:00
Carlos Satorres 1dcaba1fdc refs #5334 department workers list
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:13:16 +02:00
Carlos Satorres 26187898e1 refs #5334 popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:02:34 +02:00
Carlos Satorres 8860c77147 refs #5334 fix descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 13:21:57 +02:00
Carlos Satorres e7d25a6cf3 refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:08:45 +02:00
Carlos Satorres e26eedb51c refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:54:14 +02:00
Vicent Llopis 4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:52:04 +02:00
Carlos Satorres cf632040e7 refs #5334 workFk, clientFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 11:48:39 +02:00
Carlos Satorres 2778858705 refs #5334 search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:27:49 +02:00
Vicent Llopis 21448a84dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-30 10:16:34 +02:00
Carlos Satorres 107d8d1edd refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:13:49 +02:00
Carlos Satorres d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:16:02 +02:00
Carlos Satorres 9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-30 08:05:17 +02:00
Carlos Satorres 2d6f0bb2ce refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 15:27:50 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 15:21:37 +02:00
Carlos Satorres f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 14:46:39 +02:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Carlos Satorres 2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:35:12 +02:00
Carlos Satorres 3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:23:34 +02:00
Carlos Satorres ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:08:37 +02:00
Carlos Satorres 07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:25:49 +02:00
Carlos Satorres f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:15:47 +02:00
Alex Moreno 0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:58:03 +02:00
Alex Moreno 2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:21:15 +02:00
Carlos Satorres 027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:47:04 +02:00
Carlos Satorres 10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:43:51 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Vicent Llopis b65ebc6af3 refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 07:09:51 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Carlos Satorres adafd7444b refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 10:04:44 +02:00
Carlos Satorres f63dd0f9a3 refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 09:05:28 +02:00
Carlos Satorres 5c9ee21cfc refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 14:00:05 +02:00
Carlos Satorres 9f9963af56 refs #5334 descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 13:10:26 +02:00
Carlos Satorres d09889b08a refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 12:12:25 +02:00
Carlos Satorres 3dcdbe0223 refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 11:41:42 +02:00
Carlos Satorres 612d0a2dfb refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 09:52:48 +02:00
Carlos Satorres fd4d04756a refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 08:54:54 +02:00
Carlos Satorres 443821b5c2 refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:59:54 +02:00
Carlos Satorres 071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:55:35 +02:00
Carlos Satorres 598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:15:33 +02:00
Carlos Satorres 87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 10:43:06 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 10:02:06 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:07:55 +00: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 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 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
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Carlos Satorres e947672c69 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 14:36:51 +00:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Vicent Llopis f461c75af1 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:06:31 +01:00
Vicent Llopis 776f7783c6 refactor code 2023-03-08 12:06:20 +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
Vicent Llopis 760690a625 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:51:21 +01:00
Joan Sanchez 3ad96b6ad7 Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 11:55:13 +01:00
Vicent Llopis a98bb59479 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 12:47:49 +01:00
Vicent Llopis 497d756af6 fix: autocompletar el switf/bic
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 13:46:18 +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 7c24b940b3 feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 14:55:18 +01:00
Vicent Llopis 3051768781 WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:50:23 +01:00
Vicent Llopis bc542d8a40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:11:12 +01:00
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 12:46:48 +01:00
Alexandre Riera 96e103d76e refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:37:17 +01:00
Alexandre Riera 7a04b0b3de refs #5287 icon added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:00:18 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:39:46 +01:00
Vicent Llopis 9b11987d75 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 14:33:38 +01:00
Vicent Llopis 9310e92223 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:44:08 +01:00
Vicent Llopis 35b47c6da2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 08:21:59 +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
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +01:00
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +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