 Carlos Jimenez Ruiz
|
080975208b
|
Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-13 08:12:28 +00:00 |
 Vicent Llopis
|
a348762153
|
refactor: pull request changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-11 09:09:05 +02:00 |
 Alex Moreno
|
786b7fa84f
|
feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-11 08:02:05 +02:00 |
|
Vicent Llopis
|
443db55f58
|
feat(worker_basic-data): add new fields
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-31 09:18:18 +02:00 |
|
Carlos Jimenez Ruiz
|
74fb7c95c2
|
Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-29 08:18:13 +00:00 |
|
Vicent Llopis
|
133152460a
|
fix: translate
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 14:02:48 +01:00 |
|
Alex Moreno
|
0963b66560
|
fix(worker_calendar): absence in holiday day
gitea/salix/pipeline/head There was a failure building this commit
Details
|
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
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 16:08:45 +01:00 |
|
Vicent Llopis
|
914fca0814
|
fix: delete unnecessary ng-if
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-04 10:28:06 +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
|
e1c4f144a7
|
feat: add code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 14:57:22 +01:00 |
|
Vicent Llopis
|
671a35f8c9
|
upload branch
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-23 13:11:17 +01:00 |
|
Alex Moreno
|
594f258232
|
modify js date format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 07:16:43 +01:00 |
|
Alex Moreno
|
85e3b47408
|
test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-29 15:22:16 +01:00 |
|
Alex Moreno
|
65053f5f28
|
feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:26:48 +01:00 |
 Joan Sanchez
|
9c5939b661
|
Updated styles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 16:02:47 +01:00 |
|
Joan Sanchez
|
c98730e6b9
|
Updated styles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 14:00:45 +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
|
b3a34489b0
|
fix(calendar): Event colors were not showing properly
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3166
|
2021-10-04 09:30:55 +02:00 |
 Javi Gallego
|
3365eadf5e
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
|
2021-09-21 14:02:07 +02:00 |
|
Joan Sanchez
|
4494522ad1
|
feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good
Details
Refs: 2389
|
2021-09-16 12:13:20 +02:00 |
|
Javi Gallego
|
cffe25d41f
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-18 12:38:41 +02:00 |
|
Javi Gallego
|
78a98cd6b7
|
shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-15 08:35:14 +02:00 |
|
Carlos Jimenez Ruiz
|
1a045442d4
|
added acl to goToUser button on client and worker descriptors
|
2021-08-13 14:53:39 +02:00 |
|
Carlos Jimenez Ruiz
|
ae4f1d1730
|
the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 10:09:24 +02:00 |
|
Carlos Jimenez Ruiz
|
4148500c61
|
workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 14:05:16 +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
|
bc7c288742
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:03:55 +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
|
59e90c2c10
|
Removed commented block
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 11:58:39 +02:00 |
|
Joan Sanchez
|
a72010554c
|
Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 10:58:00 +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
|
c853cfc86f
|
Refactor
|
2021-06-04 15:49:48 +02:00 |
|
Joan Sanchez
|
3fcd78e1f3
|
Changes
|
2021-06-03 11:00:40 +02:00 |
|
Joan Sanchez
|
714142f868
|
Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 12:53:33 +00:00 |
|
Joan Sanchez
|
a9e33abacc
|
FIX: Show employee list
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 14:44:24 +02:00 |
|
Carlos Jimenez Ruiz
|
c0e2ff12da
|
moved vn-log to salix components + css changes and renamed worker-log to log
|
2021-05-18 13:22:40 +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
|
1fd18cae5a
|
QA
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 11:40:01 +01:00 |
|
jorgebl
|
cdd903dedf
|
removed line break because the app interpretate it's a space
|
2021-03-03 15:09:01 +01:00 |
|
jorgebl
|
56154181aa
|
QA done
|
2021-03-03 13:39:25 +01:00 |
|
jorgebl
|
60ca3e87a5
|
Test git
|
2021-03-02 16:53:54 +01:00 |
|
jorgebl
|
3c82a4997b
|
Test gitea
|
2021-03-02 16:52:14 +01:00 |