387 Commits

Author	SHA1	Message	Date
Pablo Natek	410012df55	fix: refs #7187 fix div	2024-05-23 14:24:58 +02:00
Javier Segarra	e2b72f132c	Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations	2024-05-22 15:49:23 +02:00
Carlos Satorres	499e104daa	Merge branch 'dev' into fix-CalendarTimeControlRightPanel	2024-05-22 10:49:43 +00:00
Javier Segarra	d900ed3764	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 10:22:05 +02:00
Javier Segarra	f6051472ef	style: color transparent when is fetive	2024-05-22 10:21:06 +02:00
Carlos Satorres	c1bcc0379d	refs #6332 fix festive	2024-05-22 09:35:56 +02:00
Javier Segarra	eaa0288f25	update	2024-05-22 09:27:48 +02:00
Javier Segarra	a0ca26ad9b	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:56:10 +02:00
Javier Segarra	0e0f649ff9	fix: 9-12	2024-05-22 08:54:37 +02:00
Carlos Satorres	81f7e06143	refs #6332 fix calendar	2024-05-22 08:35:01 +02:00
Javier Segarra	3d6fac5338	Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods	2024-05-22 08:28:51 +02:00
Javier Segarra	2094506baf	fix: WorkerCalendarItem	2024-05-22 08:27:09 +02:00
Pablo Natek	d2d80645d0	fix: refs #7187 fix responsive	2024-05-21 19:12:40 +02:00
Carlos Satorres	27c86288e1	refs #6332 color red button	2024-05-21 16:14:55 +02:00
Carlos Satorres	bacc07a4ca	remove right	2024-05-21 12:04:56 +02:00
Carlos Satorres	99d16d215f	refs #6332 colors	2024-05-21 11:56:30 +02:00
Pablo Natek	e32e922c45	Merge branch 'dev' into 7187-refactorWokerPda	2024-05-20 23:06:07 +00:00
Pablo Natek	45f56078d7	feat: refs #7187 add vnconfirm on delete	2024-05-21 01:04:52 +02:00
Pablo Natek	9468e409ea	fix: refs #7187 fix reload	2024-05-21 00:34:03 +02:00
William Buezas	7466d03f15	resolve conflicts	2024-05-20 08:46:08 -03:00
Carlos Satorres	ce72b8099b	Merge branch 'dev' into 7396-addBasicDataWorker	2024-05-20 07:20:29 +00:00
Carlos Satorres	4199fc0dc5	refs #7396 fix basicData, summary, change deleteDepartment	2024-05-20 09:00:54 +02:00
William Buezas	202473158c	resolve conflicts	2024-05-19 14:21:32 -03:00
Carlos Satorres	d359063e5d	refs #7396 fix summary	2024-05-17 14:23:00 +02:00
Carlos Satorres	cd21d7817d	refs #7396 fix summary basicData	2024-05-17 14:16:06 +02:00
Carlos Satorres	d7e3303d68	refs #7396 add fiDueDate, machine	2024-05-17 13:19:59 +02:00
Carlos Satorres	067df2d56b	Merge branch 'dev' into 6914-fixWorkerCreateErrors	2024-05-17 11:15:25 +00:00
William Buezas	a35ccb5b51	Zone Locations	2024-05-16 16:38:27 -03:00
Carlos Satorres	660577c9fe	refs #6914 fix vnLocation workerCreate	2024-05-16 16:02:38 +02:00
Pablo Natek	a5dd7c817e	Merge branch 'dev' into 7187-refactorWokerPda	2024-05-16 12:08:51 +00:00
Pablo Natek	108533d475	fix: delete translates	2024-05-16 12:57:35 +02:00
Jorge Penadés	ed9310cbb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-16 08:58:00 +02:00
Robert Ferrús	ca5cf66f56	Merge branch 'dev' into 7039-country-country	2024-05-16 06:46:32 +00:00
Robert Ferrús	b7fce0917e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country	2024-05-16 07:29:07 +02:00
Pablo Natek	c24062fccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda	2024-05-15 22:18:40 +02:00
Pablo Natek	bc9c1fdf8e	feat: pda duplicates	2024-05-15 22:17:40 +02:00
Carlos Satorres	adde8d1ab8	refs #6332 fix colors	2024-05-15 16:00:56 +02:00
Jorge Penadés	3cb02d5e5f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings	2024-05-15 15:42:13 +02:00
Jorge Penadés	628fc888ba	fix: refs #7281 fix warnings	2024-05-15 14:31:51 +02:00
Jorge Penadés	d55dc638d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-13 15:23:37 +02:00
Jorge Penadés	ad14d2e776	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:03 +02:00
Jorge Penadés	a692ca4a18	feat: refs #5919 test & set workerFk null.	2024-05-10 16:01:32 +02:00
Jorge Penadés	7fd4c43b8b	feat: refs #5919 workerlocker	2024-05-10 13:07:58 +02:00
Jon Elias	2183385e58	Merge branch 'dev' into 6767-deleteDivCol	2024-05-10 09:39:31 +00:00
Pablo Natek	4e8f524f49	feat: add new list form with popup	2024-05-09 22:47:13 +02:00
Jorge Penadés	ac935b9020	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-09 08:48:28 +02:00
Jorge Penadés	f803a210a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-08 13:26:05 +02:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Carlos Satorres	3d3f72757a	Merge branch 'dev' into 6842-errorCalendar	2024-05-08 08:10:37 +00:00
Jorge Penadés	7504e5d12c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel	2024-05-07 16:36:34 +02:00
Jorge Penadés	5e0db81a21	fix: refs #6938 conflicts	2024-05-07 15:51:55 +02:00
Jorge Penadés	0a71060f60	fix: refs #6938 workerCard	2024-05-07 15:28:00 +02:00
Jorge Penadés	014ec60e47	feat: refs #6891 worker & supplier	2024-05-07 15:10:36 +02:00
Alex Moreno	13f8937f12	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-07 14:18:36 +02:00
Jorge Penadés	5712810ae2	fix: refs #6938 rollback phone	2024-05-07 12:00:20 +02:00
Carlos Satorres	ac0993aa11	refs #6842 pr changes	2024-05-07 10:20:26 +02:00
Robert Ferrús	24edecf51a	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:39 +00:00
Jorge Penadés	4b4c02c01a	feat: refs #6273 create worker form toggle	2024-05-03 16:40:11 +02:00
Javier Segarra	743faef956	fix: #6842 Not update calendar correctly	2024-05-03 15:05:37 +02:00
Carlos Satorres	710b45f43a	refs #6842 isFreelance	2024-05-03 14:49:50 +02:00
Jon Elias	e6dc7b9862	refactor: refs #6767 fix all conflicts	2024-04-26 09:47:44 +02:00
Robert Ferrús	92e172fcaf	feat: refs #7039 country change column country - name	2024-04-25 12:56:02 +02:00
jcasado	c6c925a105	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
jcasado	4b3df372cd	refs: #6764 fixConflicts	2024-04-25 08:49:40 +02:00
jcasado	aa58838ad7	refs: #6764 rename VnSelect	2024-04-25 08:34:40 +02:00
Jorge Penadés	d93963e2c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-24 08:48:43 +02:00
jcasado	716dd4e28f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter	2024-04-24 08:02:19 +02:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
jcasado	7f07b9780c	refs: #6764 rename VnSelectFilter	2024-04-23 13:03:32 +02:00
Jorge Penadés	f9a88ea8c2	fix: refs #6480 fix workerCard	2024-04-23 12:00:29 +02:00
Jorge Penadés	a3ce0440e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 09:53:38 +02:00
Alex Moreno	952d5bf543	fix(VnNotes): refs #6336 VnAvatar	2024-04-22 15:03:10 +02:00
Jorge Penadés	bd539449a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-19 13:33:47 +02:00
Jorge Penadés	da6e121137	refactor: refs #6480 use VnCard	2024-04-19 13:33:29 +02:00
Jorge Penadés	c3db9e17a8	fix: refs #6480 reactive summary	2024-04-19 13:30:07 +02:00
Jorge Penadés	e38b53ca25	fix: refs #6480 reactive descriptor	2024-04-19 13:12:14 +02:00
Jon Elias	3f3b37fd4a	refactor: refs #6767 fixed conflicts	2024-04-19 07:24:58 +02:00
William Buezas	b52b70041c	resolve pnpm lock conflicts and change some colors	2024-04-18 08:33:23 -03:00
Jon Elias	6839b5aac2	refactor: refs #6767 deleted <div class="col">	2024-04-17 13:26:08 +02:00
Alex Moreno	c4c317ef41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-17 10:53:18 +02:00
William Buezas	813bab4e9d	manage QCalendar customization classes from wrapper	2024-04-16 10:47:16 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -03:00
William Buezas	c82f4652f5	Move capitalize header week day to wrapper	2024-04-16 09:44:52 -03:00
William Buezas	a808491c5e	use the color of calendar background for the border of panel card	2024-04-16 09:37:31 -03:00
William Buezas	1577fb701b	remove unused span	2024-04-16 09:30:17 -03:00
William Buezas	51eba2ea77	Add calendar wrapper	2024-04-16 09:28:48 -03:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
Jorge Penadés	b2211369ea	fix: refs #6938 remove personal phone	2024-04-15 13:30:42 +02:00
Jorge Penadés	1e77e82784	fix: refs #6938 id filter	2024-04-15 13:28:10 +02:00
Jorge Penadés	68069ba9c6	feat: refs #6938 hide personal phone	2024-04-15 12:48:07 +02:00
Alex Moreno	f176312163	feat(VnNotes): refs #6336 better design	2024-04-15 12:28:43 +02:00
William Buezas	6019c7f7b2	Add remove chip button only if is manual	2024-04-12 08:41:45 -03:00
William Buezas	9283b190b0	Differentiate manual chips	2024-04-12 08:35:39 -03:00
William Buezas	c4a8127a5b	Add toggle right drawer button	2024-04-12 08:24:56 -03:00
William Buezas	0006761201	Use black background on WorkerDateLabel	2024-04-12 08:22:17 -03:00
William Buezas	3d9d444bb4	remove filter field	2024-04-12 08:11:58 -03:00
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -03:00
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03:00
William Buezas	e676933942	Update worker dms remove	2024-04-10 08:59:05 -03:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
William Buezas	e4a8c45053	Change workweeks colod and capitalize	2024-04-10 08:32:04 -03:00
William Buezas	39af4278a6	Add delete model to worker dms	2024-04-10 08:27:30 -03:00
William Buezas	e88194eb88	Update worker dms model prop	2024-04-09 16:00:12 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	9bffc9bb25	classes and size improvements	2024-04-09 15:20:29 -03:00
William Buezas	faa8d05313	Change saturday and sunday days color	2024-04-09 14:48:51 -03:00
William Buezas	c573019038	Sizes and spacings	2024-04-09 14:13:40 -03:00
William Buezas	9ea0a62046	Add border and change background color	2024-04-09 14:03:18 -03:00
William Buezas	dfcf6e35d5	Change WorkerEventLabels separations	2024-04-09 11:06:07 -03:00
William Buezas	3e5a5dfe1c	remove import	2024-04-09 10:53:07 -03:00
William Buezas	881c6e2f7f	Improve translations	2024-04-09 09:54:23 -03:00
William Buezas	fb4f35a378	Rename WorkerDateLabel and change colors	2024-04-09 09:21:35 -03:00
William Buezas	0941d74d52	Move default value assignment	2024-04-09 09:14:41 -03:00
William Buezas	196679b9e9	Change v-if variable	2024-04-09 09:07:46 -03:00
William Buezas	e4166c85fa	Move add absences text to a i18n variable	2024-04-09 09:05:15 -03:00
William Buezas	b05c28f571	Add chaining to holiday detail and holiday type	2024-04-09 08:57:39 -03:00
William Buezas	f6e140e369	Apply workerDms changes	2024-04-09 08:28:00 -03:00
William Buezas	4b6038d1d2	Last changes	2024-04-06 14:10:08 -03:00
William Buezas	52611beaf1	Changes in isHimSelf computed and FormPopup buttons order	2024-04-05 08:57:25 -03:00
William Buezas	dae08c322d	visual adjustments	2024-04-05 08:04:34 -03:00
William Buezas	78dc3c1c9a	Move data fetching to main component	2024-04-04 11:20:30 -03:00
William Buezas	fd5ea8f6f5	WIP	2024-04-04 09:27:17 -03:00
William Buezas	580af396d1	Change buttons group	2024-04-04 08:45:03 -03:00
William Buezas	503efb79c9	WIP	2024-04-04 08:39:52 -03:00
William Buezas	0f6c6cde91	Improve visually WorkerDateLabel	2024-04-03 17:32:22 -03:00
William Buezas	60b146196f	add calendar short-weekday-label	2024-04-03 13:48:41 -03:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
William Buezas	64b1083619	Add today date	2024-04-03 09:28:38 -03:00
William Buezas	bfee37b631	WIP	2024-04-03 08:08:54 -03:00
William Buezas	507c979cc2	Remove unused reactive import	2024-04-02 12:48:14 -03:00
William Buezas	3569afdb85	Update fetch-data name	2024-04-02 12:46:50 -03:00
William Buezas	71b2f7c8dc	Remove col divs	2024-04-02 12:43:32 -03:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
William Buezas	835174612c	Make value comparision not strict	2024-04-02 10:09:28 -03:00
William Buezas	026588c03d	WorkerTimeForm set initial data	2024-04-02 09:30:59 -03:00
Kevin Martinez	47a588fff4	Update WorkerCalendarItem	2024-04-02 09:00:15 -03:00
William Buezas	6bb0d30284	Move Worker Time control componente to Card folder	2024-04-01 21:19:55 -03:00
William Buezas	239daceca6	Apply changes in Worker PBX	2024-03-28 13:45:35 -03:00
William Buezas	cb238476e7	Components reubication and change calendar selected date color	2024-03-28 09:47:39 -03:00
William Buezas	1fc6eed1d5	Clean props when switching between edit and create mode in WorkerTimeForm	2024-03-28 08:31:55 -03:00
William Buezas	0d6d18b8c8	Apply VnDmsList component and add docuware action	2024-03-27 20:33:35 -03:00
Kevin Martinez	0dee7e8cc9	Create worker calendar submodule	2024-03-27 16:51:44 -03:00
William Buezas	37465ffa4a	resolve conflicts	2024-03-27 11:23:54 -03:00
carlosfonseca	8cf14929e3	Se implementa nuevo componente para la gestion de notas	2024-03-27 08:52:31 -05:00
William Buezas	b546b63352	resolve conflicts	2024-03-27 10:11:20 -03:00
William Buezas	112112b069	Small change	2024-03-27 09:13:53 -03:00
William Buezas	de912b266c	Finish calendar integration	2024-03-27 08:26:28 -03:00
carlosfonseca	081d4bf5fc	Solucion a comentarios 4	2024-03-26 23:11:41 -05:00
carlosfonseca	1d37b91e09	Solucion a comentarios 3	2024-03-26 17:17:40 -05:00
William Buezas	0a74b2a96e	QCalendar implementation WIP	2024-03-26 15:38:06 -03:00