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

En-desarrollo #65

Merged
alex merged 29 commits from En-desarrollo into main 2024-11-09 12:15:26 +00:00
Conversation 0 Commits 29 Files Changed 15 +5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cfd5599d32 - Show all commits

5
src/main/java/com/primefactorsolutions/views/RequestRegisterView.java
View File

@ -240,6 +240,11 @@ public class RequestRegisterView extends VerticalLayout {
int startYear = calculateStartYear(previousRequests); int startYear = calculateStartYear(previousRequests);
startDate = determineStartDate(vacation, startYear); startDate = determineStartDate(vacation, startYear);
if (startDate.isBefore(LocalDate.now())) {
startDate = determineStartDate(vacation, startYear + 1);
}
if (startDate != null) { if (startDate != null) {
endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1); endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1);
} else { } else {