Commit Graph

152 Commits

Author SHA1 Message Date
Alex Moreno 798147ea99 jenkins error
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 13:25:57 +02:00
Vicent Llopis 4bdc29e283 refactor: calculate holidays through db procedures 2022-03-24 10:59:23 +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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:50:59 +01:00
Vicent Llopis 30763e5c08 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:05:53 +01:00
Vicent Llopis ac833ac625 feat: add field payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 11:30:28 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:57:17 +01:00
Vicent Llopis 21bd625b3b add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 12:31:02 +01:00
Vicent Llopis 4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 09:11:23 +01:00
Vicent Llopis abf3c1c84b Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:34:44 +01:00
Vicent Llopis cdf7c20b16 feat(worker_createAbsense): update backTest 2021-11-22 13:34:42 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Vicent Llopis 00a33fabb3 update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-17 14:38:12 +01:00
Vicent Llopis 651a925708 feat(worker_calendar): only can choose one halfHoliday by year
gitea/salix/pipeline/head This commit looks good Details
2021-11-17 14:20:26 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 10:09:42 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:49:14 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:09:44 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 14:08:44 +01:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 11:58:23 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Joan Sanchez de30a2d978 Total holidays fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 08:09:53 +02:00
Joan Sanchez 3f3e5c2735 Unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Joan Sanchez 8fa64122f8 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 14:26:34 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez dea858c314 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:12:37 +01:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:07:13 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 13:52:37 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00