Commit Graph

183 Commits

Author SHA1 Message Date
a02499d53f Estado de la solicitud - traducirlo al español 2024-10-31 01:34:18 -04:00
ca630ef5c6 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Tracducir a español) 2024-10-31 01:29:59 -04:00
f7ab9f8421 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar calcular total general) 2024-10-31 01:16:48 -04:00
1e22223f27 Merge pull request 'En-desarrollo' (#62) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m40s
Reviewed-on: #62
2024-10-30 20:14:57 +00:00
2f4d1ab130 adding default jwt secret
All checks were successful
Builder / Build-Project (push) Successful in 2m37s
2024-10-30 16:10:57 -04:00
94e7432551 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Modificar estado del empleado) 2024-10-30 15:10:05 -04:00
68c94e6193 Agregar solicitud vacaciones a la bd para pruebas
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-30 14:55:22 -04:00
860b453138 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Correccion filtrado) 2024-10-30 14:46:51 -04:00
Melina Gutierrez
937b1ef531 \#46 Perfil de Empleado - Registro Semanal mas reporte, falta mejorar el reporte semanal
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m35s
#46 Perfil de Empleado - Registro Semanal

\#46 Perfil de Empleado - Registro Semanal Y Mensual falta bd

\#46 Perfil de Empleado - Registro Mensual

\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas pero sin la bd

\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas con el numero de semanas

\#46 Perfil de Empleado - Registro Semanal de Horas trabajadas

