PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects 2 Releases Wiki Activity
145 Commits 11 Branches 0 Tags 36 MiB
e3d672c00b
Commit Graph

145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melina Gutierrez
e3d672c00b #46 Perfil de Empleado - Registro Semanal Y Mensual falta bd 2024-10-21 13:07:42 -04:00
Melina Gutierrez
6c1c0e5ea7 #46 Perfil de Empleado - Registro Semanal Y Mensual falta bd 2024-10-18 15:01:37 -04:00
Melina Gutierrez
2aec8ff05a #46 Perfil de Empleado - Registro Semanal Y Mensual falta bd 2024-10-17 15:44:28 -04:00
Melina Gutierrez
b19496ca15 #46 Perfil de Empleado - Registro Mensual 2024-10-16 15:26:31 -04:00
Melina Gutierrez
b4826f1720 #46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas pero sin la bd 2024-10-16 15:08:08 -04:00
alex
3b085e835b Merge pull request 'En-desarrollo' (#53) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m28s
Details 
Reviewed-on: #53
 2024-10-16 01:30:59 +00:00
jesus.pelaez
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
Details 
Reviewed-on: #56
 2024-10-15 19:06:19 +00:00
ricardo051199
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
Details
2024-10-15 15:04:26 -04:00
Melina Gutierrez
b5396ae373 #46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas 2024-10-15 10:11:14 -04:00
jesus.pelaez
7d3b63f6a8 Merge pull request 'Vacaciones' (#54) from Vacaciones into En-desarrollo
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 20s
Details 
Reviewed-on: #54
 2024-10-14 21:43:44 +00:00
ricardo051199
696481a695 Resolver conflictos entre las Ramas Vacaciones y En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
Details
2024-10-14 17:42:31 -04:00
Melina Gutierrez
3e57c50378 #46 Perfil de Empleado - Registro Semanal de Horas trabajadas 2024-10-14 12:56:02 -04:00
ricardo051199
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
Details
2024-10-14 01:17:23 -04:00
ricardo051199
81b3003d1b Modelo empleado - Unir bd Team a la bd Employee 2024-10-13 20:25:39 -04:00
ricardo051199
602ab686f5 Vacaciones del Empleado - Refactorizar 2024-10-13 20:25:38 -04:00
ricardo051199
62d678c407 Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-13 20:25:37 -04:00
Alex Prudencio
3768a69cf4 adding user avatar and logout menu
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
Details
2024-10-11 22:45:51 -04:00
jesus.pelaez
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
Details 
Reviewed-on: #52
 2024-10-11 19:30:22 +00:00
ricardo051199
0fd278ac62 Modelo empleado - Unir bd Team a la bd Employee
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
Details
2024-10-11 01:25:56 -04:00
ricardo051199
f8f71b187c Merge branch 'main' into Listado-General-Vacaciones 2024-10-11 00:55:37 -04:00
ricardo051199
334802e004 Vacaciones del Empleado - Refactorizar 2024-10-11 00:53:46 -04:00
ricardo051199
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
alex
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
Details 
Reviewed-on: #48
 2024-10-10 19:56:03 +00:00
ricardo051199
e8e0f60c4e Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-10 13:29:14 -04:00
jesus.pelaez
02c0b848af Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
Details
2024-10-09 14:44:28 +00:00
ricardo051199
b14e7902cc Correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
Details
2024-10-08 15:38:41 -04:00
jesus.pelaez
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
ricardo051199
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
Details
2024-10-08 14:47:50 -04:00
alex
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
Details 
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
Details
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
Details
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
alex
2782fcfb86 Merge pull request 'En-desarrollo' (#27) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m31s
Details 
Reviewed-on: #27
Reviewed-by: alex <alex@primefactorsolutions.com>
 2024-10-07 18:23:33 +00:00
ricardo051199
d2357a2adf Merge branch 'main' into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m29s
Details
2024-10-04 15:18:21 -04:00
Melina Gutierrez
6316230a2a #4 Perfil de Empleado - Detalles para formulario de Empleado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
Details
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
ricardo051199
2d4dbbd023 Coreccion cambios ver documento
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m8s
Details
2024-10-02 16:06:59 -04:00
Alex Prudencio
2f343daf89 Adding report service
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
Details
2024-10-01 22:24:27 -04:00
ricardo051199
78f41d59e0 Coreccion del enlace a documentos
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m4s
Details
2024-10-01 18:35:52 -04:00
ricardo051199
e77e63491a Resuelve construccion fallido
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m13s
Details
2024-10-01 17:57:26 -04:00
ricardo051199
9c94b703ca Merge branch 'En-desarrollo' of https://git.primefactorsolutions.com/PFS/pfs-intra into En-desarrollo
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 13s
Details
2024-10-01 17:39:26 -04:00
ricardo051199
88342555a0 Resuelve conflictos en Employee.java y MainLayout.java 2024-10-01 15:40:46 -04:00
jesus.pelaez
2e544519da Merge pull request 'Perfil-Empleado-Administrativo-Documentacion' (#40) from Perfil-Empleado-Administrativo-Documentacion into En-desarrollo 
Reviewed-on: #40
 2024-10-01 19:35:51 +00:00
ricardo051199
85e0e44f4f Merge branch 'Perfil-Empleado-Administrativo-Documentacion' of https://git.primefactorsolutions.com/PFS/pfs-intra into Perfil-Empleado-Administrativo-Documentacion 2024-10-01 15:32:29 -04:00
ricardo051199
dccc3ea09d #31 Perfil de Usuario Administrativo - EDITAR Documentos (Correccion validacion para editar) 2024-10-01 13:27:49 -04:00
ricardo051199
9b67ee3902 Perfil de Personal Administrativo - VER, EDITAR, AÑADIR Documento (Correccion en el el boton view document) 2024-09-30 19:28:44 -04:00
Melina Gutierrez
40aa10bc7d Merge remote-tracking branch 'origin/#10-Registro-Informacion-Profesional' into #10-Registro-Informacion-Profesional 
# Conflicts:
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java
 2024-09-30 08:43:13 -04:00
jesus.pelaez
b6a27c435e Merge pull request 'Perfil-Empleado-Administrativo-Documentacion' (#39) from Perfil-Empleado-Administrativo-Documentacion into En-desarrollo 
Reviewed-on: #39
 2024-09-27 07:31:14 +00:00
jesus.pelaez
26af5f63c7 Merge branch 'En-desarrollo' into Perfil-Empleado-Administrativo-Documentacion 2024-09-27 07:30:59 +00:00