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

En-desarrollo #80

Open
jesus.pelaez wants to merge 11 commits from En-desarrollo into main
pull from: En-desarrollo
merge into: PFS:main
Conversation 0 Commits 11 Files Changed 9 +10 -1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d18f591df0 - Show all commits

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

@ -100,9 +100,12 @@ public class RequestRegisterView extends VerticalLayout {
updateDatePickerMinValues(); updateDatePickerMinValues();
}); });
endDatePicker.addValueChangeListener(event -> { endDatePicker.addValueChangeListener(event -> {
if (startDatePicker.getValue() != null) {
endDatePicker.setMin(startDatePicker.getValue());
}
LocalDate selectedDate = event.getValue(); LocalDate selectedDate = event.getValue();
if (selectedDate != null && (selectedDate.getDayOfWeek().getValue() == 6 || selectedDate.getDayOfWeek().getValue() == 7)) { if (selectedDate != null && (selectedDate.getDayOfWeek().getValue() == 6 || selectedDate.getDayOfWeek().getValue() == 7)) {
startDatePicker.setValue(selectedDate.minusDays(1)); endDatePicker.setValue(selectedDate.minusDays(1));
} }
calculateDays(); calculateDays();
}); });
@ -408,6 +411,12 @@ public class RequestRegisterView extends VerticalLayout {
if (balanceDays < 0.0) { if (balanceDays < 0.0) {
clearFields(); clearFields();
} }
if (daysToBeTakenField.getValue() > 10
&& (categoryComboBox.getValue() == TimeOffRequestType.VACACION_GESTION_ANTERIOR
|| categoryComboBox.getValue() == TimeOffRequestType.VACACION_GESTION_ACTUAL)) {
clearFields();
}
} }
} }