PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects 2 Releases Wiki Activity
174 Commits 11 Branches 0 Tags 36 MiB
9fdf1c08b5
Commit Graph

174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ricardo051199
f7d0e9df23 Merge branch 'Listado-General-Vacaciones' of https://git.primefactorsolutions.com/PFS/pfs-intra into Listado-General-Vacaciones 2024-10-10 18:47:23 -04:00
alex
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
Details 
Reviewed-on: #48
 2024-10-10 19:56:03 +00:00
ricardo051199
e8e0f60c4e Vacaciones del Empleado - Filtrar por categoria y estado 2024-10-10 13:29:14 -04:00
jesus.pelaez
02c0b848af Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
Details
2024-10-09 14:44:28 +00:00
ricardo051199
b14e7902cc Correcciones
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m27s
Details
2024-10-08 15:38:41 -04:00
jesus.pelaez
f90efef23c Merge pull request '#37, #41, #42, #43, #44 Perfil de Personal Administrativo - Listado General de Vacaciones y Filtrado' (#47) from Listado-General-Vacaciones into En-desarrollo 
Reviewed-on: #47
 2024-10-08 18:48:54 +00:00
ricardo051199
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
Details
2024-10-08 14:47:50 -04:00
alex
ef78cc91a8 Merge pull request '#10-Registro-Informacion-Profesional' (#38) from #10-Registro-Informacion-Profesional into main
All checks were successful
Builder / Build-Project (push) Successful in 2m29s
Details 
Reviewed-on: #38
 2024-10-08 18:00:43 +00: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
Details
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
Details
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
alex
2782fcfb86 Merge pull request 'En-desarrollo' (#27) from En-desarrollo into main
All checks were successful
Builder / Build-Project (push) Successful in 2m31s
Details 
Reviewed-on: #27
Reviewed-by: alex <alex@primefactorsolutions.com>
 2024-10-07 18:23:33 +00:00
ricardo051199
d2357a2adf Merge branch 'main' into En-desarrollo
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m29s
Details
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
Details
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
ricardo051199
2d4dbbd023 Coreccion cambios ver documento
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m8s
Details
2024-10-02 16:06:59 -04:00
Alex Prudencio
2f343daf89 Adding report service
All checks were successful
Builder / Build-Project (push) Successful in 2m33s
Details
2024-10-01 22:24:27 -04:00
ricardo051199
78f41d59e0 Coreccion del enlace a documentos
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m4s
Details
2024-10-01 18:35:52 -04:00
ricardo051199
e77e63491a Resuelve construccion fallido
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m13s
Details
2024-10-01 17:57:26 -04:00
ricardo051199
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
Details
2024-10-01 17:39:26 -04:00
ricardo051199
88342555a0 Resuelve conflictos en Employee.java y MainLayout.java 2024-10-01 15:40:46 -04:00
jesus.pelaez
2e544519da Merge pull request 'Perfil-Empleado-Administrativo-Documentacion' (#40) from Perfil-Empleado-Administrativo-Documentacion into En-desarrollo 
Reviewed-on: #40
 2024-10-01 19:35:51 +00:00
ricardo051199
85e0e44f4f Merge branch 'Perfil-Empleado-Administrativo-Documentacion' of https://git.primefactorsolutions.com/PFS/pfs-intra into Perfil-Empleado-Administrativo-Documentacion 2024-10-01 15:32:29 -04:00
ricardo051199
dccc3ea09d #31 Perfil de Usuario Administrativo - EDITAR Documentos (Correccion validacion para editar) 2024-10-01 13:27:49 -04:00
ricardo051199
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
Melina Gutierrez
40aa10bc7d Merge remote-tracking branch 'origin/#10-Registro-Informacion-Profesional' into #10-Registro-Informacion-Profesional 
# Conflicts:
#	src/main/java/com/primefactorsolutions/views/EmployeeView.java
 2024-09-30 08:43:13 -04:00
jesus.pelaez
b6a27c435e Merge pull request 'Perfil-Empleado-Administrativo-Documentacion' (#39) from Perfil-Empleado-Administrativo-Documentacion into En-desarrollo 
Reviewed-on: #39
 2024-09-27 07:31:14 +00:00
jesus.pelaez
26af5f63c7 Merge branch 'En-desarrollo' into Perfil-Empleado-Administrativo-Documentacion 2024-09-27 07:30:59 +00:00
ricardo051199
6d9a2f65e5 #32 Perfil de Personal Administrativo - VER Documento (agregar boton ver documento) 2024-09-27 03:29:26 -04:00
ricardo051199
1519d82993 #29 Perfil de Empleado Administrativo - LISTAR Documentos (filtar por tipo de documento y empleado) 2024-09-27 00:07:27 -04:00
Alex Prudencio
25448fff44 fix readonly fields
All checks were successful
PR Builder / Build-PR (pull_request) Successful in 2m16s
Details
2024-09-26 22:08:51 -04:00
Alex Prudencio
831f9ec9a5 merge conflicts 2024-09-26 22:08:51 -04:00
Alex Prudencio
b4c27f8a9b merged conflicts 2024-09-26 22:08:51 -04:00
ricardo051199
a7d1c08f90 Crear views para el modulo de documentos 2024-09-26 22:08:51 -04:00
Alex Prudencio
2342984de5 fix PR workflow
All checks were successful
Builder / Build-Project (push) Successful in 2m8s
Details
2024-09-26 22:08:02 -04:00
Melina Gutierrez
b7a63b8c78 #4 Perfil de Empleado - Revisar campos del Formulario 2024-09-26 15:26:34 -04:00
Melina Gutierrez
8bf4a97c88 #4 Perfil de Empleado - Añadir nuevos Campos para el formulario de registro del empleado 2024-09-26 07:51:03 -04:00
ricardo051199
4241e7b52b #29 Perfil de Empleado Administrativo - LISTAR Documentos (correccion download, view, edit) 2024-09-25 18:50:59 -04:00
Alex Prudencio
439c1f135d adding wf details
All checks were successful
Builder / Build-Project (push) Successful in 2m2s
Details
2024-09-24 22:11:30 -04:00
Alex Prudencio
5c903ba360 adding pr build wf
All checks were successful
Builder / Build-Project (push) Successful in 2m10s
Details
2024-09-24 22:00:06 -04:00
ricardo051199
f0b41743c7 #30 Perfil de Usuario Administrativo - Añadir NUEVO Documento (agregar creador del registro del doc) 2024-09-24 20:44:16 -04:00
ricardo051199
af3f13773b #29 Perfil de Empleado Administrativo - LISTAR Documentos (implementacion de download) 2024-09-24 19:26:18 -04:00
ricardo051199
f3bda474d0 #32 Perfil de Personal Administrativo - VER Documento 2024-09-24 19:07:58 -04:00
ricardo051199
45987ccad9 #29 Perfil de Empleado Administrativo - LISTAR Documentos (correccionse) 2024-09-24 17:25:43 -04:00
ricardo051199
514e4eaf49 #29 Perfil de Empleado Administrativo - LISTAR Documentos 2024-09-24 17:07:53 -04:00
ricardo051199
2caa878c07 #30 Perfil de Usuario Administrativo - Añadir NUEVO Documento 2024-09-24 12:30:03 -04:00
Alex Prudencio
16a9a91790 fix tests
All checks were successful
Builder / Build-Project (push) Successful in 2m11s
Details
2024-09-23 22:37:32 -04:00
Alex Prudencio
ff2db18f0a deploy workflow
Some checks failed
Builder / Build-Project (push) Failing after 1m57s
Details
2024-09-23 22:19:49 -04:00
Alex Prudencio
9c4a7fc45c fix build
All checks were successful
Builder / Build-Project (push) Successful in 2m4s
Details
2024-09-23 20:18:25 -04:00