Vacaciones #78

Closed

jesus.pelaez wants to merge 0 commits from Vacaciones into En-desarrollo

pull from: Vacaciones

merge into: PFS:En-desarrollo

PFS:main

PFS:En-desarrollo

PFS:mejorar-detalles

PFS:registro-horas

PFS:hoursworked

PFS:actividadHoursWorked

PFS:Listado-General-Vacaciones

PFS:Perfil-Empleado-Administrativo-Documentacion

PFS:#17-Perfil-Personal-Administrativo

PFS:#4-Registrar-empleado

PFS:Rama-Ricardo

Conversation 0 Commits - Files Changed - +1899 -1050

jesus.pelaez commented 2024-11-24 01:17:56 +00:00

Member

Copy Link

No description provided.

jesus.pelaez added 36 commits 2024-11-24 01:17:56 +00:00

primer commit 4561a43866

hoursworked sin reporte vista 40d0cef2a1

Merge pull request 'En-desarrollo' (#65) from En-desarrollo into main ... 1ab10e286e

Reviewed-on: #65

primer commit 5a0aa27382

hoursworked sin reporte vista 36287611b8

#45-Registro Semanal de Horas Trabajadas mas Reporte Excel ca2cd583a0

Merge remote-tracking branch 'origin/hoursworked' into hoursworked ... b58a833444

# 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

#45-Registro Semanal de Horas Trabajadas corregir employee 249a8cb1ee

#45-Registro Semanal de Horas Trabajadas corregir employee solucionar error 21d1313b69

Merge pull request '#45-Registro Semanal de Horas Trabajadas' (#69) from hoursworked into main ... 3b0e5833f8

Reviewed-on: #69

Merge pull request 'En-desarrollo' (#71) from En-desarrollo into main ... bdfaa7da85

Reviewed-on: #71

Merge pull request 'solicitud vacaciones priorizar primero de gestion anterior' (#72) from En-desarrollo into main ... 1c93e9c20c

Reviewed-on: #72
Reviewed-by: alex <alex@primefactorsolutions.com>

Merge pull request 'correcciones' (#73) from En-desarrollo into main ... 439eab3541

Reviewed-on: #73
Reviewed-by: alex <alex@primefactorsolutions.com>

adding git version in build b9320a3d6a

add version in login page 50fd791449

Formulario de registro de horas trabajadas mas el formulario c58b37bbaf

Añadir correcion a Employee 886a19f2cf

Añadir correcion a Employee f46d2cac03

Añadir correcion a Employee repository y service e8612aa5df

Añadir correcion de formato 03146b1b9b

Añadir correcion de service y repository 7b4953a3aa

Merge pull request 'registro-horas' (#76) from registro-horas into main ... 1857dcb5a9

Reviewed-on: #76
Reviewed-by: alex <alex@primefactorsolutions.com>

fix packages.json 4de84d7320

fix file upload 0695223c31

change list page size 2a561a925c

improve tables layout 54ff167124

Remover estados de solicitud (COMPLETADO, CANCELADO, EN_REVISION) 69e378a623

Excluir sabado y domingo cuando se solicita una vacacion b55d919439

Agregar condicion para tomar dia libre por cumpleaños 5287f40878

Limitar a 10 dias maximo para tomar vacaciones por gestion d18f591df0

No descontar dias si la solicitud de vacacion no fue aprobada. 17bd54a3f4

No permitir solicitudes de vacaciones con anticimacion de 3 meses maximo a 15 dias minimo. bf3fadbae3

Traducir modulo documentos e72bca0d39

Descontar a cero las vacaciones cuando llegue la fecha de salida ebb9bc888b

Descargar reporte general de vacaciones en excel. 2206bf2342

Descargar reporte de vacaciones personal en pdf. a6e9407d73

jesus.pelaez closed this pull request 2024-11-24 01:18:21 +00:00

All checks were successful

Hide all checks

PR Builder / Build-PR (pull_request) Successful in 0s

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: PFS/pfs-intra#78

No description provided.