562 Commits

Author	SHA1	Message	Date
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	3376293d1a	Added user icon and fixed icon not updating	2022-10-06 11:54:14 +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
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Vicent Llopis	a348762153	refactor: pull request changes	2022-04-11 09:09:05 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +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	7d3f8844cc	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz	b27a7ca263	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +00:00
Vicent Llopis	133152460a	fix: translate	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	ad4c89af5f	feat(department): add hasToMistake in model	2022-03-23 14:12:47 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00
Alex Moreno	0963b66560	fix(worker_calendar): absence in holiday day	2022-03-23 13:06:17 +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	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	2022-01-10 16:08:45 +01:00
Vicent Llopis	914fca0814	fix: delete unnecessary ng-if	2022-01-04 10:28:06 +01:00
Vicent Llopis	ac833ac625	feat: add field payedHolidays	2021-12-24 11:30:28 +01:00
Vicent Llopis	e1c4f144a7	feat: add code	2021-12-23 14:57:22 +01:00
Vicent Llopis	671a35f8c9	upload branch	2021-12-23 13:11:17 +01:00
Vicent Llopis	238577ec8f	refactor: change ids by codes and add fixtures	2021-11-30 13:57:17 +01:00
Carlos Jimenez Ruiz	d760eba446	Merge branch 'dev' into 3275-worker_calendar	2021-11-30 11:40:54 +00: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
Alex Moreno	594f258232	modify js date format	2021-11-30 07:16:43 +01:00
Alex Moreno	85e3b47408	test(worker_time-control): tested url parameter timestamp	2021-11-29 15:22:16 +01:00
Alex Moreno	65053f5f28	feat(worker_time-control): add timestamp url param	2021-11-26 13:26:48 +01:00
Carlos Jimenez Ruiz	dd19ac975d	Merge branch 'dev' into 3338-worker_calendar	2021-11-22 13:18:53 +00: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
Joan Sanchez	9c5939b661	Updated styles	2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Joan Sanchez	c98730e6b9	Updated styles	2021-11-18 14:00:45 +01: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	b3a34489b0	fix(calendar): Event colors were not showing properly ... 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 ... Refs: 2389	2021-09-16 12:13:20 +02:00
Javi Gallego	cffe25d41f	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-08-18 12:38:41 +02:00
Javi Gallego	78a98cd6b7	shrink-datetime	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
Joan Sanchez	63b502b368	Updated model ACL	2021-07-19 13:01:06 +02:00
Carlos Jimenez Ruiz	ae4f1d1730	the absences are now fetched alongside the hours	2021-07-14 10:09:24 +02:00
Carlos Jimenez Ruiz	4148500c61	workers without active contract no longer set calendar and timeControl at fault	2021-06-30 14:05:16 +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	bc7c288742	Updated unit tests	2021-06-18 08:03:55 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +02:00
Joan Sanchez	59e90c2c10	Removed commented block	2021-06-14 11:58:39 +02:00
Joan Sanchez	de30a2d978	Total holidays fix	2021-06-14 08:09:53 +02:00
Joan Sanchez	a72010554c	Fixes and E2E updated	2021-06-11 10:58:00 +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
Joan Sanchez	714142f868	Merge branch 'dev' into 2908-label_value_full_text	2021-05-18 12:53:33 +00:00
Joan Sanchez	a9e33abacc	FIX: Show employee list	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
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	1fd18cae5a	QA	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
jorgebl	022d31c952	remove line break	2021-03-02 14:43:55 +01:00
jorgebl	325a7e7235	Translate note	2021-03-02 12:50:07 +01:00
jorgebl	094552e0f2	Added ellipsize and align label	2021-02-26 12:32:05 +01:00
jorgebl	1f1db53d41	Summary boss shown on descriptor	2021-02-24 16:12:44 +01:00
jorgebl	9855bd14fe	Translate Boss	2021-02-23 11:08:57 +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	84cef1949b	Image size fix	2021-02-04 18:28:58 +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
Jorge Padawan	b4899fc0ff	Fix for good practique code	2021-01-12 10:17:12 +01:00
Jorge Padawan	f45aa7937d	Added conditionals with rols to display or not the icons with link	2021-01-12 07:39:12 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Joan Sanchez	6416b0ad79	2666 - Closure invalid email notification	2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz	ec0ae8f07c	years previous to contrar error corrected	2020-12-21 13:52:37 +01:00
Joan Sanchez	6717853efb	Updated front tests	2020-12-18 18:02:41 +01:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz	e9f73c3299	worker module refactors	2020-12-16 10:32:32 +01:00