728 Commits

Author	SHA1	Message	Date
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	598067f757	refs #5334 routes	2023-05-15 13:15:33 +02:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +02:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	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	2023-05-10 11:56:50 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Alex Moreno	e00edf0266	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-04-28 12:06:45 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	c62f8e1c14	refs #5297 feat(worker): iban and bankEntity not required	2023-04-26 12:13:14 +02:00
Vicent Llopis	d6ff61b768	refs #5468 corregidas condiciones de autorización	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	2023-04-25 15:17:45 +02:00
Pablo Natek	e8ce8e42fd	refs #5153	2023-04-25 14:25:22 +02:00
Alex Moreno	28ead70615	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-25 14:17:46 +02:00
Alex Moreno	0c668c6ade	refs #5488 feat(): replace all hasRole to checkAccessAcl	2023-04-25 14:17:36 +02:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Carlos Satorres	cd4f66e292	refs #5540 arreglar e2e	2023-04-24 08:48:35 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Vicent Llopis	be8a11cafc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix	2023-04-19 09:52:28 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Vicent Llopis	58750aa065	refs #5318 eliminido triggers y añadido loggable en salix	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 ... 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	8a297469d6	refs #4856 añadido myOptions	2023-04-06 10:06:29 +02:00
Vicent Llopis	041590e541	refs #4856 maneja errores y notifica a los jefes	2023-04-06 08:54:12 +02:00
Vicent Llopis	a44a640d15	refs #4856 manejo errores	2023-04-05 15:14:42 +02:00
Vicent Llopis	0db3bc5e26	refs #4856 fix test	2023-04-04 09:29:51 +02:00
Vicent Llopis	21b7050cfd	refs #4856 otros usuarios pueden actualizar el estado	2023-04-04 09:29:40 +02:00
Vicent Llopis	862101c4b0	refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador	2023-04-03 21:29:02 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Vicent Llopis	e1bfdc3f3c	eliminada variable que no se usa	2023-03-30 11:13:40 +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	2023-03-30 08:14:17 +02:00
Vicent Llopis	d066c4ea0b	refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'	2023-03-29 11:27:48 +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	2023-03-24 12:11:42 +01:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +01:00
Vicent Llopis	165dc73b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-08 12:22:29 +01:00
Vicent Llopis	79023fbfaf	feat: add backTest	2023-03-08 12:16:53 +01:00
Vicent Llopis	0396d3707c	refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front	2023-03-08 11:47:10 +01:00
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +01:00
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Alex Moreno	a74fb31b5b	fix: vn.time	2023-01-30 15:15:27 +01:00
Alex Moreno	0a096bc96f	fix: updateWorkCenter	2023-01-25 15:29:01 +01:00
Joan Sanchez	f0b44a2992	Updated back unit tests	2023-01-24 10:35:21 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00
Vicent Llopis	38e4349e17	borrado comentario	2023-01-18 14:25:24 +01:00
Vicent Llopis	2c995208d1	fix: transaccionado por trabajador y día	2023-01-18 14:23:05 +01:00
Vicent Llopis	7368b572a0	fix: añadidos await y actualizado condicional permissionRate	2023-01-18 13:05:02 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	ecfad94057	refactor(worker_new): remove roleFk and profileType	2023-01-16 12:19:03 +01:00
Vicent Llopis	4b60aacbbe	refactor: añadidos valores a piñon a la tabla workerTimeControlConfig	2023-01-12 08:50:03 +01:00
Alex Moreno	9c044dc95b	fix: phone	2023-01-04 09:38:43 +01:00
Alex Moreno	29483bcc1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-03 12:28:55 +01:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Alex Moreno	156f2b9129	feat: handle errors and autogenerate user and code	2022-12-14 15:03:55 +01:00
Alex Moreno	bb944f9fee	feat(newWorker): use worker-welcome	2022-12-12 15:05:49 +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
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Alex Moreno	f70a9cb785	feat(worker_new): use resetPassword funcionality	2022-11-23 14:46:25 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Vicent Llopis	bf782c3782	fix: añadido esquema account	2022-11-23 10:09:09 +01:00
Vicent Llopis	e854fd248e	feat: add checkInBox	2022-11-23 10:08:58 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Alex Moreno	7a7da9508f	feat: workerWelcomeEmail	2022-11-15 12:56:30 +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	4d81991d86	delete focus test	2022-11-08 08:47:08 +01:00
Vicent Llopis	8d7296cc8f	feat: add backTest	2022-11-08 08:46:47 +01:00
Vicent Llopis	11459bbd56	refactor: change column name	2022-11-08 08:46:36 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Vicent Llopis	ffa0ff650e	feat: add time control	2022-11-07 12:21:14 +01:00
Vicent Llopis	6858de83a3	feat: backTest	2022-11-04 14:55:47 +01:00
Vicent Llopis	892094f85c	feat: add backTest	2022-11-04 13:41:45 +01:00
Vicent Llopis	98cc2b5866	refactor: endpoint	2022-11-04 13:41:38 +01:00
Vicent Llopis	626355d251	fix: sustituido insert por insert ignore	2022-11-04 12:37:07 +01:00
Vicent Llopis	ab739f412f	feat: add test	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	2022-11-02 14:22:18 +01:00
Alex Moreno	84a5f3986b	feat(worker): createWorker refs #4658	2022-11-02 13:24:35 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Vicent Llopis	1f2ea2c4d8	fix: incorrect number of params	2022-10-31 13:30:08 +01:00
Vicent Llopis	273a8cd7c7	refactor code	2022-10-31 13:00:32 +01:00
Vicent Llopis	b17fe0d18c	refator code	2022-10-31 09:55:11 +01:00
Vicent Llopis	786ba0d614	feat: inserta fichadas de los teletrabajadores	2022-10-31 07:34:34 +01:00
Pau	f481cc3c97	Capitalizar	2022-10-18 10:38:40 +02:00
Pau	1d8fb25325	Refactored according to the suggested changes	2022-10-18 10:25:54 +02:00
Pau	1165e050eb	feat: workerDisableExcluded update DB field	2022-10-06 10:18:08 +02:00
Pau	600dd7a434	Created the model and UI	2022-10-05 11:52:14 +02:00
Pau	26a16bf846	ACL para sector,añadido sector al model-config	2022-09-23 13:53:33 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Carlos Andrés	918a09ad5c	#3530 Eliminar uso tabla person	2022-07-29 15:17:00 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Vicent Llopis	db7638f153	refactor: sectorFk property deleted	2022-05-23 12:45:20 +02:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Alex Moreno	798147ea99	jenkins error	2022-05-05 14:40:13 +02:00
Alex Moreno	1e3b05a95d	remove console.log	2022-05-05 13:32:34 +02:00
Alex Moreno	70aca5d11a	fix(worker): fix getMonth	2022-05-05 13:25:57 +02:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Vicent Llopis	2c54f31985	refactor: uppercase	2022-03-31 10:54:30 +02:00
Vicent Llopis	443db55f58	feat(worker_basic-data): add new fields	2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz	b27a7ca263	Merge branch 'dev' into 3637-departments_hasToMistake	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	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	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	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	2022-02-23 14:50:59 +01:00
Vicent Llopis	30763e5c08	fix: backTest	2022-02-23 09:05:53 +01:00
Vicent Llopis	13ce7991ec	refactor: uppercase in model type	2022-01-17 09:49:45 +01:00
Vicent Llopis	ac833ac625	feat: add field payedHolidays	2021-12-24 11:30:28 +01:00
Vicent Llopis	238577ec8f	refactor: change ids by codes and add fixtures	2021-11-30 13:57:17 +01:00
Vicent Llopis	21bd625b3b	add exceprion to half day absence	2021-11-30 12:31:02 +01:00
Vicent Llopis	4c064f8a80	feat(worker_calendar): add restrictions to add absence and to add hours recorded	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	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	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	2021-11-17 14:38:12 +01:00
Vicent Llopis	651a925708	feat(worker_calendar): only can choose one halfHoliday by year	2021-11-17 14:20:26 +01:00
Vicent Llopis	180fb95a00	feat(createAbsence): add backTest	2021-11-16 10:09:42 +01:00
Vicent Llopis	7efb19ab83	feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"	2021-11-15 14:49:14 +01:00
Alex Moreno	da80fee0e2	refactor(time-control): getWorkedHours.spec	2021-11-09 10:09:44 +01:00
Alex Moreno	9e4627617d	fix(time-control): modify select & refactor dates	2021-11-08 14:08:44 +01:00
Joan Sanchez	66830f32fd	feat(exportation): added exportation report & send report with client invoicing ... 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	2021-07-19 13:01:06 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Joan Sanchez	0ff114ff36	Ammends	2021-06-18 12:32:37 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +02:00
Joan Sanchez	de30a2d978	Total holidays fix	2021-06-14 08:09:53 +02:00
Joan Sanchez	3f3e5c2735	Unit tests	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	2021-06-10 11:24:32 +02:00
Joan Sanchez	3c8629b3f3	Added entilementRate effects	2021-06-08 16:36:16 +02:00
Joan Sanchez	8fa64122f8	Ammends	2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz	a46fef5295	endpoint minor refactor	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	2021-04-14 08:15:06 +00:00
Joan Sanchez	dac95805e8	2882 - Replaced worker userFk property by user id	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	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	2021-02-05 12:09:48 +01:00
Joan Sanchez	dea858c314	Removed focus	2021-02-02 10:12:37 +01:00
Joan Sanchez	a21d8acde6	2762 - Delete entry ass teamBoss	2021-02-02 10:07:13 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Joan Sanchez	dd29b351d2	Disabled loggable	2021-01-12 14:25:01 +01:00
Carlos Jimenez Ruiz	ec0ae8f07c	years previous to contrar error corrected	2020-12-21 13:52:37 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Bernat Exposito	4d91b26537	checkinbox moved to worker	2020-11-20 13:35:01 +01:00
Carlos Jimenez Ruiz	a797a2db8b	fixed the absences unit test	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	2020-10-05 14:45:39 +02:00
Joan Sanchez	d0ece57219	Updated unit test	2020-10-05 10:09:36 +02:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Joan Sanchez	58965a9687	Enabled loggable on calendar model	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	2020-08-10 14:29:25 +02:00
Joan Sanchez	87fa66fe8c	Updated methods description	2020-07-16 11:45:44 +02:00
Joan Sanchez	bbf3b72001	Added front & back tests	2020-07-16 10:04:16 +02:00
Joan Sánchez	01b32d2b89	Calendar changes	2020-07-08 15:05:56 +02:00
Joan Sánchez	dd8e03dd0f	Added absence selection	2020-07-07 14:29:57 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00
Joan Sanchez	41eeaeef0b	Entitlement rate	2020-06-19 09:58:09 +02:00
Javi Gallego	ea1cc68d29	test passed	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	2020-03-24 17:34:23 +01:00
Bernat Exposito Domenech	423f59dfb0	worker log	2020-03-24 12:20:53 +01:00
Bernat Exposito Domenech	f9abaa409a	fix calendar-holiday model	2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech	6798f9709c	update view holiday	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	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	2020-02-06 09:33:36 +01:00
Bernat Exposito Domenech	89dc8e27e0	update models	2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech	c07d5f337a	fix getWorkerdHours	2020-01-30 11:20:41 +01:00
Javi Gallego	08fda3ed1b	#workedHours	2020-01-24 12:38:08 +01:00
Joan Sanchez	3ff1fb7d2d	Added back unit tests	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	2020-01-03 08:43:03 +01:00
Joan Sanchez	7fb3f75808	changed comparator	2020-01-02 11:21:11 +01:00
Bernat Exposito Domenech	0827b998a1	update structure sql	2019-12-23 15:15:58 +01:00
Juan Ferrer	d61b08ed10	Merge branch '1922-mysql8' of verdnatura/salix into dev	2019-12-12 13:49:05 +00:00
Joan Sanchez	62aae9ce14	removed password from fixtures	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	2019-11-25 09:17:24 +01:00
Joan Sanchez	a077dd5165	test unitario	2019-11-22 14:34:20 +01:00
Joan Sanchez	3c144ea0cd	transaction changes	2019-11-22 13:46:38 +01:00
Joan Sanchez	5aae48c7dc	added gestdoc	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	2019-11-20 14:22:44 +01:00
Bernat	9743b61f63	delete endpoint getWorkerInfo	2019-11-19 11:51:47 +01:00
Bernat	12825f0503	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	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	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	2019-10-29 12:39:25 +01:00
Joan Sanchez	d1e8f5fb1c	removed endpoints	2019-10-23 07:18:09 +02:00
Joan Sanchez	b6d666d223	removed IOS worker-time-controls endpoints	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	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	2019-10-17 14:08:29 +02:00
Joan Sanchez	e1cea99cc0	insert timeControl from procedure	2019-10-17 14:01:23 +02:00
Joan Sanchez	b2b76b05d8	css fixes + back unit tests	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	2019-10-16 08:56:13 +02:00
Bernat	25bd28990a	Refactor #1812 refactor phone	2019-10-15 14:44:00 +02:00
Joan Sanchez	3853fc7404	descuadre de horas #1766 rollback	2019-10-15 08:50:11 +02:00
Bernat	793dd06e8d	merge	2019-10-15 07:30:23 +02:00
Joan Sanchez	8af7f13ac6	#1763 insert from procedure	2019-10-10 14:11:23 +02:00
Javi Gallego	3e71338d94	borra tabla temporal	2019-10-10 12:14:21 +02:00
Joan Sanchez	4025c624b3	#15 WIP fixed requested changes	2019-10-08 12:48:12 +02:00
Joan Sanchez	9919f9a46e	add & remove childs	2019-10-04 07:41:24 +02:00
Joan Sanchez	183d770483	first changes	2019-10-01 15:09:55 +02:00
Bernat	15097313a2	#1651 worker.json	2019-08-27 11:12:17 +02:00
Bernat	098dd7b235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-31 10:45:03 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	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	2019-07-01 11:56:16 +02:00
Bernat	e945967762	Refactor #1563 fixtures item,sale,saleComponent	2019-06-27 09:03:03 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Joan Sanchez	340e7b8495	round worker calendar holidays #1547	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	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	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	2019-06-03 09:41:54 +02:00
quique	b034333cdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	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	2019-06-03 08:01:24 +02:00
Bernat	97459bd7e6	1497	2019-05-31 11:33:28 +02:00
Joan Sanchez	f73b42b0be	accessType refactor #1460	2019-05-22 12:35:24 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Joan Sanchez	69403223d8	fixed treeview #1374	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	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	2019-04-03 14:04:25 +02:00
Joan Sanchez	e433828f7c	Merge branch 'master' into dev	2019-04-03 11:55:18 +02:00
Joan Sanchez	892e267a16	fixed worker calendar total holidays #1299	2019-04-03 11:36:10 +02:00
Joan Sanchez	6d51ef4187	fixed absence test	2019-04-01 08:56:18 +02:00
Bernat	4e1e3bdeeb	cau 10270 refactor fixtures and fix test	2019-03-26 10:25:11 +01:00
Joan Sanchez	c5e953f922	worker calendar front & back unit tests #1248	2019-03-22 12:51:44 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	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	2019-03-13 16:09:14 +01:00
Gerard	0a95f1b299	#1229 general search of worker searckpanel now searchs users	2019-03-13 16:08:04 +01:00
Joan Sanchez	92170c34d5	worker department #1133	2019-03-12 15:04:09 +01:00
Gerard	f6eb8315a3	#999 worker.index buscador	2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz	1e89b6977a	#1070 Renombrar columnas de la vista vn.worker	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