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

252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ricardo051199
a6e9407d73 Descargar reporte de vacaciones personal en pdf.
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
Details
2024-11-23 21:16:21 -04:00
ricardo051199
2206bf2342 Descargar reporte general de vacaciones en excel. 2024-11-23 14:55:12 -04:00
ricardo051199
ebb9bc888b Descontar a cero las vacaciones cuando llegue la fecha de salida 2024-11-23 13:42:50 -04:00
ricardo051199
e72bca0d39 Traducir modulo documentos 2024-11-22 23:42:18 -04:00
ricardo051199
bf3fadbae3 No permitir solicitudes de vacaciones con anticimacion de 3 meses maximo a 15 dias minimo. 2024-11-21 18:52:08 -04:00
ricardo051199
17bd54a3f4 No descontar dias si la solicitud de vacacion no fue aprobada. 2024-11-21 18:22:46 -04:00
ricardo051199
d18f591df0 Limitar a 10 dias maximo para tomar vacaciones por gestion 2024-11-20 10:33:11 -04:00
ricardo051199
5287f40878 Agregar condicion para tomar dia libre por cumpleaños 2024-11-20 10:07:53 -04:00
ricardo051199
b55d919439 Excluir sabado y domingo cuando se solicita una vacacion 2024-11-20 09:55:58 -04:00
ricardo051199
69e378a623 Remover estados de solicitud (COMPLETADO, CANCELADO, EN_REVISION) 2024-11-20 09:15:17 -04:00
Alex Prudencio
54ff167124 improve tables layout
All checks were successful
Builder / Build-Project (push) Successful in 2m44s
Details
2024-11-17 17:15:58 -05:00
Alex Prudencio
2a561a925c change list page size
All checks were successful
Builder / Build-Project (push) Successful in 2m45s
Details
2024-11-17 16:37:57 -05:00
Alex Prudencio
0695223c31 fix file upload
All checks were successful
Builder / Build-Project (push) Successful in 2m43s
Details
2024-11-17 16:15:08 -05:00
Alex Prudencio
4de84d7320 fix packages.json
All checks were successful
Builder / Build-Project (push) Successful in 2m47s
Details
2024-11-15 11:42:46 -05:00
alex
1857dcb5a9 Merge pull request 'registro-horas' (#76) from registro-horas into main
Some checks failed
Builder / Build-Project (push) Has been cancelled
Details 
Reviewed-on: #76
Reviewed-by: alex <alex@primefactorsolutions.com>
 2024-11-15 16:40:49 +00:00
Melina Gutierrez
7b4953a3aa Añadir correcion de service y repository
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m44s
Details
2024-11-15 12:34:43 -04:00
Melina Gutierrez
03146b1b9b Añadir correcion de formato
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 2m40s
Details
2024-11-15 12:26:47 -04:00
Melina Gutierrez
e8612aa5df Añadir correcion a Employee repository y service
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 24s
Details
2024-11-15 12:18:44 -04:00
Melina Gutierrez
f46d2cac03 Añadir correcion a Employee 2024-11-15 12:08:06 -04:00
Melina Gutierrez
886a19f2cf Añadir correcion a Employee 2024-11-15 11:54:52 -04:00
Melina Gutierrez
c58b37bbaf Formulario de registro de horas trabajadas mas el formulario 2024-11-15 11:51:32 -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
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
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