Commit Graph

266 Commits

Author SHA1 Message Date
450e121374 Merge pull request 'Observaciones-vacaciones' (#83) from Observaciones-vacaciones into main
All checks were successful
Builder / Build-Project (push) Successful in 2m48s
Reviewed-on: #83
2024-11-25 02:17:50 +00:00
9aea51c8c1 fixed rebase conflicts
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m49s
2024-11-24 21:10:50 -05:00
e6c9d5c3e6 Descargar reporte de vacaciones personal en pdf. 2024-11-24 21:07:11 -05:00
caab437d17 Descargar reporte general de vacaciones en excel. 2024-11-24 21:04:18 -05:00
5fea733a7f Descontar a cero las vacaciones cuando llegue la fecha de salida 2024-11-24 20:59:59 -05:00
97a9c0ba34 Traducir modulo documentos 2024-11-24 20:56:04 -05:00
d27d71f69f No permitir solicitudes de vacaciones con anticimacion de 3 meses maximo a 15 dias minimo. 2024-11-24 20:53:53 -05:00
8177371159 No descontar dias si la solicitud de vacacion no fue aprobada. 2024-11-24 20:53:53 -05:00
9827c079dd Limitar a 10 dias maximo para tomar vacaciones por gestion 2024-11-24 20:53:53 -05:00
aebae5d550 Agregar condicion para tomar dia libre por cumpleaños 2024-11-24 20:53:53 -05:00
290c5532df Excluir sabado y domingo cuando se solicita una vacacion 2024-11-24 20:53:53 -05:00
5bcab5fd7e Remover estados de solicitud (COMPLETADO, CANCELADO, EN_REVISION) 2024-11-24 20:53:53 -05:00
b26ab28297 Merge pull request 'mejorar-detalles' (#77) from mejorar-detalles into main
All checks were successful
Builder / Build-Project (push) Successful in 2m44s
Reviewed-on: #77
2024-11-25 01:52:43 +00:00
9e53bc33d7 corregir metodo de getTeamLeadName
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m46s
2024-11-24 20:48:29 -05:00
0e142934fa fix conflicts
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m45s
2024-11-24 20:36:18 -05:00
Melina Gutierrez
7a2381c163 corregir clase de reportes 2024-11-24 20:33:07 -05:00
Melina Gutierrez
726e34ed10 corregir clase de reportes 2024-11-24 20:33:07 -05:00
Melina Gutierrez
1c54f1c595 añadir nuevos requisitos en Empleado 2024-11-24 20:33:07 -05:00
Melina Gutierrez
fc51e227a5 añadir nuevos requisitos en Empleado 2024-11-24 20:33:07 -05:00
Melina Gutierrez
09f87c2204 añadir nuevos requisitos en Empleado 2024-11-24 20:33:04 -05:00
Melina Gutierrez
da02e7dfde Empleado con las revisiones 2024-11-24 20:31:02 -05:00
Melina Gutierrez
2d6c2e4327 Empleado con las revisiones 2024-11-24 20:31:02 -05:00
Melina Gutierrez
fe84668fb3 Mejorar la visibilidad de la foto de perfil 2024-11-24 20:31:02 -05:00
1d135c9869 cambios de diseno tablas
All checks were successful
Builder / Build-Project (push) Successful in 2m40s
2024-11-24 16:51:58 -05:00
54ff167124 improve tables layout
All checks were successful
Builder / Build-Project (push) Successful in 2m44s
2024-11-17 17:15:58 -05:00
2a561a925c change list page size
All checks were successful
Builder / Build-Project (push) Successful in 2m45s
2024-11-17 16:37:57 -05:00
0695223c31 fix file upload
All checks were successful
Builder / Build-Project (push) Successful in 2m43s
2024-11-17 16:15:08 -05:00
4de84d7320 fix packages.json
All checks were successful
Builder / Build-Project (push) Successful in 2m47s
2024-11-15 11:42:46 -05:00
1857dcb5a9 Merge pull request 'registro-horas' (#76) from registro-horas into main
Some checks failed
Builder / Build-Project (push) Has been cancelled
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
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
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
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
50fd791449 add version in login page
All checks were successful
Builder / Build-Project (push) Successful in 2m47s
2024-11-14 23:15:17 -05:00
b9320a3d6a adding git version in build
All checks were successful
Builder / Build-Project (push) Successful in 2m50s
2024-11-14 22:47:11 -05:00
439eab3541 Merge pull request 'correcciones' (#73) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m46s
Reviewed-on: #73
Reviewed-by: alex <alex@primefactorsolutions.com>
2024-11-15 02:52:45 +00:00
005f0235fa correcciones vacacion gestion anterior
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m42s
2024-11-14 22:42:42 -04:00
305a5c53f3 correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
2024-11-14 22:31:29 -04:00
97b9e515bf correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
2024-11-14 22:19:43 -04:00
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
Reviewed-on: #72
Reviewed-by: alex <alex@primefactorsolutions.com>
2024-11-15 01:15:32 +00:00
ddefc54e9e solicitud vacaciones priorizar primero de gestion anterior
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
2024-11-14 20:58:17 -04:00
bdfaa7da85 Merge pull request 'En-desarrollo' (#71) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m45s
Reviewed-on: #71
2024-11-15 00:24:15 +00:00
5ba432079b Resolver errores de checkstyle
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m36s
2024-11-14 04:15:29 -04:00
1c638ff27b Lista de Solicitudes de empleado - actualizar resumen
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 24s
2024-11-14 04:09:26 -04:00
a3e94040ff correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m38s
2024-11-14 03:17:26 -04:00
b1e95cf8a5 Resolver errores de checkstyle
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m36s
2024-11-13 19:58:33 -04:00
8e1f0fdd7d Lista de Solicitudes de empleado - actualizar solicitudes permisos de salud
Some checks failed
PR Builder / Build-PR (pull_request) Failing after 22s
2024-11-13 19:54:36 -04:00
9579b33acc Lista de Solicitudes de empleado - Actualizar resumen de empleado 2024-11-13 18:34:42 -04:00