Commit Graph

79 Commits

Author SHA1 Message Date
Alex Moreno 3fb1ed9dfe Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract 2023-11-27 08:38:17 +01:00
Carlos Satorres f9d5cad412 refs #6506 contract 2023-11-27 07:57:18 +01:00
Carlos Satorres 8a568f180a refs #6506 fix e2e, refactor business 2023-11-24 07:47:57 +01:00
Carlos Satorres ebe467f721 refs #6506 hotfix 2023-11-24 07:04:55 +01:00
Carlos Satorres 9b971abb55 refs #6044 class scss 2023-09-01 11:49:08 +02:00
Vicent Llopis 6980392ba1 fix: tabulacion 2023-07-14 13:11:09 +02:00
Vicent Llopis 5716acaa3c fix: test 2023-07-14 13:01:31 +02:00
Vicent Llopis 4a7cfe9122 fix: workCenter 2023-07-14 11:51:15 +02:00
Vicent Llopis 7030be3efa fix 2023-07-07 09:30:04 +02:00
Vicent Llopis d272121258 refs 5688 fix: e2e 2023-06-22 14:52:42 +02:00
Vicent Llopis 5f4b62f133 refs #5688 fix: test front 2023-06-22 09:48:14 +02:00
Vicent Llopis 473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter 2023-06-22 08:04:17 +02:00
Vicent Llopis b7b6f413ba refs #5688 feat: no mostrar datos si no tiene workerCenterFk 2023-06-15 14:15:22 +02:00
Vicent Llopis 6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto 2023-06-13 07:34:41 +02:00
Vicent Llopis 4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar 2023-05-30 11:52:04 +02:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas 2023-02-21 15:16:28 +01:00
Alex Moreno e27a559416 refactor: replace all Date 2023-01-16 15:18:24 +01:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar 2022-03-29 08:18:13 +00:00
Vicent Llopis 133152460a fix: translate 2022-03-28 14:14:41 +02:00
Vicent Llopis 4bdc29e283 refactor: calculate holidays through db procedures 2022-03-24 10:59:23 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures 2022-03-23 14:02:48 +01:00
Alex Moreno 0963b66560 fix(worker_calendar): absence in holiday day 2022-03-23 13:06:17 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 914fca0814 fix: delete unnecessary ng-if 2022-01-04 10:28:06 +01:00
Vicent Llopis ac833ac625 feat: add field payedHolidays 2021-12-24 11:30:28 +01:00
Vicent Llopis e1c4f144a7 feat: add code 2021-12-23 14:57:22 +01:00
Vicent Llopis 671a35f8c9 upload branch 2021-12-23 13:11:17 +01:00
Joan Sanchez 9c5939b661 Updated styles 2021-11-18 16:02:47 +01:00
Joan Sanchez c98730e6b9 Updated styles 2021-11-18 14:00:45 +01:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
Refs: 3166
2021-10-04 09:30:55 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
Refs: 2389
2021-09-16 12:13:20 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault 2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests 2021-06-23 13:24:23 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction 2021-06-17 15:09:04 +02:00
Joan Sanchez 59e90c2c10 Removed commented block 2021-06-14 11:58:39 +02:00
Joan Sanchez a72010554c Fixes and E2E updated 2021-06-11 10:58:00 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor 2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects 2021-06-08 16:36:16 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected 2020-12-21 13:52:37 +01:00
Joan Sanchez d2dbf417f4 Updated to standard color 2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests 2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors 2020-09-24 10:14:53 +02:00
Joan Sanchez 03a0a22526 Updated unit test 2020-09-07 08:53:47 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name 2020-09-07 07:59:27 +02:00
Joan Sanchez a3d3ed4aba Fixed unit test 2020-08-18 14:14:34 +02:00
Joan Sanchez 540d5e9e71 Fixed errors 2020-08-18 13:50:08 +02:00
Joan Sanchez b50b30c792 Updated unit test 2020-08-11 12:16:19 +02:00
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +02:00