 Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
|
Sergio De la torre
|
18de92f9e7
|
refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 07:51:54 +02:00 |
|
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
 Alex Moreno
|
d43b70c971
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:30:28 +02:00 |
|
Alex Moreno
|
cf36b10763
|
refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:29:48 +02:00 |
 Carlos Satorres
|
1f1dfae7e3
|
refs #5843 changes models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 12:50:07 +02:00 |
|
Carlos Satorres
|
4918e3ccc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 14:02:53 +02:00 |
|
Sergio De la torre
|
00201197cc
|
Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 05:24:55 +00:00 |
 Vicent Llopis
|
dd1dbcbd4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 13:39:09 +02:00 |
|
Carlos Satorres
|
b1b6bd13ea
|
refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:45:41 +02:00 |
|
Sergio De la torre
|
8d0b3efa11
|
refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-14 09:39:40 +02:00 |
|
Sergio De la torre
|
a6047d257b
|
refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:45:18 +02:00 |
|
Alex Moreno
|
fd9b842e6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-08-02 13:58:40 +02:00 |
|
Alex Moreno
|
e253dd7982
|
refs #5351 fix(worker_model): remove required userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 14:39:01 +02:00 |
|
Alex Moreno
|
23308d7ae3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
|
2023-07-21 12:40:59 +02:00 |
|
Vicent Llopis
|
1d7f0e2135
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 11:42:49 +02:00 |
|
Vicent Llopis
|
bd85cf4e90
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-12 12:29:17 +02:00 |
|
Vicent Llopis
|
7030be3efa
|
fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-07 09:30:04 +02:00 |
|
Carlos Satorres
|
5000e05e05
|
refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 09:57:16 +02:00 |
|
Alex Moreno
|
4f616397a2
|
refs #5712 use dmsType readRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 15:05:39 +02:00 |
|
Carlos Satorres
|
dc10c20fe3
|
refs #5334 email validate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 07:29:58 +02:00 |
|
Carlos Satorres
|
83b096c206
|
refs #5334 fix errors
|
2023-06-30 09:40:12 +02:00 |
|
Vicent Llopis
|
011db142d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 12:49:55 +02:00 |
|
Alex Moreno
|
befa385830
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 14:30:20 +02:00 |
|
Carlos Satorres
|
07712f58e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
|
2023-06-27 13:36:51 +02:00 |
|
Alex Moreno
|
ecf742959c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-26 11:55:28 +02:00 |
|
Alex Moreno
|
18a8106461
|
refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-22 08:56:27 +02:00 |
|
Vicent Llopis
|
dd75302bbb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 13:33:09 +02:00 |
|
Alex Moreno
|
2ddf8e5de6
|
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-21 06:24:19 +00:00 |
|
Carlos Satorres
|
4537344790
|
merge
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-20 08:20:13 +02:00 |
|
Carlos Satorres
|
7f20973650
|
refs #5334 merge
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-20 08:16:36 +02:00 |
|
Carlos Satorres
|
98125f8974
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
|
2023-06-19 13:22:41 +02:00 |
|
Sergio De la torre
|
b6c8ca20ee
|
refs #5339 data
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-19 08:58:20 +02:00 |
|
Vicent Llopis
|
653c37f048
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
|
2023-06-08 13:12:59 +02:00 |
|
Vicent Llopis
|
1e759119db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
|
2023-06-08 11:13:07 +02:00 |
 Juan Ferrer
|
9a63ce86aa
|
refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 23:54:27 +02:00 |
|
Alex Moreno
|
e5ababb0a9
|
Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-07 11:49:40 +00:00 |
 Alexandre Riera
|
bfd421c188
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 06:30:43 +00:00 |
|
Carlos Satorres
|
d8f5978284
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
|
2023-06-05 08:30:12 +02:00 |
|
Vicent Llopis
|
01175a4c6c
|
quitado vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:32:34 +02:00 |
|
Vicent Llopis
|
186ec2ea41
|
fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-02 12:22:27 +02:00 |
|
Carlos Satorres
|
bb5247c49b
|
refs #5334 tree
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-01 14:19:50 +02:00 |
|
Vicent Llopis
|
a539abf3d8
|
refs #5244 feat: creado back para buscar trabjadores por name. nickname y code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 10:15:16 +02:00 |
|
Carlos Satorres
|
45085cccc8
|
refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 12:54:51 +02:00 |
|
Vicent Llopis
|
21448a84dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
|
2023-05-30 10:16:34 +02:00 |
|
Carlos Satorres
|
107d8d1edd
|
refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-30 10:13:49 +02:00 |
|
Carlos Satorres
|
d9a64211de
|
refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-30 09:16:02 +02:00 |
|
Carlos Satorres
|
2d6f0bb2ce
|
refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-29 15:27:50 +02:00 |
|
Alex Moreno
|
b60cd2539a
|
refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 15:21:37 +02:00 |
|
Alexandre Riera
|
1bb5033729
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-29 10:56:21 +00:00 |
|
Alexandre Riera
|
059467a383
|
refs #5137 sql moved to template
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-29 12:55:20 +02:00 |
|
Carlos Satorres
|
027d45bc25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-26 11:47:04 +02:00 |
|
Carlos Satorres
|
af1f92613f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:57:11 +02:00 |
|
Vicent Llopis
|
3b7b31deb1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 08:31:52 +02:00 |
|
Alexandre Riera
|
e8376c00a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-18 14:43:20 +02:00 |
|
Carlos Satorres
|
598067f757
|
refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-15 13:15:33 +02:00 |
 Pablo Natek
