|
|
f8f71b187c
|
Merge branch 'main' into Listado-General-Vacaciones
|
2024-10-11 00:55:37 -04:00 |
|
|
|
334802e004
|
Vacaciones del Empleado - Refactorizar
|
2024-10-11 00:53:46 -04:00 |
|
|
|
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 |
|
|
|
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
Builder / Build-Project (push) Successful in 2m32s
Reviewed-on: #48
|
2024-10-10 19:56:03 +00:00 |
|
|
|
e8e0f60c4e
|
Vacaciones del Empleado - Filtrar por categoria y estado
|
2024-10-10 13:29:14 -04:00 |
|
|
|
02c0b848af
|
Actualizar src/main/java/com/primefactorsolutions/model/TimeOffRequest.java
PR Builder / Build-PR (pull_request) Successful in 2m27s
|
2024-10-09 14:44:28 +00:00 |
|
|
|
b14e7902cc
|
Correcciones
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
PR Builder / Build-PR (pull_request) Failing after 19s
|
2024-10-08 14:47:50 -04:00 |
|
|
|
ef78cc91a8
|
Merge pull request '#10-Registro-Informacion-Profesional' (#38) from #10-Registro-Informacion-Profesional into main
Builder / Build-Project (push) Successful in 2m29s
Reviewed-on: #38
|
2024-10-08 18:00:43 +00:00 |
|
Melina Gutierrez
|
379e822572
|
#46 Perfil de Empleado - Registro Semanal de Horas trabajadas
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
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 |
|
|
|
2782fcfb86
|
Merge pull request 'En-desarrollo' (#27) from En-desarrollo into main
Builder / Build-Project (push) Successful in 2m31s
Reviewed-on: #27
Reviewed-by: alex <alex@primefactorsolutions.com>
|
2024-10-07 18:23:33 +00:00 |
|
|
|
d2357a2adf
|
Merge branch 'main' into En-desarrollo
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
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
PR Builder / Build-PR (pull_request) Successful in 2m8s
|
2024-10-02 16:06:59 -04:00 |
|
|
|
2f343daf89
|
Adding report service
Builder / Build-Project (push) Successful in 2m33s
|
2024-10-01 22:24:27 -04:00 |
|
|
|
78f41d59e0
|
Coreccion del enlace a documentos
PR Builder / Build-PR (pull_request) Successful in 2m4s
|
2024-10-01 18:35:52 -04:00 |
|
|
|
e77e63491a
|
Resuelve construccion fallido
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
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
26af5f63c7
|
Merge branch 'En-desarrollo' into Perfil-Empleado-Administrativo-Documentacion
|
2024-09-27 07:30:59 +00: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
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 |
|
|
|
2342984de5
|
fix PR workflow
Builder / Build-Project (push) Successful in 2m8s
|
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 |
|
|
|
4241e7b52b
|
#29 Perfil de Empleado Administrativo - LISTAR Documentos (correccion download, view, edit)
|
2024-09-25 18:50:59 -04:00 |
|
|
|
439c1f135d
|
adding wf details
Builder / Build-Project (push) Successful in 2m2s
|
2024-09-24 22:11:30 -04:00 |
|
|
|
5c903ba360
|
adding pr build wf
Builder / Build-Project (push) Successful in 2m10s
|
2024-09-24 22:00:06 -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
Builder / Build-Project (push) Successful in 2m11s
|
2024-09-23 22:37:32 -04:00 |
|
|
|
ff2db18f0a
|
deploy workflow
Builder / Build-Project (push) Failing after 1m57s
|
2024-09-23 22:19:49 -04:00 |
|
