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

254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melina Gutierrez
b5427c309f Merge branch 'hoursworked' of https://git.primefactorsolutions.com/PFS/pfs-intra into hoursworked 2024-11-15 07:32:25 -04:00
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
50dc006f7e Problema de routes 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
Melina Gutierrez
48e06fef1f Formulario de registro de horas trabajadas corregir formato 2024-11-15 07:25:19 -04:00
Melina Gutierrez
9d43cbbd29 Formulario de registro de horas trabajadas 2024-11-15 07:03:31 -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
Melina Gutierrez
49ad9dbcca Problema de routes 2024-11-14 20:53:17 -04:00
Melina Gutierrez
c67cdf868e Problema de routes 2024-11-14 20:38:48 -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
Melina Gutierrez
aa1f041a4f #45-Registro Semanal de Horas Trabajadas guardar solo una actividad 2024-11-14 13:24:38 -04: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
Melina Gutierrez
3f17eb780b #45-Registro Semanal de Horas Trabajadas guardar solo una actividad
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 20s
Details
2024-11-13 13:00:39 -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
3c626e3c85 Merge remote-tracking branch 'origin/hoursworked' into hoursworked
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 19s
Details 
# Conflicts:
#	src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
 2024-11-12 20:57:30 -04:00
Melina Gutierrez
e45d0d828f #45-Registro Semanal de Horas Trabajadas corregir duplicados y actividades 2024-11-12 20:55:52 -04:00
Melina Gutierrez
b94ec365c7 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-12 20:29:21 -04:00
Melina Gutierrez
e2f128c301 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-12 20:20:35 -04:00
Melina Gutierrez
ebb5454b29 #45-Registro Semanal de Horas Trabajadas corregir duplicados 2024-11-12 07:00:43 -04:00
Melina Gutierrez
dee4bcaf3b #45-Registro Semanal de Horas Trabajadas corregir duplicados
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 23s
Details
2024-11-12 07:00:06 -04:00
alex
3b0e5833f8 Merge pull request '#45-Registro Semanal de Horas Trabajadas' (#69) from hoursworked into main
All checks were successful
Builder / Build-Project (push) Successful in 2m47s
Details 
Reviewed-on: #69
 2024-11-11 19:21:21 +00: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
alex
1ab10e286e Merge pull request 'En-desarrollo' (#65) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m37s
Details 
Reviewed-on: #65
 2024-11-09 12:15:26 +00:00