 Carlos Jimenez Ruiz
|
b27a7ca263
|
Merge branch 'dev' into 3637-departments_hasToMistake
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-29 08:19:01 +00: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
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 14:12:47 +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
|
13ce7991ec
|
refactor: uppercase in model type
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-17 09:49:45 +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 |
|
Joan Sanchez
|
63b502b368
|
Updated model ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 13:01:06 +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 |
jorgebl
|
1f1db53d41
|
Summary boss shown on descriptor
|
2021-02-24 16:12:44 +01:00 |
|
jorgebl
|
8deb11d333
|
Added boss on basic data and summary
|
2021-02-19 17:45:45 +01: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 |
|
Joan Sanchez
|
f5f4c5936d
|
2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-01 09:29:47 +01:00 |
|
Joan Sanchez
|
dd29b351d2
|
Disabled loggable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 14:25:01 +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 |
|
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
 Bernat Exposito
|
4d91b26537
|
checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 13:35:01 +01:00 |
Carlos Jimenez Ruiz
|
a797a2db8b
|
fixed the absences unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-23 13:34:57 +02:00 |
|
Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +02:00 |
|
Joan Sanchez
|
71e29e747a
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 14:45:39 +02:00 |
|
Joan Sanchez
|
d0ece57219
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 10:09:36 +02:00 |
|
Joan Sanchez
|
420dfdbdff
|
Send notification by email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-02 12:23:48 +02:00 |
|
Joan Sanchez
|
58965a9687
|
Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-30 07:38:43 +02:00 |
Bernat Exposito Domenech
|
06f03c6b84
|
mail models and fix checkInbox
|
2020-09-22 13:59:00 +02:00 |
|
Joan Sanchez
|
e2c742c893
|
#2383 - Changed model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-10 14:29:25 +02:00 |
|
Joan Sanchez
|
87fa66fe8c
|
Updated methods description
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 11:45:44 +02:00 |
|
Joan Sanchez
|
bbf3b72001
|
Added front & back tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 10:04:16 +02:00 |
Joan Sánchez
|
01b32d2b89
|
Calendar changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-08 15:05:56 +02:00 |
|
Joan Sánchez
|
dd8e03dd0f
|
Added absence selection
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-07 14:29:57 +02:00 |
 Javi Gallego
|
039eec7d26
|
test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-30 10:16:22 +02:00 |
|
Javi Gallego
|
db06626675
|
refactor
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-29 14:26:27 +02:00 |
|
Joan Sanchez
|
41eeaeef0b
|
Entitlement rate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-19 09:58:09 +02:00 |
|
Javi Gallego
|
ea1cc68d29
|
test passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-03 17:52:47 +02:00 |
|
Javi Gallego
|
0b966cbb76
|
Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia
|
2020-04-03 08:28:49 +02:00 |
|
Javi Gallego
|
0561f19313
|
version 1
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-24 17:34:23 +01:00 |
|
Bernat Exposito Domenech
|
423f59dfb0
|
worker log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-24 12:20:53 +01:00 |
|
Bernat Exposito Domenech
|
f9abaa409a
|
fix calendar-holiday model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-13 13:10:04 +01:00 |
|
Bernat Exposito Domenech
|
6798f9709c
|
update view holiday
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-12 10:59:41 +01:00 |
|
Carlos Jimenez Ruiz
|
0f7ed5bbfa
|
get worked hours unit test
|
2020-03-03 15:14:28 +01:00 |
|
Joan Sanchez
|
28553a1c0d
|
Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-02 07:50:07 +01:00 |
|
Joan Sanchez
|
a8eea3d8f6
|
Changed primary key
|
2020-02-28 08:19:37 +01:00 |
|
Joan Sanchez
|
442541d0f8
|
Renamed rgb column
|
2020-02-28 07:24:36 +01:00 |
|
Bernat Exposito Domenech
|
7bb5b19398
|
refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good
Details
|
2020-02-06 09:33:36 +01:00 |
|
Bernat Exposito Domenech
|
89dc8e27e0
|
update models
gitea/salix/2040_view_holiday This commit looks good
Details
|
2020-02-04 11:20:05 +01:00 |
|
Bernat Exposito Domenech
|
c07d5f337a
|
fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good
Details
|
2020-01-30 11:20:41 +01:00 |
|
Javi Gallego
|
08fda3ed1b
|
#workedHours
gitea/salix/%232037-worked-hours This commit looks good
Details
|
2020-01-24 12:38:08 +01:00 |
|
Joan Sanchez
|
3ff1fb7d2d
|
Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good
Details
|
2020-01-20 11:59:15 +01:00 |
|
Bernat Exposito Domenech
|
0fe0596b3e
|
worker phone refactor
|
2020-01-20 11:03:40 +01:00 |
|
Joan Sanchez
|
8a36e0913f
|
changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good
Details
|
2020-01-03 08:43:03 +01:00 |
|
Joan Sanchez
|
7fb3f75808
|
changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good
Details
|
2020-01-02 11:21:11 +01:00 |
|
Bernat Exposito Domenech
|
0827b998a1
|
update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good
Details
|
2019-12-23 15:15:58 +01:00 |
 Juan Ferrer
|
d61b08ed10
|
Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-12 13:49:05 +00:00 |
|
Joan Sanchez
|
62aae9ce14
|
removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good
Details
|
2019-12-12 09:46:29 +01:00 |
|
Juan Ferrer
|
3428dfa6e0
|
Migration complete & test
|
2019-12-11 15:01:01 +01:00 |
|
Joan Sanchez
|
f9dba9489f
|
updated tests
gitea/salix/1762-worker_dms This commit looks good
Details
|
2019-11-25 09:17:24 +01:00 |
|
Joan Sanchez
|
a077dd5165
|
test unitario
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 14:34:20 +01:00 |
|
Joan Sanchez
|
3c144ea0cd
|
transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 13:46:38 +01:00 |
|
Joan Sanchez
|
5aae48c7dc
|
added gestdoc
gitea/salix/1762-worker_dms There was a failure building this commit
Details
|
2019-11-22 10:42:05 +01:00 |
|
Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |