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

feat: added creditors management

Browse source
This commit is contained in:
Filippo Ferrari 2024-06-04 09:31:40 +01:00
parent bb24684630
commit bc4fb62978
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/application/munera/data/Expense.java
View file

@ -43,14 +43,14 @@ public class Expense {
@Column(name = "PeriodInterval") @Column(name = "PeriodInterval")
private Integer periodInterval; private Integer periodInterval;
@ManyToMany @ManyToMany(fetch = FetchType.EAGER)
@JoinTable( @JoinTable(
name = "Creditor_expenses", name = "Creditor_expenses",
joinColumns = @JoinColumn(name = "expense_id"), joinColumns = @JoinColumn(name = "expense_id"),
inverseJoinColumns = @JoinColumn(name = "people_id")) inverseJoinColumns = @JoinColumn(name = "people_id"))
private Set<Person> creditors; private Set<Person> creditors;
@ManyToMany @ManyToMany(fetch = FetchType.EAGER)
@JoinTable( @JoinTable(
name = "Debtors_expenses", name = "Debtors_expenses",
joinColumns = @JoinColumn(name = "expense_id"), joinColumns = @JoinColumn(name = "expense_id"),

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

@ -2,14 +2,17 @@ package com.application.munera.views.expenses;
import com.application.munera.data.Category; import com.application.munera.data.Category;
import com.application.munera.data.Expense; import com.application.munera.data.Expense;
import com.application.munera.data.PeriodUnit; import com.application.munera.data.PeriodUnit;
import com.application.munera.data.Person;
import com.application.munera.services.CategoryService; import com.application.munera.services.CategoryService;
import com.application.munera.services.ExpenseService; import com.application.munera.services.ExpenseService;
import com.application.munera.services.PersonService;
import com.application.munera.views.MainLayout; import com.application.munera.views.MainLayout;
import com.vaadin.flow.component.UI; import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.button.ButtonVariant; import com.vaadin.flow.component.button.ButtonVariant;
import com.vaadin.flow.component.checkbox.Checkbox; import com.vaadin.flow.component.checkbox.Checkbox;
import com.vaadin.flow.component.combobox.ComboBox; import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.combobox.MultiSelectComboBox;
import com.vaadin.flow.component.datepicker.DatePicker; import com.vaadin.flow.component.datepicker.DatePicker;
import com.vaadin.flow.component.dependency.Uses; import com.vaadin.flow.component.dependency.Uses;
import com.vaadin.flow.component.formlayout.FormLayout; import com.vaadin.flow.component.formlayout.FormLayout;
@ -55,6 +58,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
private final ExpenseService expenseService; private final ExpenseService expenseService;
private final CategoryService categoryService; private final CategoryService categoryService;
private final PersonService personService;
private TextField name; private TextField name;
private TextField cost; private TextField cost;
private ComboBox<Category> category; private ComboBox<Category> category;
@ -63,10 +67,12 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
private ComboBox<PeriodUnit> periodUnit; private ComboBox<PeriodUnit> periodUnit;
private TextField periodInterval; private TextField periodInterval;
private DatePicker date; private DatePicker date;
private MultiSelectComboBox<Person> creditors;
public ExpensesView(ExpenseService expenseService, CategoryService categoryService) { public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService) {
this.expenseService = expenseService; this.expenseService = expenseService;
this.categoryService = categoryService; this.categoryService = categoryService;
this.personService = personService;
addClassNames("expenses-view"); addClassNames("expenses-view");
// Create UI // Create UI
@ -175,9 +181,8 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
Optional<Long> expenseId = event.getRouteParameters().get(EXPENSE_ID).map(Long::parseLong); Optional<Long> expenseId = event.getRouteParameters().get(EXPENSE_ID).map(Long::parseLong);
if (expenseId.isPresent()) { if (expenseId.isPresent()) {
Optional<Expense> expenseFromBackend = expenseService.get(expenseId.get()); Optional<Expense> expenseFromBackend = expenseService.get(expenseId.get());
if (expenseFromBackend.isPresent()) { if (expenseFromBackend.isPresent()) populateForm(expenseFromBackend.get());
populateForm(expenseFromBackend.get()); else {
} else {
Notification.show( Notification.show(
String.format("The requested expense was not found, ID = %s", expenseId.get()), 3000, String.format("The requested expense was not found, ID = %s", expenseId.get()), 3000,
Notification.Position.BOTTOM_START); Notification.Position.BOTTOM_START);
@ -208,6 +213,9 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
periodUnit = new ComboBox<>("Period Unit"); periodUnit = new ComboBox<>("Period Unit");
periodUnit.setItems(PeriodUnit.values()); periodUnit.setItems(PeriodUnit.values());
periodInterval = new TextField("Period Interval"); periodInterval = new TextField("Period Interval");
creditors = new MultiSelectComboBox<>("Creditors");
creditors.setItems(personService.findAll());
creditors.setItemLabelGenerator(Person::getFirstName);
date = new DatePicker("Date"); date = new DatePicker("Date");
LitRenderer<Expense> isPeriodicRenderer = LitRenderer.<Expense>of( LitRenderer<Expense> isPeriodicRenderer = LitRenderer.<Expense>of(
"<vaadin-icon icon='vaadin:${item.icon}' style='width: var(--lumo-icon-size-s); height: var(--lumo-icon-size-s); color: ${item.color};'></vaadin-icon>") "<vaadin-icon icon='vaadin:${item.icon}' style='width: var(--lumo-icon-size-s); height: var(--lumo-icon-size-s); color: ${item.color};'></vaadin-icon>")
@ -216,7 +224,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
? "var(--lumo-primary-text-color)" ? "var(--lumo-primary-text-color)"
: "var(--lumo-disabled-text-color)"); : "var(--lumo-disabled-text-color)");
formLayout.add(name, cost, category, description, isPeriodic, periodUnit, periodInterval, date); formLayout.add(name, cost, category, description, isPeriodic, periodUnit, periodInterval, date, creditors);
grid.addColumn(isPeriodicRenderer).setHeader("Periodic").setAutoWidth(true); grid.addColumn(isPeriodicRenderer).setHeader("Periodic").setAutoWidth(true);
editorDiv.add(formLayout); editorDiv.add(formLayout);
createButtonLayout(editorLayoutDiv); createButtonLayout(editorLayoutDiv);