En-desarrollo #65

Merged

alex merged 29 commits from En-desarrollo into main

2024-11-09 12:15:26 +00:00

Author	SHA1	Message	Date
ricardo051199	3922220439	Resolver errores de checkstyle All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m33s Details	2024-11-07 18:53:47 -04:00
ricardo051199	6024b3fdd0	Resolved merge conflict in RequestsListView.java Some checks failed PR Builder / Build-PR (pull_request) Failing after 17s Details	2024-11-07 18:45:01 -04:00
ricardo051199	5e37cbbcd0	Perfil de Personal Administrativo - Listado Vacaciones de empleado (Calcular automadicamente dias de las vacaciones gestion actual y anterior)	2024-11-07 18:40:34 -04:00
ricardo051199	f7e7dea7cb	#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Calcular automadicamente dias de las vacaciones gestion actual y anterior) Some checks failed PR Builder / Build-PR (pull_request) Failing after 21s Details	2024-11-07 18:31:05 -04:00
ricardo051199	cb34868b9c	Descarte funcionalidad generar automaticamente solicitud vacacion All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m42s Details	2024-11-07 15:42:42 -04:00
ricardo051199	d3fdb128b7	Merge branch 'En-desarrollo' of https://git.primefactorsolutions.com/PFS/pfs-intra into En-desarrollo All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m37s Details	2024-11-07 02:18:18 -04:00
jesus.pelaez	91aad85146	#5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Refactorizacion generar solicitudes vacaciones)	2024-11-07 02:17:27 -04:00
jesus.pelaez	9a29f91994	Merge pull request '#5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Asignar o actualizar vacaciones)' (#68 ) from Vacaciones into En-desarrollo Some checks failed PR Builder / Build-PR (pull_request) Failing after 19s Details Reviewed-on: #68	2024-11-06 18:56:16 +00:00
ricardo051199	ed88936683	Resolviendo conflictos y finalizando fusión entre ramas Vacaciones y En-desarrollo All checks were successful PR Builder / Build-PR (pull_request) Successful in 0s Details	2024-11-06 14:55:53 -04:00
ricardo051199	a0bd00fba4	#5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Asignar o actualizar vacaciones) All checks were successful PR Builder / Build-PR (pull_request) Successful in 0s Details	2024-11-06 14:49:02 -04:00
jesus.pelaez	81acc686e6	Merge pull request 'Correccion registro solicitud vacaciones actual y anterior' (#67 ) from Vacaciones into En-desarrollo Some checks failed PR Builder / Build-PR (pull_request) Failing after 19s Details Reviewed-on: #67	2024-11-05 18:59:37 +00:00
ricardo051199	9fdf1c08b5	Correccion registro solicitud vacaciones actual y anterior All checks were successful PR Builder / Build-PR (pull_request) Successful in 0s Details	2024-11-05 14:58:28 -04:00
jesus.pelaez	4f128fd02e	Merge pull request 'Vacaciones' (#66 ) from Vacaciones into En-desarrollo Some checks failed PR Builder / Build-PR (pull_request) Failing after 22s Details Reviewed-on: #66	2024-11-05 18:32:42 +00:00
ricardo051199	88e80a7dcc	traducir a español y cambiar uso de grid a paging grid de RequestEmploye All checks were successful PR Builder / Build-PR (pull_request) Successful in 1s Details	2024-11-05 13:33:00 -04:00
ricardo051199	7e415ae837	cambiar team string a un team class	2024-11-05 10:47:16 -04:00
ricardo051199	2b6400fe24	Merge branch 'En-desarrollo' of https://git.primefactorsolutions.com/PFS/pfs-intra into En-desarrollo All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m35s Details	2024-11-04 00:49:43 -04:00
ricardo051199	4615febec3	Actualizar BD - Actualizar el estado de los registros de solicitudes de vacaciones	2024-11-04 00:48:59 -04:00
jesus.pelaez	9d87493f7d	Merge pull request 'Vacaciones' (#64 ) from Vacaciones into En-desarrollo All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m27s Details Reviewed-on: #64	2024-11-04 04:25:22 +00:00
ricardo051199	eb6183df19	Correcciones All checks were successful PR Builder / Build-PR (pull_request) Successful in 0s Details	2024-11-04 00:24:34 -04:00
ricardo051199	45bf76c3d8	Actualizar BD - Actualizar el estado de los registros de solicitudes de vacaciones	2024-11-04 00:19:12 -04:00
ricardo051199	cfd5599d32	#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (No aceptar fechas pasadas)	2024-11-03 23:40:13 -04:00
ricardo051199	4421c6fe45	#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (correcciones)	2024-11-03 23:22:09 -04:00
ricardo051199	71cb2d67c9	Perfil de Personal Administrativo - Listado solicitudes pendientes de Vacaciones	2024-11-02 00:51:21 -04:00
ricardo051199	3efa8c73d5	Traducir a epañol las sentencias de incercion de datos	2024-11-01 13:42:23 -04:00
ricardo051199	c0cc1e86de	Categoria vacaciones - traducirlo al español	2024-10-31 01:42:33 -04:00
ricardo051199	a02499d53f	Estado de la solicitud - traducirlo al español	2024-10-31 01:34:18 -04:00
ricardo051199	ca630ef5c6	#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Tracducir a español)	2024-10-31 01:29:59 -04:00
ricardo051199	f7ab9f8421	#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar calcular total general)	2024-10-31 01:16:48 -04:00
ricardo051199	94e7432551	#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar estado del empleado)	2024-10-30 15:10:05 -04:00

En-desarrollo #65

29 Commits