Commit Graph

164 Commits

Author SHA1 Message Date
a02499d53f Estado de la solicitud - traducirlo al español 2024-10-31 01:34:18 -04:00
ca630ef5c6 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Tracducir a español) 2024-10-31 01:29:59 -04:00
f7ab9f8421 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar calcular total general) 2024-10-31 01:16:48 -04:00
94e7432551 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar estado del empleado) 2024-10-30 15:10:05 -04:00
68c94e6193 Agregar solicitud vacaciones a la bd para pruebas
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-30 14:55:22 -04:00
860b453138 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Correccion filtrado) 2024-10-30 14:46:51 -04:00
98ed64dfda Listado Solicitudes de Empleado - Calcular totales
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-29 15:28:20 -04:00
476884408a #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Agregar total general) 2024-10-28 19:12:24 -04:00
f0c0811f0d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Verificacion obtencion de datos) 2024-10-28 18:16:44 -04:00
7d20703a7d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Verificacion de validaciones) 2024-10-28 00:55:41 -04:00
73915b1364 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Correccion) 2024-10-27 20:05:31 -04:00
6a1d3e70c6 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Correcciones) 2024-10-27 00:19:56 -04:00
807555a2dd #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar habilitacion categoria si previa solicitud expira) 2024-10-23 15:09:36 -04:00
cb3ed95c0c #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar vacacion por antiguedad del empleado) 2024-10-23 08:02:12 -04:00
52bed61ae8 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar categoria Permiso de Salud) 2024-10-23 07:28:15 -04:00
0117915b9d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar si DaysBalance sea mayor a cero) 2024-10-22 00:20:13 -04:00
a5e166351a #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Refactorizacion configuracion form)
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-21 12:39:28 -04:00
69c61e093e #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configuara fecha manual) 2024-10-21 12:14:26 -04:00
0858566e8e #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Inactivar categoria por genero) 2024-10-20 22:49:47 -04:00
1c18cd566f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Excluir las categorias que cuenten con un registro) 2024-10-20 18:24:40 -04:00
2582c5e903 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Para seleccionar categoria requerir empleado) 2024-10-20 15:16:34 -04:00
2c30bed91f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Actualizar automaticamente fechas) 2024-10-20 15:11:24 -04:00
a37b93591f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Guardar solicitud) 2024-10-20 15:05:05 -04:00
8ab5016757 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Crear base BD vacaciones) 2024-10-19 00:01:15 -04:00
85dad4900c #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-18 13:33:47 -04:00
34940ff794 Lista de Vacaciones - Calcular totales de vacaciones 2024-10-16 21:01:18 -04:00
3b085e835b Merge pull request 'En-desarrollo' (#53) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m28s
Reviewed-on: #53
2024-10-16 01:30:59 +00:00
5a270d6795 Merge pull request '#37, #41#, 42, #43, #44 Listado General Vacaciones - Vista y Filtros' (#56) from Vacaciones into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Reviewed-on: #56
2024-10-15 19:06:19 +00:00
22963adad9 #37, #41#, 42, #43, #44 Listado General Vacaciones - Vista y Filtros
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-15 15:04:26 -04:00
7d3b63f6a8 Merge pull request 'Vacaciones' (#54) from Vacaciones into En-desarrollo
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 20s
Reviewed-on: #54
2024-10-14 21:43:44 +00:00
696481a695 Resolver conflictos entre las Ramas Vacaciones y En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-14 17:42:31 -04:00
0d9e0755b0 #49, #50 Perfil de Personal Administrativo - Ver/Editar Vacaciones del Empleado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-14 01:17:23 -04:00
81b3003d1b Modelo empleado - Unir bd Team a la bd Employee 2024-10-13 20:25:39 -04:00
602ab686f5 Vacaciones del Empleado - Refactorizar 2024-10-13 20:25:38 -04:00
62d678c407 Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-13 20:25:37 -04:00
3768a69cf4 adding user avatar and logout menu
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
2024-10-11 22:45:51 -04:00
2a47bb8d9a Merge pull request 'Listado-General-Vacaciones' (#52) from Listado-General-Vacaciones into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m30s
Reviewed-on: #52
2024-10-11 19:30:22 +00:00
0fd278ac62 Modelo empleado - Unir bd Team a la bd Employee
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-11 01:25:56 -04:00
f8f71b187c Merge branch 'main' into Listado-General-Vacaciones 2024-10-11 00:55:37 -04:00
334802e004 Vacaciones del Empleado - Refactorizar 2024-10-11 00:53:46 -04:00
f7d0e9df23 Merge branch 'Listado-General-Vacaciones' of https://git.primefactorsolutions.com/PFS/pfs-intra into Listado-General-Vacaciones 2024-10-10 18:47:23 -04:00
2a59bc4e7e Merge pull request '#37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado' (#48) from Listado-General-Vacaciones into main
All checks were successful
Builder / Build-Project (push) Successful in 2m32s
Reviewed-on: #48
2024-10-10 19:56:03 +00:00
e8e0f60c4e Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-10 13:29:14 -04:00
02c0b848af Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-09 14:44:28 +00:00
b14e7902cc Correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-08 15:38:41 -04:00
f90efef23c Merge pull request '#37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado' (#47) from Listado-General-Vacaciones into En-desarrollo
Reviewed-on: #47
2024-10-08 18:48:54 +00:00
d6dce9a4d0 #37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 19s
2024-10-08 14:47:50 -04:00
ef78cc91a8 Merge pull request '#10-Registro-Informacion-Profesional' (#38) from #10-Registro-Informacion-Profesional into main
All checks were successful
Builder / Build-Project (push) Successful in 2m29s
Reviewed-on: #38
2024-10-08 18:00:43 +00:00
Melina Gutierrez
379e822572 #46 Perfil de Empleado - Registro Semanal de Horas trabajadas
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m24s
2024-10-08 13:14:34 -04:00
Melina Gutierrez
067941e540 #46 Perfil de Empleado - Registro Semanal de Horas trabajadas
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 20s
2024-10-08 12:16:19 -04:00