f7ab9f8421
#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar calcular total general)
2024-10-31 01:16:48 -04:00
1e22223f27
Merge pull request 'En-desarrollo' ( #62 ) from En-desarrollo into main
...
Builder / Build-Project (push) Successful in 2m40s
Reviewed-on: #62
2024-10-30 20:14:57 +00:00
2f4d1ab130
adding default jwt secret
Builder / Build-Project (push) Successful in 2m37s
2024-10-30 16:10:57 -04:00
94e7432551
#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar estado del empleado)
2024-10-30 15:10:05 -04:00
83ba9f7478
Merge pull request 'Vacaciones' ( #63 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m28s
Reviewed-on: #63
2024-10-30 18:56:02 +00:00
68c94e6193
Agregar solicitud vacaciones a la bd para pruebas
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
4f6935341d
Merge pull request 'Vacaciones' ( #61 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m32s
Reviewed-on: #61
2024-10-30 18:31:55 +00:00
335e895197
Merge pull request '#10-Registro-Informacion-Profesional' ( #60 ) from #10-Registro-Informacion-Profesional into main
...
Builder / Build-Project (push) Successful in 2m38s
Reviewed-on: #60
2024-10-30 01:52:11 +00:00
Melina Gutierrez
937b1ef531
\#46 Perfil de Empleado - Registro Semanal mas reporte, falta mejorar el reporte semanal
...
PR Builder / Build-PR (pull_request) Successful in 2m35s
#46 Perfil de Empleado - Registro Semanal
\#46 Perfil de Empleado - Registro Semanal Y Mensual falta bd
\#46 Perfil de Empleado - Registro Mensual
\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas pero sin la bd
\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas
\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas
#46 Perfil de Empleado - Registro Semanal Y Mensual falta bd
2024-10-29 21:46:25 -04:00
98ed64dfda
Listado Solicitudes de Empleado - Calcular totales
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
6dfa5c0ec2
updated vaadin version
Builder / Build-Project (push) Successful in 2m36s
2024-10-27 14:43:45 -04:00
6a1d3e70c6
#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Correcciones)
2024-10-27 00:19:56 -04:00
82232d23c7
fix build
Builder / Build-Project (push) Successful in 1m28s
2024-10-23 15:25:45 -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
3ddacfc771
fix reset password view
Builder / Build-Project (push) Failing after 2m22s
2024-10-22 22:30:08 -04:00
292825d1a8
reset password views
Builder / Build-Project (push) Failing after 2m25s
2024-10-22 22:13:31 -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
623b5b0ee6
Merge pull request 'En-desarrollo' ( #59 ) from En-desarrollo into main
...
Builder / Build-Project (push) Successful in 2m29s
Reviewed-on: #59
2024-10-22 01:01:10 +00:00
6806bdc24b
Merge pull request 'Vacaciones' ( #58 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m31s
Reviewed-on: #58
2024-10-21 16:43:11 +00:00
a5e166351a
#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Refactorizacion configuracion form)
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
dac11494ea
Merge pull request 'Vacaciones' ( #57 ) from Vacaciones into En-desarrollo
...
Reviewed-on: #57
2024-10-18 17:35:12 +00:00
85dad4900c
#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado
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
...
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
...
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
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
...
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
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
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
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
...
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
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
