940 Commits

Author	SHA1	Message	Date
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Alex Moreno	3fb1ed9dfe	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract	2023-11-27 08:38:17 +01:00
Carlos Satorres	f9d5cad412	refs #6506 contract	2023-11-27 07:57:18 +01:00
Carlos Satorres	5d18c211a0	refs #6507 state	2023-11-24 08:40:06 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Carlos Satorres	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Carlos Satorres	7c6798c564	refs #6291 dni vn-user	2023-11-21 16:25:48 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Alex Moreno	89967b8538	fix(workerDescriptor): show account button	2023-11-15 13:16:31 +01:00
Carlos Satorres	b57106af48	refs #6291 validateTin	2023-11-14 11:13:33 +01:00
Alex Moreno	52f419d4cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-09 09:33:22 +01:00
Sergio De la torre	4258015c07	refs #5870 feat:fixModel	2023-11-09 08:04:38 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Alex Moreno	83b9ef72fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-02 08:47:44 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	55d80458cc	refs #6065 warmFix(workerTimeControl): set date	2023-10-26 14:37:42 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +02:00
Jorge Penadés	1f0a57d320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 09:03:15 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Jorge Penadés	33656e9d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 08:21:32 +02:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Jorge Penadés	52b14cf8b4	ref #6138 fix emailVerified	2023-10-19 09:51:10 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Jorge Penadés	8fe911ee0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-18 13:43:22 +02:00
Jorge Penadés	ea5597d3f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-18 13:40:02 +02:00
Alex Moreno	4300b24c14	refs #5918 refactor(worker_timeControl): simplify ng-show	2023-10-18 10:45:15 +02:00
Alex Moreno	d1cb2a1d9a	refs #5918 test: add updateWorkerTimeControlMail	2023-10-18 10:30:36 +02:00
Alex Moreno	a7b0ef1e4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-18 09:23:55 +02:00
Jorge Penadés	69a54be1a9	ref #5947 refactorWorkerCreate	2023-10-17 14:02:08 +02:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Alex Moreno	f8a510b330	refs #5918 fix(workerTimeControl): update(workerTimeControl	2023-10-04 12:31:46 +02:00
Alex Moreno	df6d10e514	refs #5918 fix(workerTimeControl): resend mail	2023-10-04 12:17:24 +02:00
Alex Moreno	45e41de9a9	refs #5918 fix(worker_time-control): isMailSended	2023-10-03 14:03:52 +02:00
Alex Moreno	21ddcb7e8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-03 11:39:44 +02:00
Jorge Penadés	2eb9a97ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-02 09:28:41 +02:00
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02:00
Jorge Penadés	5f93df26a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:09 +02:00
Alex Moreno	7b8518ff5a	Merge branch 'dev' into 6033-vnLog_userDescriptor	2023-10-02 05:04:26 +00:00
Jorge Penadés	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	18de92f9e7	refs #5134 fix: format	2023-09-28 07:51:54 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +02:00
Alex Moreno	e36f98195c	refs #6033 feat: create user-photo component for worker and user descriptor	2023-09-26 08:15:19 +02:00
Alex Moreno	7a3d3d5e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-09-25 14:14:23 +02:00
Alex Moreno	d43b70c971	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-22 14:30:28 +02:00
Alex Moreno	cf36b10763	refs #4815 feat: add serialNumber in deviceLog	2023-09-22 14:29:48 +02:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00:00
Carlos Satorres	c7f84ad6db	refs #5843 add return	2023-09-22 10:36:51 +02:00
Pablo Natek	c175bcfc97	refs #6159 rename spec	2023-09-22 09:40:37 +02:00
Pablo Natek	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Carlos Satorres	cd20a2d06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-21 07:32:19 +02:00
Pablo Natek	66e851b5ea	refs #4131 changeStateRefactor	2023-09-13 19:48:58 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +02:00
Jorge Penadés	48a6bf2969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-08 08:05:17 +02:00
Jorge Penadés	427425a750	ref #6119 simplifiy component	2023-09-07 09:50:13 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Carlos Satorres	7025326e06	Merge branch 'dev' into 6044-fixTickCalendar	2023-09-04 10:31:08 +00:00
Jorge Penadés	f46d6355dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-04 08:06:47 +02:00
Jorge Penadés	52d698b0eb	ref#6119 link fixed	2023-09-01 12:38:35 +02:00
Carlos Satorres	9b971abb55	refs #6044 class scss	2023-09-01 11:49:08 +02:00
Sergio De la torre	00201197cc	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 05:24:55 +00:00
Jorge Penadés	c2a54b8c65	ref #6119 vnLinkPhone created	2023-08-31 13:02:56 +02:00
Jorge Penadés	05f0f72c73	refs #6119 microsip link added	2023-08-30 14:14:48 +02:00
Carlos Satorres	0b9199688e	refs #5843 userFk remove and vchange	2023-08-30 12:48:57 +02:00
Vicent Llopis	00b1746fd8	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 11:32:58 +00:00
Vicent Llopis	b304210e8f	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-25 08:47:12 +00:00
Vicent Llopis	c4cf5f3a4f	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 08:04:42 +00:00
Vicent Llopis	9da5c4c1db	refs #5918 refacotr: cambiado nombre variable	2023-08-25 10:04:27 +02:00
Vicent Llopis	9a12169ba4	Merge branch 'dev' into 6013-sendMail_fix	2023-08-24 07:33:07 +00:00
Vicent Llopis	beeebbdf9c	refs #6013 refactor: siempre se crea una tranacción para cada dia	2023-08-24 09:33:58 +02:00
Vicent Llopis	1f63648697	refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana	2023-08-24 09:10:04 +02:00