 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 |
|
Bernat
|
d1dfa126c0
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 09:08:43 +01:00 |
|
Carlos Jimenez Ruiz
|
6929e3d497
|
#1889 absences() unit test fixed + refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-20 14:22:44 +01:00 |
|
Bernat
|
9743b61f63
|
delete endpoint getWorkerInfo
gitea/salix/dev Build queued...
Details
|
2019-11-19 11:51:47 +01:00 |
|
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
Carlos Jimenez Ruiz
|
7c199b5d74
|
#1852 worker.time-control
|
2019-11-18 11:00:09 +01:00 |
|
Joan Sanchez
|
c83a97d7ec
|
holidays fix #1853
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:44:11 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Joan Sanchez
|
5561ff169e
|
deprecated worker.sendMessage()
|
2019-11-14 11:21:08 +01:00 |
|
Bernat
|
dfd29ced70
|
1711 delete references
|
2019-11-13 11:04:52 +01:00 |
|
Carlos Jimenez Ruiz
|
b9be0188d8
|
manual merge
|
2019-11-05 09:05:00 +01:00 |
|
Carlos Jimenez Ruiz
|
03ab88bcd9
|
#1852 worker.time-control
|
2019-11-05 08:59:48 +01:00 |
quique
|
49b06e3472
|
send rocket chat message
gitea/salix/dev This commit looks good
Details
|
2019-10-29 12:39:25 +01:00 |
|
Joan Sanchez
|
d1e8f5fb1c
|
removed endpoints
gitea/salix/dev This commit looks good
Details
|
2019-10-23 07:18:09 +02:00 |
|
Joan Sanchez
|
b6d666d223
|
removed IOS worker-time-controls endpoints
gitea/salix/dev This commit has test failures
Details
|
2019-10-23 07:14:12 +02:00 |
|
Bernat
|
6477a1458d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-21 07:24:56 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures
Details
|
2019-10-19 01:18:25 +02:00 |
|
Bernat
|
1cedd6cbfd
|
merge
|
2019-10-18 08:38:25 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +02:00 |
|
Joan Sanchez
|
f2a05ff915
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 14:08:29 +02:00 |
|
Joan Sanchez
|
e1cea99cc0
|
insert timeControl from procedure
gitea/salix/dev This commit looks good
Details
|
2019-10-17 14:01:23 +02:00 |
|
Joan Sanchez
|
b2b76b05d8
|
css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:27:50 +02:00 |
|
Joan Sanchez
|
dadfc92ebd
|
pull from dev
|
2019-10-16 09:52:32 +02:00 |
|
Joan Sanchez
|
7aaa8f4a5e
|
refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-16 08:56:13 +02:00 |
|
Bernat
|
25bd28990a
|
Refactor #1812 refactor phone
gitea/salix/dev This commit looks good
Details
|
2019-10-15 14:44:00 +02:00 |
|
Joan Sanchez
|
3853fc7404
|
descuadre de horas #1766 rollback
gitea/salix/dev This commit looks good
Details
|
2019-10-15 08:50:11 +02:00 |
|
Bernat
|
793dd06e8d
|
merge
gitea/salix/1763-worker_time_control_add This commit looks good
Details
|
2019-10-15 07:30:23 +02:00 |
|
Joan Sanchez
|
8af7f13ac6
|
#1763 insert from procedure
gitea/salix/1763-worker_time_control_add This commit looks good
Details
|
2019-10-10 14:11:23 +02:00 |
|
Javi Gallego
|
3e71338d94
|
borra tabla temporal
gitea/salix/dev This commit looks good
Details
|
2019-10-10 12:14:21 +02:00 |
|
Joan Sanchez
|
4025c624b3
|
#15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 12:48:12 +02:00 |
|
Joan Sanchez
|
9919f9a46e
|
add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-04 07:41:24 +02:00 |
|
Joan Sanchez
|
183d770483
|
first changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-01 15:09:55 +02:00 |
|
Bernat
|
15097313a2
|
#1651 worker.json
gitea/salix/dev This commit looks good
Details
|
2019-08-27 11:12:17 +02:00 |
|
Bernat
|
098dd7b235
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-07-31 10:45:03 +02:00 |
|
Joan Sanchez
|
eccf381e56
|
contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 09:50:47 +02:00 |
|
Bernat
|
116a34d04a
|
fix test
|
2019-07-31 09:17:26 +02:00 |
|
Bernat
|
dd38a21e8d
|
Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-07-01 11:56:16 +02:00 |
|
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:03:03 +02:00 |
|
Bernat
|
682a75ac76
|
#1533 update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-06-25 14:00:55 +02:00 |
|
Joan Sanchez
|
340e7b8495
|
round worker calendar holidays #1547
gitea/salix/dev This commit has test failures
Details
|
2019-06-21 09:56:39 +02:00 |
|
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
|
Joan Sanchez
|
a9aaa3329a
|
fixed worker calendar
gitea/salix/dev This commit looks good
Details
|
2019-06-14 08:17:12 +02:00 |
|
Bernat
|
5ce33fbefd
|
Bug/Test #1515 Dump structure de production a dev
|
2019-06-11 12:25:02 +02:00 |
|
Joan Sanchez
|
43e87a1cb1
|
mege from test to dev - no structure
gitea/salix/dev This commit looks good
Details
|
2019-06-07 13:07:23 +02:00 |
|
Joan Sanchez
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
|
quique
|
a6a6ea5b06
|
WorkerTimerControl App
gitea/salix/test This commit looks good
Details
|
2019-06-03 09:41:54 +02:00 |
|
quique
|
b034333cdb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-03 09:20:35 +02:00 |
|
quique
|
8005b0a892
|
WorkerTimeControl App
|
2019-06-03 09:20:20 +02:00 |
|
Bernat
|
62fe9d760c
|
#1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good
Details
|
2019-06-03 08:01:24 +02:00 |
|
Bernat
|
97459bd7e6
|
1497
gitea/salix/test This commit looks good
Details
|
2019-05-31 11:33:28 +02:00 |
|
Joan Sanchez
|
f73b42b0be
|
accessType refactor #1460
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:35:24 +02:00 |
|
Joan Sanchez
|
183bf137f6
|
added workerTimeControl #1360
gitea/salix/dev This commit has test failures
Details
|
2019-05-17 13:27:51 +02:00 |
|
Joan Sanchez
|
69403223d8
|
fixed treeview #1374
gitea/salix/dev This commit looks good
Details
|
2019-04-29 11:49:43 +02:00 |
|
Carlos Jimenez Ruiz
|
8d5cc93ddb
|
#1359 refactor absences
|
2019-04-23 13:29:52 +02:00 |
|
Bernat
|
9a86929e3a
|
#1344 create test for worker filter
gitea/salix/dev This commit looks good
Details
|
2019-04-16 13:10:06 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Bernat
|
0d680bdaed
|
#1343 update worker filter
|
2019-04-16 07:59:29 +02:00 |
|
Joan Sanchez
|
9ce1e93da7
|
changed worker holidays length
|
2019-04-09 13:38:02 +02:00 |
|
Joan Sanchez
|
afafbdda95
|
fixed back unit test
gitea/salix/dev This commit looks good
Details
|
2019-04-03 14:04:25 +02:00 |
|
Joan Sanchez
|
e433828f7c
|
Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-03 11:55:18 +02:00 |
|
Joan Sanchez
|
892e267a16
|
fixed worker calendar total holidays #1299
gitea/salix/master This commit looks good
Details
|
2019-04-03 11:36:10 +02:00 |
|
Joan Sanchez
|
6d51ef4187
|
fixed absence test
gitea/salix/dev This commit looks good
Details
|
2019-04-01 08:56:18 +02:00 |
Bernat
|
4e1e3bdeeb
|
cau 10270 refactor fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-26 10:25:11 +01:00 |
|
Joan Sanchez
|
c5e953f922
|
worker calendar front & back unit tests #1248
gitea/salix/dev This commit looks good
Details
|
2019-03-22 12:51:44 +01:00 |
|
Joan Sanchez
|
6eaf317b5e
|
added worker calendar #1147
gitea/salix/dev This commit looks good
Details
|
2019-03-22 08:28:57 +01:00 |
|
Carlos Jimenez Ruiz
|
d7d8bff92b
|
#1196 worker.descriptor correo
|
2019-03-15 12:58:26 +01:00 |
Gerard
|
5fcb9f61ab
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-13 16:09:14 +01:00 |
|
Gerard
|
0a95f1b299
|
#1229 general search of worker searckpanel now searchs users
gitea/salix/master This commit looks good
Details
|
2019-03-13 16:08:04 +01:00 |
|
Joan Sanchez
|
92170c34d5
|
worker department #1133
gitea/salix/dev This commit has test failures
Details
|
2019-03-12 15:04:09 +01:00 |
|
Gerard
|
f6eb8315a3
|
#999 worker.index buscador
gitea/salix/test This commit looks good
Details
|
2019-03-11 08:00:49 +01:00 |
|
Carlos Jimenez Ruiz
|
1e89b6977a
|
#1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good
Details
|
2019-02-27 13:10:26 +01:00 |
|
Juan Ferrer
|
e63e4319cd
|
Worker module fixes
|
2019-02-01 09:31:01 +01:00 |
|
Bernat
|
19cfa1ab75
|
upadte structure db and models
|
2019-01-31 09:12:29 +01:00 |
|
Juan Ferrer
|
7893c784aa
|
#997 worker summary
|
2019-01-29 21:45:43 +01:00 |
|
Juan Ferrer
|
e553d63492
|
#996 worker.descriptor
|
2019-01-29 21:00:27 +01:00 |
|
Juan Ferrer
|
f47fe9c1cc
|
#998 worker.index, back tests fixed
|
2019-01-29 16:37:59 +01:00 |
|
Juan Ferrer
|
3e40c651af
|
#998 worker.index
|
2019-01-28 16:24:45 +01:00 |