From 68f0d5629f1ed3c7453780765bf592f817caa5a0 Mon Sep 17 00:00:00 2001 From: filippo-ferrari Date: Sun, 22 Sep 2024 15:43:40 +0200 Subject: [PATCH] refactor: ExpensesView --- .../application/munera/views/expenses/ExpensesView.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/application/munera/views/expenses/ExpensesView.java b/src/main/java/com/application/munera/views/expenses/ExpensesView.java index 9bb2209..62cc51b 100644 --- a/src/main/java/com/application/munera/views/expenses/ExpensesView.java +++ b/src/main/java/com/application/munera/views/expenses/ExpensesView.java @@ -106,8 +106,6 @@ public class ExpensesView extends Div implements BeforeEnterObserver { grid.addColumn(Expense::getName).setHeader("Name").setSortable(true).setSortProperty("name"); grid.addColumn(Expense::getCost).setHeader("Amount").setSortable(true).setSortProperty("cost"); grid.addColumn(expenseCategory -> expenseCategory.getCategory().getName()).setHeader("Category").setSortable(true).setSortProperty("category"); -// grid.addColumn(Expense::getPeriodInterval).setHeader("Period Interval").setSortable(true); -// grid.addColumn(Expense::getPeriodUnit).setHeader("Period Unit").setSortable(true); grid.addColumn(Expense::getDate).setHeader("Date").setSortable(true).setSortProperty("date"); grid.addColumn(new ComponentRenderer<>(this.viewsService::createExpenseBadge)).setHeader("Status").setSortable(true); grid.getColumns().forEach(col -> col.setAutoWidth(true)); @@ -140,9 +138,8 @@ public class ExpensesView extends Div implements BeforeEnterObserver { // when a row is selected or deselected, populate form grid.asSingleSelect().addValueChangeListener(event -> { - if (event.getValue() != null) { - UI.getCurrent().navigate(String.format(EXPENSE_EDIT_ROUTE_TEMPLATE, event.getValue().getId())); - } else { + if (event.getValue() != null) UI.getCurrent().navigate(String.format(EXPENSE_EDIT_ROUTE_TEMPLATE, event.getValue().getId())); + else { clearForm(); UI.getCurrent().navigate(ExpensesView.class); }