NapoleonDynamite/munera-vaadin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: better creditors and debtors listing

Browse source
This commit is contained in:
filippo-ferrari 2024-06-22 15:38:53 +02:00
parent 9058be6a35
commit a656f87741
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/com/application/munera/views/expenses/ExpensesView.java
View file

@ -1,4 +1,5 @@
package com.application.munera.views.expenses; package com.application.munera.views.expenses;
import com.application.munera.data.*; import com.application.munera.data.*;
import com.application.munera.services.CategoryService; import com.application.munera.services.CategoryService;
import com.application.munera.services.EventService; import com.application.munera.services.EventService;
@ -33,8 +34,7 @@ import com.vaadin.flow.spring.data.VaadinSpringDataHelpers;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.orm.ObjectOptimisticLockingFailureException;
import java.util.Objects; import java.util.*;
import java.util.Optional;
@PageTitle("Expenses") @PageTitle("Expenses")
@Route(value = "/:expenseID?/:action?(edit)", layout = MainLayout.class) @Route(value = "/:expenseID?/:action?(edit)", layout = MainLayout.class)
@ -116,9 +116,9 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
binder.bindInstanceFields(this); binder.bindInstanceFields(this);
// We set initial value of isPeriodic to true and show period fields // We set initial value of isPeriodic to true and show period fields
isPeriodic.setValue(true); isPeriodic.setValue(false);
periodUnit.setVisible(true); periodUnit.setVisible(false);
periodInterval.setVisible(true); periodInterval.setVisible(false);
// We show the periodic fields only when the isPeriodic boolean is true // We show the periodic fields only when the isPeriodic boolean is true
isPeriodic.addValueChangeListener(event -> { isPeriodic.addValueChangeListener(event -> {
@ -133,6 +133,22 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
} }
}); });
// Event listeners that will remove the selected creditors from the debtors list and vice versa
// Done so that the user cant create an expense with the same person as creditor and debtor
debtors.addValueChangeListener(event -> {
Set<Person> selectedDebtors = event.getValue();
final var creditorsSet = new HashSet<>(personService.findAll());
creditorsSet.removeIf(selectedDebtors::contains);
creditors.setItems(creditorsSet);
});
creditors.addValueChangeListener(event -> {
Set<Person> selectedCreditors = event.getValue();
final var debtorsSet = new HashSet<>(personService.findAll());
debtorsSet.removeIf(selectedCreditors::contains);
debtors.setItems(debtorsSet);
});
cancel.addClickListener(e -> { cancel.addClickListener(e -> {
clearForm(); clearForm();
refreshGrid(); refreshGrid();