Commit Graph

435 Commits

Author SHA1 Message Date
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis 020990dadc fix: backTest 2022-08-04 09:53:22 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person 2022-07-29 15:17:00 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2022-05-24 08:45:37 +02:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted 2022-05-23 12:45:20 +02:00
Vicent Llopis a043c5d346 refactor: request changes 2022-05-20 13:10:48 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models 2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention 2022-05-16 10:19:43 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types 2022-05-12 09:47:47 +02:00
Alex Moreno 798147ea99 jenkins error 2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log 2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth 2022-05-05 13:25:57 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models 2022-04-27 14:17:41 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup 2022-04-13 08:12:28 +00:00
Vicent Llopis a348762153 refactor: pull request changes 2022-04-11 09:09:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup 2022-04-11 08:02:05 +02:00
Vicent Llopis 2c54f31985 refactor: uppercase 2022-03-31 10:54:30 +02:00
Vicent Llopis 443db55f58 feat(worker_basic-data): add new fields 2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz 7d3f8844cc Merge branch 'dev' into 3637-departments_hasToMistake 2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz b27a7ca263 Merge branch 'dev' into 3637-departments_hasToMistake 2022-03-29 08:19:01 +00: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 ad4c89af5f feat(department): add hasToMistake in model 2022-03-23 14:12:47 +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
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Vicent Llopis 6a91fe6c11 solved backTest 2022-03-10 14:43:07 +01:00
Alex Moreno c8a512db4e unnecessary 2022-03-08 15:16:36 +01:00
Vicent Llopis 87daac03ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 13:06:38 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:31:27 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Alex Moreno c33b8fbb83 refactor(worker): absences return one or all abscences 2022-02-23 14:50:59 +01:00
Vicent Llopis 30763e5c08 fix: backTest 2022-02-23 09:05:53 +01:00
Vicent Llopis 13ce7991ec refactor: uppercase in model type 2022-01-17 09:49:45 +01:00
Vicent Llopis e850fdaf4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays 2022-01-12 12:15:32 +01:00
Carlos Jimenez Ruiz 7b5e6e8a23 added shorcuts for order, monitor and worker modules 2022-01-10 16:08:45 +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
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures 2021-11-30 13:57:17 +01:00
Carlos Jimenez Ruiz d760eba446 Merge branch 'dev' into 3275-worker_calendar 2021-11-30 11:40:54 +00:00
Vicent Llopis 21bd625b3b add exceprion to half day absence 2021-11-30 12:31:02 +01:00
Vicent Llopis 4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded 2021-11-30 09:11:23 +01:00
Alex Moreno 594f258232 modify js date format 2021-11-30 07:16:43 +01:00
Alex Moreno 85e3b47408 test(worker_time-control): tested url parameter timestamp 2021-11-29 15:22:16 +01:00
Alex Moreno 65053f5f28 feat(worker_time-control): add timestamp url param 2021-11-26 13:26:48 +01:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 2021-11-22 13:18:53 +00:00