309 Commits

Author	SHA1	Message	Date
Vicent Llopis	011db142d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	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	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	2023-06-26 11:55:28 +02:00
Alex Moreno	18a8106461	refs #5339 fix after save	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	2023-06-21 13:33:09 +02:00
Alex Moreno	2ddf8e5de6	Merge branch 'dev' into 5334-editDepartment	2023-06-21 06:24:19 +00:00
Carlos Satorres	4537344790	merge	2023-06-20 08:20:13 +02:00
Carlos Satorres	7f20973650	refs #5334 merge	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	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	2023-06-07 23:54:27 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	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	2023-06-02 12:32:34 +02:00
Vicent Llopis	186ec2ea41	fix sendMail: sustituido modelo Journey por BusinessSchedule	2023-06-02 12:22:27 +02:00
Carlos Satorres	bb5247c49b	refs #5334 tree	2023-06-01 14:19:50 +02:00
Vicent Llopis	a539abf3d8	refs #5244 feat: creado back para buscar trabjadores por name. nickname y code	2023-05-31 10:15:16 +02:00
Carlos Satorres	45085cccc8	refs #5334 fix search-panel	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	2023-05-30 10:13:49 +02:00
Carlos Satorres	d9a64211de	refs #5334 fix descriptor, basic-data, summary	2023-05-30 09:16:02 +02:00
Carlos Satorres	2d6f0bb2ce	refs #5334 front fix	2023-05-29 15:27:50 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02:00
Carlos Satorres	027d45bc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	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	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	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	2023-05-18 14:43:20 +02:00
Carlos Satorres	598067f757	refs #5334 routes	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	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
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +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
Juan Ferrer	49368a837b	refs #5517 Filter improved	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	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	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	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
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
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	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	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
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
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +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
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	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 ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	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	2022-11-07 12:21:14 +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	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
Vicent Llopis	3bf7efea16	feat: add phone extension and personal phone. Update bussiness phone	2022-07-27 12:16:41 +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
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
Alex Moreno	ad4c89af5f	feat(department): add hasToMistake in model	2022-03-23 14:12:47 +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	4c064f8a80	feat(worker_calendar): add restrictions to add absence and to add hours recorded	2021-11-30 09:11:23 +01:00
Joan Sanchez	63b502b368	Updated model ACL	2021-07-19 13:01:06 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +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	c853cfc86f	Refactor	2021-06-04 15:49:48 +02:00
Joan Sanchez	3fcd78e1f3	Changes	2021-06-03 11:00:40 +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	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
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Bernat Exposito	4d91b26537	checkinbox moved to worker	2020-11-20 13:35:01 +01: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 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
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
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	89dc8e27e0	update models	2020-02-04 11:20:05 +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
Bernat Exposito Domenech	0827b998a1	update structure sql	2019-12-23 15:15:58 +01:00
Joan Sanchez	f9dba9489f	updated tests	2019-11-25 09:17:24 +01:00
Joan Sanchez	5aae48c7dc	added gestdoc	2019-11-22 10:42:05 +01:00
Bernat	d1dfa126c0	#1711 Eliminar referencias al esquema vn2008	2019-11-21 09:08:43 +01:00
Bernat	9743b61f63	delete endpoint getWorkerInfo	2019-11-19 11:51:47 +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
Joan Sanchez	5561ff169e	deprecated worker.sendMessage()	2019-11-14 11:21:08 +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	b6d666d223	removed IOS worker-time-controls endpoints	2019-10-23 07:14:12 +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	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	9919f9a46e	add & remove childs	2019-10-04 07:41:24 +02:00
Bernat	15097313a2	#1651 worker.json	2019-08-27 11:12:17 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Joan Sanchez	340e7b8495	round worker calendar holidays #1547	2019-06-21 09:56:39 +02:00
quique	8005b0a892	WorkerTimeControl App	2019-06-03 09:20:20 +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
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +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