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

feat: Event in expense view and form

Browse source
This commit is contained in:
filippo-ferrari 2024-06-12 22:39:25 +02:00
parent d6706d78fb
commit 5ec3fef8fd
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,7 @@
package com.application.munera.views.expenses; package com.application.munera.views.expenses;
import com.application.munera.data.Category; import com.application.munera.data.*;
import com.application.munera.data.Expense;
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.EventService;
import com.application.munera.services.ExpenseService; import com.application.munera.services.ExpenseService;
import com.application.munera.services.PersonService; import com.application.munera.services.PersonService;
import com.application.munera.views.MainLayout; import com.application.munera.views.MainLayout;
@ -59,6 +57,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 final PersonService personService;
private final EventService eventService;
private TextField name; private TextField name;
private TextField cost; private TextField cost;
private ComboBox<Category> category; private ComboBox<Category> category;
@ -69,11 +68,12 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
private DatePicker date; private DatePicker date;
private MultiSelectComboBox<Person> creditors; private MultiSelectComboBox<Person> creditors;
private MultiSelectComboBox<Person> debtors; private MultiSelectComboBox<Person> debtors;
private ComboBox<Event> event;
public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService) { public ExpensesView(ExpenseService expenseService, CategoryService categoryService, PersonService personService, EventService eventService) {
this.expenseService = expenseService; this.expenseService = expenseService;
this.categoryService = categoryService; this.categoryService = categoryService;
this.personService = personService; this.personService = personService;
this.eventService = eventService;
addClassNames("expenses-view"); addClassNames("expenses-view");
// Create UI // Create UI
@ -91,6 +91,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
grid.addColumn(Expense::getPeriodInterval).setHeader("Period Interval").setSortable(true); grid.addColumn(Expense::getPeriodInterval).setHeader("Period Interval").setSortable(true);
grid.addColumn(Expense::getPeriodUnit).setHeader("Period Unit").setSortable(true); grid.addColumn(Expense::getPeriodUnit).setHeader("Period Unit").setSortable(true);
grid.addColumn(Expense::getDate).setHeader("Date").setSortable(true).setSortProperty("date"); grid.addColumn(Expense::getDate).setHeader("Date").setSortable(true).setSortProperty("date");
grid.addColumn(expenseEvent -> expenseEvent.getEvent().getName()).setHeader("Event").setSortable(true);
grid.getColumns().forEach(col -> col.setAutoWidth(true)); grid.getColumns().forEach(col -> col.setAutoWidth(true));
grid.setItems(query -> expenseService.list( grid.setItems(query -> expenseService.list(
@ -218,6 +219,9 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
debtors = new MultiSelectComboBox<>("Debtors"); debtors = new MultiSelectComboBox<>("Debtors");
debtors.setItems(personService.findAll()); debtors.setItems(personService.findAll());
debtors.setItemLabelGenerator(Person::getFirstName); debtors.setItemLabelGenerator(Person::getFirstName);
event = new ComboBox<>("Event");
event.setItems(eventService.findAll());
event.setItemLabelGenerator(Event::getName);
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>")
@ -226,7 +230,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, creditors, debtors); formLayout.add(name, cost, category, description, isPeriodic, periodUnit, periodInterval, date, creditors, debtors, event);
grid.addColumn(isPeriodicRenderer).setHeader("Periodic").setAutoWidth(true); grid.addColumn(isPeriodicRenderer).setHeader("Periodic").setAutoWidth(true);
editorDiv.add(formLayout); editorDiv.add(formLayout);
createButtonLayout(editorLayoutDiv); createButtonLayout(editorLayoutDiv);