Melina Gutierrez
249a8cb1ee
#45-Registro Semanal de Horas Trabajadas corregir employee
PR Builder / Build-PR (pull_request) Failing after 2m47s
2024-11-09 13:03:06 -04:00
Melina Gutierrez
b58a833444
Merge remote-tracking branch 'origin/hoursworked' into hoursworked
...
PR Builder / Build-PR (pull_request) Failing after 21s
# Conflicts:
# src/main/java/com/primefactorsolutions/model/Actividad.java
# src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
# src/main/java/com/primefactorsolutions/views/EmployeeView.java
# src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
# src/main/java/com/primefactorsolutions/views/ReporteView.java
2024-11-09 12:58:42 -04:00
Melina Gutierrez
ca2cd583a0
#45-Registro Semanal de Horas Trabajadas mas Reporte Excel
2024-11-09 12:43:31 -04:00
Melina Gutierrez
36287611b8
hoursworked sin reporte vista
2024-11-09 11:43:42 -04:00
Melina Gutierrez
5a0aa27382
primer commit
2024-11-09 11:42:54 -04:00
1ab10e286e
Merge pull request 'En-desarrollo' ( #65 ) from En-desarrollo into main
...
Builder / Build-Project (push) Successful in 2m37s
Reviewed-on: #65
2024-11-09 12:15:26 +00:00
Melina Gutierrez
40d0cef2a1
hoursworked sin reporte vista
2024-11-08 08:36:22 -04:00
3922220439
Resolver errores de checkstyle
PR Builder / Build-PR (pull_request) Successful in 2m33s
2024-11-07 18:53:47 -04:00
6024b3fdd0
Resolved merge conflict in RequestsListView.java
PR Builder / Build-PR (pull_request) Failing after 17s
2024-11-07 18:45:01 -04:00
5e37cbbcd0
Perfil de Personal Administrativo - Listado Vacaciones de empleado (Calcular automadicamente dias de las vacaciones gestion actual y anterior)
2024-11-07 18:40:34 -04:00
f7e7dea7cb
#37 Perfil de Personal Administrativo - Listado General de Vacaciones (Calcular automadicamente dias de las vacaciones gestion actual y anterior)
PR Builder / Build-PR (pull_request) Failing after 21s
2024-11-07 18:31:05 -04:00
cb34868b9c
Descarte funcionalidad generar automaticamente solicitud vacacion
PR Builder / Build-PR (pull_request) Successful in 2m42s
2024-11-07 15:42:42 -04:00
d3fdb128b7
Merge branch 'En-desarrollo' of https://git.primefactorsolutions.com/PFS/pfs-intra into En-desarrollo
PR Builder / Build-PR (pull_request) Successful in 2m37s
2024-11-07 02:18:18 -04:00
91aad85146
#5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Refactorizacion generar solicitudes vacaciones)
2024-11-07 02:17:27 -04:00
9a29f91994
Merge pull request ' #5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Asignar o actualizar vacaciones)' ( #68 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Failing after 19s
Reviewed-on: #68
2024-11-06 18:56:16 +00:00
ed88936683
Resolviendo conflictos y finalizando fusión entre ramas Vacaciones y En-desarrollo
PR Builder / Build-PR (pull_request) Successful in 0s
2024-11-06 14:55:53 -04:00
a0bd00fba4
#5 , #6 Perfil de Empleado - GUARDAR y EDITAR Información de Empleados (Asignar o actualizar vacaciones)
PR Builder / Build-PR (pull_request) Successful in 0s
2024-11-06 14:49:02 -04:00
81acc686e6
Merge pull request 'Correccion registro solicitud vacaciones actual y anterior' ( #67 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Failing after 19s
Reviewed-on: #67
2024-11-05 18:59:37 +00:00
9fdf1c08b5
Correccion registro solicitud vacaciones actual y anterior
PR Builder / Build-PR (pull_request) Successful in 0s
2024-11-05 14:58:28 -04:00
4f128fd02e
Merge pull request 'Vacaciones' ( #66 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Failing after 22s
Reviewed-on: #66
2024-11-05 18:32:42 +00:00
88e80a7dcc
traducir a español y cambiar uso de grid a paging grid de RequestEmploye
PR Builder / Build-PR (pull_request) Successful in 1s
2024-11-05 13:33:00 -04:00
7e415ae837
cambiar team string a un team class
2024-11-05 10:47:16 -04:00
Melina Gutierrez
4561a43866
primer commit
2024-11-04 21:45:02 -04:00
2b6400fe24
Merge branch 'En-desarrollo' of https://git.primefactorsolutions.com/PFS/pfs-intra into En-desarrollo
PR Builder / Build-PR (pull_request) Successful in 2m35s
2024-11-04 00:49:43 -04:00
4615febec3
Actualizar BD - Actualizar el estado de los registros de solicitudes de vacaciones
2024-11-04 00:48:59 -04:00
9d87493f7d
Merge pull request 'Vacaciones' ( #64 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m27s
Reviewed-on: #64
2024-11-04 04:25:22 +00:00
eb6183df19
Correcciones
PR Builder / Build-PR (pull_request) Successful in 0s
2024-11-04 00:24:34 -04:00
45bf76c3d8
Actualizar BD - Actualizar el estado de los registros de solicitudes de vacaciones
2024-11-04 00:19:12 -04:00
cfd5599d32
#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (No aceptar fechas pasadas)
2024-11-03 23:40:13 -04:00
4421c6fe45
#55 Perfil de Personal Administrativo - Añadir Vacaciones del Empleado (correcciones)
2024-11-03 23:22:09 -04:00
71cb2d67c9
Perfil de Personal Administrativo - Listado solicitudes pendientes de Vacaciones
2024-11-02 00:51:21 -04:00
3efa8c73d5
Traducir a epañol las sentencias de incercion de datos
2024-11-01 13:42:23 -04:00
c0cc1e86de
Categoria vacaciones - traducirlo al español
2024-10-31 01:42:33 -04:00
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
...
Builder / Build-Project (push) Successful in 2m40s
Reviewed-on: #62
2024-10-30 20:14:57 +00:00
2f4d1ab130
adding default jwt secret
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
83ba9f7478
Merge pull request 'Vacaciones' ( #63 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m28s
Reviewed-on: #63
2024-10-30 18:56:02 +00:00
68c94e6193
Agregar solicitud vacaciones a la bd para pruebas
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
4f6935341d
Merge pull request 'Vacaciones' ( #61 ) from Vacaciones into En-desarrollo
...
PR Builder / Build-PR (pull_request) Successful in 2m32s
Reviewed-on: #61
2024-10-30 18:31:55 +00:00
335e895197
Merge pull request '#10-Registro-Informacion-Profesional' ( #60 ) from #10-Registro-Informacion-Profesional into main
...
Builder / Build-Project (push) Successful in 2m38s
Reviewed-on: #60
2024-10-30 01:52:11 +00:00
Melina Gutierrez
937b1ef531
\#46 Perfil de Empleado - Registro Semanal mas reporte, falta mejorar el reporte semanal
...
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
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