#46 Perfil de Empleado - Registro Semanal Y Mensual falta bd
2024-10-29 21:46:25 -04:00
98ed64dfda Listado Solicitudes de Empleado - Calcular totales
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-29 15:28:20 -04:00
476884408a #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Agregar total general) 2024-10-28 19:12:24 -04:00
f0c0811f0d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Verificacion obtencion de datos) 2024-10-28 18:16:44 -04:00
7d20703a7d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Verificacion de validaciones) 2024-10-28 00:55:41 -04:00
73915b1364 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Correccion) 2024-10-27 20:05:31 -04:00
6dfa5c0ec2 updated vaadin version
All checks were successful
Builder / Build-Project (push) Successful in 2m36s
2024-10-27 14:43:45 -04:00
6a1d3e70c6 #37 Perfil de Personal Administrativo - Listado General de Vacaciones (Correcciones) 2024-10-27 00:19:56 -04:00
82232d23c7 fix build
All checks were successful
Builder / Build-Project (push) Successful in 1m28s
2024-10-23 15:25:45 -04:00
807555a2dd #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar habilitacion categoria si previa solicitud expira) 2024-10-23 15:09:36 -04:00
cb3ed95c0c #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar vacacion por antiguedad del empleado) 2024-10-23 08:02:12 -04:00
52bed61ae8 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar categoria Permiso de Salud) 2024-10-23 07:28:15 -04:00
3ddacfc771 fix reset password view
Some checks failed
Builder / Build-Project (push) Failing after 2m22s
2024-10-22 22:30:08 -04:00
292825d1a8 reset password views
Some checks failed
Builder / Build-Project (push) Failing after 2m25s
2024-10-22 22:13:31 -04:00
0117915b9d #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configurar si DaysBalance sea mayor a cero) 2024-10-22 00:20:13 -04:00
a5e166351a #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Refactorizacion configuracion form)
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-21 12:39:28 -04:00
69c61e093e #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Configuara fecha manual) 2024-10-21 12:14:26 -04:00
0858566e8e #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Inactivar categoria por genero) 2024-10-20 22:49:47 -04:00
1c18cd566f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Excluir las categorias que cuenten con un registro) 2024-10-20 18:24:40 -04:00
2582c5e903 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Para seleccionar categoria requerir empleado) 2024-10-20 15:16:34 -04:00
2c30bed91f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Actualizar automaticamente fechas) 2024-10-20 15:11:24 -04:00
a37b93591f #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Guardar solicitud) 2024-10-20 15:05:05 -04:00
8ab5016757 #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (Crear base BD vacaciones) 2024-10-19 00:01:15 -04:00
85dad4900c #55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 0s
2024-10-18 13:33:47 -04:00
34940ff794 Lista de Vacaciones - Calcular totales de vacaciones 2024-10-16 21:01:18 -04:00
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
2024-10-15 15:04:26 -04:00
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
2024-10-14 01:17:23 -04:00
81b3003d1b Modelo empleado - Unir bd Team a la bd Employee 2024-10-13 20:25:39 -04:00
602ab686f5 Vacaciones del Empleado - Refactorizar 2024-10-13 20:25:38 -04:00
62d678c407 Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-13 20:25:37 -04:00
3768a69cf4 adding user avatar and logout menu
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
2024-10-11 22:45:51 -04:00
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
Reviewed-on: #48
2024-10-10 19:56:03 +00:00
02c0b848af Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-09 14:44:28 +00:00
b14e7902cc Correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
2024-10-08 15:38:41 -04:00
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
2024-10-08 14:47:50 -04: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
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
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
d2357a2adf Merge branch 'main' into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m29s
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
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
2d4dbbd023 Coreccion cambios ver documento
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m8s
2024-10-02 16:06:59 -04:00
2f343daf89 Adding report service
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
2024-10-01 22:24:27 -04:00
78f41d59e0 Coreccion del enlace a documentos
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m4s
2024-10-01 18:35:52 -04:00
e77e63491a Resuelve construccion fallido
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m13s
2024-10-01 17:57:26 -04:00
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
2024-10-01 17:39:26 -04:00
88342555a0 Resuelve conflictos en Employee.java y MainLayout.java 2024-10-01 15:40:46 -04:00
dccc3ea09d #31 Perfil de Usuario Administrativo - EDITAR Documentos (Correccion validacion para editar) 2024-10-01 13:27:49 -04:00
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
6d9a2f65e5 #32 Perfil de Personal Administrativo - VER Documento (agregar boton ver documento) 2024-09-27 03:29:26 -04:00
1519d82993 #29 Perfil de Empleado Administrativo - LISTAR Documentos (filtar por tipo de documento y empleado) 2024-09-27 00:07:27 -04:00
25448fff44 fix readonly fields
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m16s
2024-09-26 22:08:51 -04:00
831f9ec9a5 merge conflicts 2024-09-26 22:08:51 -04:00
b4c27f8a9b merged conflicts 2024-09-26 22:08:51 -04:00
a7d1c08f90 Crear views para el modulo de documentos 2024-09-26 22:08:51 -04:00
4241e7b52b #29 Perfil de Empleado Administrativo - LISTAR Documentos (correccion download, view, edit) 2024-09-25 18:50:59 -04:00
f0b41743c7 #30 Perfil de Usuario Administrativo - Añadir NUEVO Documento (agregar creador del registro del doc) 2024-09-24 20:44:16 -04:00
af3f13773b #29 Perfil de Empleado Administrativo - LISTAR Documentos (implementacion de download) 2024-09-24 19:26:18 -04:00
f3bda474d0 #32 Perfil de Personal Administrativo - VER Documento 2024-09-24 19:07:58 -04:00
45987ccad9 #29 Perfil de Empleado Administrativo - LISTAR Documentos (correccionse) 2024-09-24 17:25:43 -04:00
514e4eaf49 #29 Perfil de Empleado Administrativo - LISTAR Documentos 2024-09-24 17:07:53 -04:00
2caa878c07 #30 Perfil de Usuario Administrativo - Añadir NUEVO Documento 2024-09-24 12:30:03 -04:00
16a9a91790 fix tests
All checks were successful
Builder / Build-Project (push) Successful in 2m11s
2024-09-23 22:37:32 -04:00
e349503fb4 Change menu 2024-09-23 13:50:27 -04:00
613221dfb6 Refactorizacion del modulo de documentos 2024-09-19 00:56:44 -04:00
23e633cc5f remove println 2024-09-18 10:28:54 -04:00
451242bea4 custom userdetails implementation 2024-09-18 10:27:49 -04:00
13c81de48c Correcciones 2024-09-16 20:09:16 -04:00
f2a1d53e4a #19 Perfil de Personal Administrativo - Cargar Documentación de Gobierno (Ver, cargar y guardar) 2024-09-15 18:13:11 -04:00
109ddde243 #18 Perfil de Personal Administrativo - Carga de Documentación Corporativa (Ver, cargar y guardar) 2024-09-15 17:52:43 -04:00
0744e16dea #21 Perfil de Personal Administrativo - Carga de Documentación Profesional (Ver, cargar y guardar) 2024-09-15 03:22:18 -04:00
ca307e2c0b #20 Perfil de Personal Administrativo - Carga de Documentación Personal (Ver, cargar y guardar) 2024-09-15 03:09:38 -04:00
443299453b #17 Perfil de Personal Administrativo - Carga de Documentación Laboral (Revisiòn) 2024-09-15 02:47:52 -04:00
97c07a4558 #17 Perfil de Personal Administrativo - Carga de Documentación Laboral (Ver documento) 2024-09-15 02:25:38 -04:00
64d62a06db #17 Perfil de Personal Administrativo - Carga de Documentación Laboral (Funcionalidades save y upload v2) 2024-09-14 15:33:33 -04:00
5bbdb5f2ee #17 Perfil de Personal Administrativo - Carga de Documentación Laboral (Funcionalidades save y upload) 2024-09-14 15:30:51 -04:00
1887214ed2 #17 Perfil de Personal Administrativo - Carga de Documentación Laboral (VISTA) 2024-09-11 15:27:09 -04:00
842f90f7aa Crear views para el modulo de documentos 2024-09-10 13:02:08 -04:00
1f429221d4 ldap employee updates 2024-09-08 10:10:01 -04:00
ccb3629409 #4-Registro-de-Información-Personal (#16)
Co-authored-by: ricardo051199 <jesus.pelaez@primefactorsolutions.com>
Co-authored-by: Melina Gutierrez <melina.gutierrez@ucb.edu.bo>
Reviewed-on: #16
Co-authored-by: melina.gutierrez <melina.gutierrez@primefactorsolutions.com>
Co-committed-by: melina.gutierrez <melina.gutierrez@primefactorsolutions.com>
2024-09-08 13:08:41 +00:00
c91e4ea1a5 #4-Registrar-empleado (#15)
Reviewed-on: #15
Reviewed-by: alex <alex@primefactorsolutions.com>
Co-authored-by: ricardo051199 <jesus.pelaez@primefactorsolutions.com>
Co-committed-by: ricardo051199 <jesus.pelaez@primefactorsolutions.com>
2024-09-06 00:59:20 +00:00
3320a4e99d Rama-Ricardo (#14)
Funcionalidades: Navegacion entre paginas con los botones previous-next, ordenar ascendente-descendente
Reviewed-on: #14
Reviewed-by: alex <alex@primefactorsolutions.com>
Co-authored-by: ricardo051199 <jesus.pelaez@primefactorsolutions.com>
Co-committed-by: ricardo051199 <jesus.pelaez@primefactorsolutions.com>
2024-09-04 17:53:01 +00:00
0f63ee58a2 #7 Perfil de Personal Administrativo - Listado de empleados (CORRECCIONES v2) 2024-08-27 11:13:11 -04:00
6fe875d062 #7 Perfil de Personal Administrativo - Listado de empleados (CORRECCIONES) 2024-08-27 09:41:06 -04:00
ba57c7a5a9 Merge branch 'Rama-Ricardo' of https://git.primefactorsolutions.com/PFS/pfs-intra into Rama-Ricardo 2024-08-23 21:54:50 -04:00
cde58ad1c3 #4 Perfil de Empleado - Redireccionamiento formulario 2024-08-23 21:54:00 -04:00
c0e770bf75 Actualizar src/main/resources/data.sql 2024-08-23 00:52:00 +00:00
d751833c18 #7 Perfil de Personal Administrativo - Listado de empleados 2024-08-22 20:37:39 -04:00
80e731f163 Adding employee classes 2024-08-19 15:49:51 -04:00
ce5aee5087 fix checkstyle error 2024-08-18 13:14:12 -04:00
78c06c6c29 adding unit tests 2024-08-15 23:38:58 -04:00