PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

Detalles #87

Merged
alex merged 8 commits from Detalles into main 2024-11-28 13:53:16 +00:00
Conversation 0 Commits 8 Files Changed 6 +9 -6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e92dc5342 - Show all commits

15
src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java
View File

@ -477,9 +477,9 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter<Str
Employee employee = employeeService.getEmployee(employeeId);
List<TimeOffRequest> filteredRequests = requests.stream()
.filter(request ->
(request.getStartDate() == null || Year.from(request.getStartDate()).equals(Year.now())) ||
request.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL ||
request.getCategory() == TimeOffRequestType.VACACION_GESTION_ANTERIOR)
(request.getStartDate() == null || Year.from(request.getStartDate()).equals(Year.now()))
|| request.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL
|| request.getCategory() == TimeOffRequestType.VACACION_GESTION_ANTERIOR)
.toList();
PDPageContentStream contentStream = null;
@ -577,8 +577,8 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter<Str
contentStream.newLineAtOffset(0, -20);
contentStream.showText("Total vacaciones pendientes de uso: " + remainingVacationDays);
contentStream.newLineAtOffset(0, -20);
contentStream.showText("TOTAL GENERAL DE DÍAS DISPONIBLES: " +
(remainingHolidayDays + remainingPersonalDays + remainingVacationDays));
contentStream.showText("TOTAL GENERAL DE DÍAS DISPONIBLES: "
+ (remainingHolidayDays + remainingPersonalDays + remainingVacationDays));
contentStream.endText();
} finally {
@ -653,7 +653,10 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter<Str
addComponentAsFirst(new H3("Nombre del empleado: " + employeeName));
addComponentAtIndex(1, new H3("Equipo: " + employeeTeam));
if (dateOfExit != null) {
addComponentAtIndex(2, new H3("Descontado a cero en fecha " + dateOfExit + " por pago de finiquito incluidas duodecima."));
addComponentAtIndex(
2, new H3("Descontado a cero en fecha "
+ dateOfExit
+ " por pago de finiquito incluidas duodecima."));
}
}
}