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
6dfa5c0ec2
updated vaadin version
Builder / Build-Project (push) Successful in 2m36s
2024-10-27 14:43:45 -04:00
82232d23c7
fix build
Builder / Build-Project (push) Successful in 1m28s
2024-10-23 15:25:45 -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
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
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
...
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
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-09 14:44:28 +00:00
b14e7902cc
Correcciones
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
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
...
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
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
PR Builder / Build-PR (pull_request) Failing after 20s
2024-10-08 12:16:19 -04:00
Melina Gutierrez
2c18455581
Merge branch 'main' into #10-Registro-Informacion-Profesional
2024-10-08 11:57:41 -04:00
2782fcfb86
Merge pull request 'En-desarrollo' ( #27 ) from En-desarrollo into main
...
Builder / Build-Project (push) Successful in 2m31s
Reviewed-on: #27
Reviewed-by: alex <alex@primefactorsolutions.com>
2024-10-07 18:23:33 +00:00
d2357a2adf
Merge branch 'main' into En-desarrollo
PR Builder / Build-PR (pull_request) Successful in 2m29s
2024-10-04 15:18:21 -04:00
Melina Gutierrez
6316230a2a
#4 Perfil de Empleado - Detalles para formulario de Empleado
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-04 13:26:10 -04:00
Melina Gutierrez
4ae2badb7b
#4 Perfil de Empleado - Revisar campos del Formulario
2024-10-04 01:25:26 -04:00
Melina Gutierrez
592a8d18ea
Merge remote-tracking branch 'refs/remotes/origin/main' into #10-Registro-Informacion-Profesional
...
# Conflicts:
# src/main/java/com/primefactorsolutions/views/EmployeeView.java
2024-10-03 09:20:15 -04:00
2d4dbbd023
Coreccion cambios ver documento
PR Builder / Build-PR (pull_request) Successful in 2m8s
2024-10-02 16:06:59 -04:00
2f343daf89
Adding report service
Builder / Build-Project (push) Successful in 2m33s
2024-10-01 22:24:27 -04:00
