diff --git a/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java b/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java index a1677f2..4504eba 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java @@ -62,6 +62,10 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter categoryFilter; private ComboBox stateFilter; private UUID employeeId; + private double remainingHolidayDays; + private double remainingPersonalDays; + private double remainingVacationDays; + public RequestEmployeeView(final TimeOffRequestService requestService, final EmployeeService employeeService, @@ -178,20 +182,20 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter 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) + .toList(); PDPageContentStream contentStream = null; try { @@ -512,13 +523,6 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter 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) - .toList(); - contentStream.setFont(PDType1Font.TIMES_ROMAN, 10); float currentY = tableTopY - cellHeight; for (TimeOffRequest request : filteredRequests) { @@ -553,6 +557,30 @@ public class RequestEmployeeView extends BaseView implements HasUrlParameter