Commit Graph

209 Commits

Author SHA1 Message Date
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
90221e9105 adding ldap test server 2024-08-14 22:45:28 -04:00
dff0175e83 Adding admin views 2024-08-11 14:27:24 -04:00
0f3c01b1c1 adding checkstyle 2024-08-11 14:12:06 -04:00
3f10d6224a rename project fix 2024-08-11 13:48:33 -04:00
5d214244ec rename project 2024-08-11 13:38:25 -04:00
9f03c04b61 management model 2024-08-11 13:35:43 -04:00
e01e1701b6 adding results view 2024-08-09 19:20:58 -04:00
9fee8f8a7e fix empty results 2024-08-09 17:16:32 -04:00
8955eeb70a handle exam exceptions 2024-08-09 17:04:07 -04:00
ed9cc26831 added edit links 2024-08-08 21:34:56 -04:00
4fbb6e8914 fix aceeditor permissions 2024-08-08 19:12:02 -04:00
264d3a781a fix compile 2024-08-07 10:23:00 -04:00
162b0e7744 fix assessment link 2024-08-07 08:01:39 -04:00
d93fc9b139 changed assessment time limit 2024-08-07 07:39:48 -04:00
08544e1428 fix large fields 2024-08-06 23:43:29 -04:00
315409dd29 ddl update 2024-08-06 23:33:08 -04:00
2bc7aad65f add sql init config 2024-08-06 23:19:47 -04:00
5eb975bcf9 hide h2 pass 2024-08-06 23:03:14 -04:00
b6280d4fe5 fix h2-console 2024-08-06 23:01:45 -04:00
58490ded0f sending emails 2024-08-06 22:46:31 -04:00
cd7ea79e95 adding security 2024-08-06 22:01:50 -04:00
2aeeb016fd edit views 2024-08-06 21:41:54 -04:00
e3a071a7f1 Adding edit views 2024-08-06 08:11:28 -04:00
4fb047f9e5 fix config 2024-08-05 20:14:39 -04:00
2a227bad1b fix config 2024-08-05 20:12:10 -04:00
5eebda3e55 edit help 2024-08-05 20:00:18 -04:00
854af431ae fix db path 2024-08-05 19:42:55 -04:00
b99f287f8c fixes 2024-08-05 19:42:27 -04:00
24ec12553a fix jpa 2024-08-05 17:20:35 -04:00
1164d69b95 updated docker 2024-08-05 17:04:18 -04:00
09c7b2b626 update dockerfile 2024-08-05 15:05:20 -04:00
7366e68ea6 init impl 2024-08-05 14:49:25 -04:00
start.vaadin.com
b48e5191d7 Generated project 2024-07-25 01:14:40 +00:00