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

189 Commits

Author SHA1 Message Date
Melina Gutierrez
30ed3f88ed Formulario de registro de horas trabajadas corregir formato 2024-11-15 07:30:48 -04:00
Melina Gutierrez
d49eee8988 Formulario de registro de horas trabajadas 2024-11-15 07:30:48 -04:00
Melina Gutierrez
e30c7c36f9 Problema de routes 2024-11-15 07:30:48 -04:00
Melina Gutierrez
923dc0b826 #45-Registro Semanal de Horas Trabajadas guardar solo una actividad 2024-11-15 07:30:48 -04:00
Melina Gutierrez
1c4e5323fe #45-Registro Semanal de Horas Trabajadas guardar solo una actividad 2024-11-15 07:30:48 -04:00
Melina Gutierrez
2133f81d26 #45-Registro Semanal de Horas Trabajadas corregir duplicados y actividades 2024-11-15 07:29:49 -04:00
Melina Gutierrez
823dc16205 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-15 07:29:49 -04:00
Melina Gutierrez
64224a2db1 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-15 07:29:49 -04:00
Melina Gutierrez
70eee311c5 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-15 07:29:49 -04:00
Alex Prudencio
50fd791449 add version in login page
All checks were successful
Builder / Build-Project (push) Successful in 2m47s
Details
2024-11-14 23:15:17 -05:00
Alex Prudencio
b9320a3d6a adding git version in build
All checks were successful
Builder / Build-Project (push) Successful in 2m50s
Details
2024-11-14 22:47:11 -05:00
alex
439eab3541 Merge pull request 'correcciones' (#73) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m46s
Details 
Reviewed-on: #73
Reviewed-by: alex <alex@primefactorsolutions.com>
 2024-11-15 02:52:45 +00:00
ricardo051199
005f0235fa correcciones vacacion gestion anterior
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m42s
Details
2024-11-14 22:42:42 -04:00
ricardo051199
305a5c53f3 correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Details
2024-11-14 22:31:29 -04:00
ricardo051199
97b9e515bf correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Details
2024-11-14 22:19:43 -04:00
alex
1c93e9c20c Merge pull request 'solicitud vacaciones priorizar primero de gestion anterior' (#72) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m44s
Details 
Reviewed-on: #72
Reviewed-by: alex <alex@primefactorsolutions.com>
 2024-11-15 01:15:32 +00:00
ricardo051199
ddefc54e9e solicitud vacaciones priorizar primero de gestion anterior
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Details
2024-11-14 20:58:17 -04:00
alex
bdfaa7da85 Merge pull request 'En-desarrollo' (#71) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m45s
Details 
Reviewed-on: #71
 2024-11-15 00:24:15 +00:00
ricardo051199
5ba432079b Resolver errores de checkstyle
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m36s
Details
2024-11-14 04:15:29 -04:00
ricardo051199
1c638ff27b Lista de Solicitudes de empleado - actualizar resumen
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 24s
Details
2024-11-14 04:09:26 -04:00
ricardo051199
a3e94040ff correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
Details
2024-11-14 03:17:26 -04:00
ricardo051199
b1e95cf8a5 Resolver errores de checkstyle
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m36s
Details
2024-11-13 19:58:33 -04:00
ricardo051199
8e1f0fdd7d Lista de Solicitudes de empleado - actualizar solicitudes permisos de salud
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 22s
Details
2024-11-13 19:54:36 -04:00
ricardo051199
9579b33acc Lista de Solicitudes de empleado - Actualizar resumen de empleado 2024-11-13 18:34:42 -04:00
ricardo051199
efca245c1d Corregir datos de prueba
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m40s
Details
2024-11-13 14:47:28 -04:00
ricardo051199
ca5fb122fb Lista de Solicitudes de empleado - Actualizar estado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m40s
Details
2024-11-13 14:10:09 -04:00
ricardo051199
6d60fd00cc Lista de Solicitudes de empleado - Refactorizar 2024-11-13 12:38:25 -04:00
ricardo051199
51a1d22be9 Lista de Solicitudes de empleado - Calcular total disponibilidad de dias 2024-11-12 21:54:28 -04:00
Melina Gutierrez
21d1313b69 #45-Registro Semanal de Horas Trabajadas corregir employee solucionar error
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m45s
Details
2024-11-11 15:00:45 -04:00
Melina Gutierrez
249a8cb1ee #45-Registro Semanal de Horas Trabajadas corregir employee
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 2m47s
Details
2024-11-09 13:03:06 -04:00
Melina Gutierrez
b58a833444 Merge remote-tracking branch 'origin/hoursworked' into hoursworked
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 21s
Details 
# Conflicts:
#	src/main/java/com/primefactorsolutions/model/Actividad.java
#	src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java
#	src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
#	src/main/java/com/primefactorsolutions/views/ReporteView.java
 2024-11-09 12:58:42 -04:00
Melina Gutierrez
ca2cd583a0 #45-Registro Semanal de Horas Trabajadas mas Reporte Excel 2024-11-09 12:43:31 -04:00
Melina Gutierrez
36287611b8 hoursworked sin reporte vista 2024-11-09 11:43:42 -04:00
Melina Gutierrez
5a0aa27382 primer commit 2024-11-09 11:42:54 -04:00
Melina Gutierrez
40d0cef2a1 hoursworked sin reporte vista 2024-11-08 08:36:22 -04:00
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
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
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
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
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
Melina Gutierrez
4561a43866 primer commit 2024-11-04 21:45:02 -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
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