|
65082be077
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-12 08:28:19 +02:00 |
|
Alexandre Riera
|
ded8e0e141
|
refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-10 13:22:53 +02:00 |
|
Vicent Llopis
|
62dd64eb89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-10 11:56:50 +02:00 |
|
Alex Moreno
|
ac55dc4cc7
|
refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-28 14:17:19 +02:00 |
|
Vicent Llopis
|
d6ff61b768
|
refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 09:48:02 +02:00 |
|
Alex Moreno
|
af0523a155
|
refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 15:17:45 +02:00 |
|
Pablo Natek
|
e8ce8e42fd
|
refs #5153
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:25:22 +02:00 |
|
Juan Ferrer
|
49368a837b
|
refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 19:10:04 +02:00 |
|
Vicent Llopis
|
be8a11cafc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 09:52:28 +02:00 |
|
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
|
Alexandre Riera
|
0666163ca0
|
refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 12:33:14 +02:00 |
|
Vicent Llopis
|
58750aa065
|
refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 10:02:06 +02:00 |
 Joan Sanchez
|
5732f9a33b
|
Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-11 07:07:55 +00:00 |
|
Vicent Llopis
|
862101c4b0
|
refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-03 21:29:02 +02:00 |
|
Joan Sanchez
|
8b4c70e8ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 14:57:00 +02:00 |
|
Carlos Satorres
|
4edb2463b8
|
refs #5250 eliminacion isEnabled
|
2023-03-30 08:23:53 +02:00 |
|
Vicent Llopis
|
5a67f47305
|
refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-30 08:14:17 +02:00 |
|
Carlos Satorres
|
564165dc0f
|
refs #5250 Self.validatesPresenceOf
|
2023-03-28 10:07:14 +02:00 |
|
Carlos Satorres
|
c68c78cc5b
|
refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-24 12:11:42 +01:00 |
 Robert Ferrús
|
1d697e1ac5
|
refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-17 08:46:01 +01:00 |
|
Vicent Llopis
|
0396d3707c
|
refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-08 11:47:10 +01:00 |
|
Joan Sanchez
|
37043beb68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-03 07:44:31 +01:00 |
|
Vicent Llopis
|
3051768781
|
WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-01 14:50:23 +01:00 |
|
Alexandre Riera
|
94901d5b1f
|
refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-28 07:49:34 +01:00 |
|
Alexandre Riera
|
5d9220c5c0
|
refs #5287 locker added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 08:39:46 +01:00 |
|
Joan Sanchez
|
3076123c04
|
Updated models relation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 09:05:50 +01:00 |
|
Alex Moreno
|
a674169ddb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 08:30:30 +01:00 |
|
Alex Moreno
|
ecfad94057
|
refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-16 12:19:03 +01:00 |
|
Vicent Llopis
|
4b60aacbbe
|
refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 08:50:03 +01:00 |
|
Alex Moreno
|
09edb99a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-12 13:48:06 +01:00 |
|
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
|
Vicent Llopis
|
4b54cf954b
|
refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 13:56:21 +01:00 |
|
Vicent Llopis
|
e854fd248e
|
feat: add checkInBox
|
2022-11-23 10:08:58 +01:00 |
|
Alex Moreno
|
db3a6df23d
|
feat(worker): new worker
|
2022-11-14 15:19:16 +01:00 |
|
Alex Moreno
|
0f2c0fc490
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-11 12:48:32 +01:00 |
|
Vicent Llopis
|
11459bbd56
|
refactor: change column name
|
2022-11-08 08:46:36 +01:00 |
|
Vicent Llopis
|
ffa0ff650e
|
feat: add time control
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 12:21:14 +01:00 |
|
Vicent Llopis
|
ab739f412f
|
feat: add test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-03 15:00:55 +01:00 |
|
Vicent Llopis
|
6df74facdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-11-02 14:23:20 +01:00 |
|
Vicent Llopis
|
57564325e1
|
feat: añadidas opciones para confirmar o no confirmar el registro de horas
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:22:18 +01:00 |
|
Alex Moreno
|
84a5f3986b
|
feat(worker): createWorker refs #4658
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 13:24:35 +01:00 |
|
Vicent Llopis
|
786ba0d614
|
feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 07:34:34 +01:00 |
 Pau
|
f481cc3c97
|
Capitalizar
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-18 10:38:40 +02:00 |
|
Pau
|
1d8fb25325
|
Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 10:25:54 +02:00 |