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

refactor: isResolved changed to isPaid

Browse source
This commit is contained in:
Filippo Ferrari 2024-08-05 22:14:53 +02:00
parent 261024efe1
commit 32c6c0de26
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
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.addColumn(expenseEvent -> expenseEvent.getEvent().getName()).setHeader("Event").setSortable(true);
grid.addColumn(new ComponentRenderer<>(expense1 -> createBadge(expenseService.isExpenseResolved(expense1)))).setHeader("Status").setSortable(true); grid.addColumn(new ComponentRenderer<>(expense1 -> createBadge(expenseService.isExpensePaid(expense1)))).setHeader("Status").setSortable(true);
grid.getColumns().forEach(col -> col.setAutoWidth(true)); grid.getColumns().forEach(col -> col.setAutoWidth(true));
grid.setItems(this.expenseService.findAllOrderByDateDescending()); grid.setItems(this.expenseService.findAllOrderByDateDescending());
@ -292,13 +292,13 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
periodInterval.setVisible(isPeriodicChecked); periodInterval.setVisible(isPeriodicChecked);
} }
private Span createBadge(Boolean isExpenseResolved) { private Span createBadge(Boolean isExpensePaid) {
Span badge = new Span(); Span badge = new Span();
if (Boolean.TRUE.equals(isExpenseResolved)) { if (Boolean.TRUE.equals(isExpensePaid)) {
badge.setText("Resolved"); badge.setText("Paid");
badge.getElement().getThemeList().add("badge success"); badge.getElement().getThemeList().add("badge success");
} else { } else {
badge.setText("To be Resolved"); badge.setText("Owed");
badge.getElement().getThemeList().add("badge error"); badge.getElement().getThemeList().add("badge error");
} }
return badge; return badge;