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

feat: expenses name filtering

Browse source
This commit is contained in:
effe 2024-09-15 16:22:17 -04:00
parent 770da8b805
commit 86671693d2
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/application/munera/services/ViewsService.java
View file

@ -4,9 +4,13 @@ import com.application.munera.data.BadgeMessage;
import com.application.munera.data.Expense; import com.application.munera.data.Expense;
import com.application.munera.data.ExpenseType; import com.application.munera.data.ExpenseType;
import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.html.Span;
import com.vaadin.flow.component.textfield.TextField;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.vaadin.klaudeta.PaginatedGrid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@Service @Service
public class ViewsService { public class ViewsService {
@ -43,6 +47,19 @@ public class ViewsService {
return badge; return badge;
} }
public void applyFilter(TextField nameFilter, Long userId, PaginatedGrid<Expense, Objects> grid) {
String filterValue = nameFilter.getValue().trim();
List<Expense> filteredExpenses;
if (filterValue.isEmpty()) filteredExpenses = expenseService.findAllOrderByDateDescending(userId); // If the filter is empty, return all expenses
else {
// Apply the filter (e.g., by name)
filteredExpenses = expenseService.findAllOrderByDateDescending(userId)
.stream()
.filter(expense -> expense.getName().toLowerCase().contains(filterValue.toLowerCase())).toList();
}
grid.setItems(filteredExpenses);
}
private BadgeMessage determineBadgeMessage(ExpenseType type, boolean isPaid) { private BadgeMessage determineBadgeMessage(ExpenseType type, boolean isPaid) {
return switch (type) { return switch (type) {
case CREDIT -> isPaid ? BadgeMessage.PAID_TO_ME : BadgeMessage.OWED_TO_ME; case CREDIT -> isPaid ? BadgeMessage.PAID_TO_ME : BadgeMessage.OWED_TO_ME;

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

@ -41,7 +41,6 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
import org.vaadin.klaudeta.PaginatedGrid; import org.vaadin.klaudeta.PaginatedGrid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@ -119,7 +118,7 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
nameFilter.setPlaceholder("Filter by Name..."); nameFilter.setPlaceholder("Filter by Name...");
nameFilter.setClearButtonVisible(true); nameFilter.setClearButtonVisible(true);
nameFilter.setValueChangeMode(ValueChangeMode.LAZY); nameFilter.setValueChangeMode(ValueChangeMode.LAZY);
nameFilter.addValueChangeListener(e -> applyFilter()); nameFilter.addValueChangeListener(e -> this.viewsService.applyFilter(nameFilter, userId, grid));
// Add nameFilter field to layout (above the grid) // Add nameFilter field to layout (above the grid)
VerticalLayout layout = new VerticalLayout(); VerticalLayout layout = new VerticalLayout();
@ -333,19 +332,4 @@ public class ExpensesView extends Div implements BeforeEnterObserver {
payer.setValue(loggedInPerson); payer.setValue(loggedInPerson);
beneficiary.setValue(loggedInPerson); beneficiary.setValue(loggedInPerson);
} }
private void applyFilter() {
String filterValue = nameFilter.getValue().trim();
List<Expense> filteredExpenses;
if (filterValue.isEmpty()) {
// If the filter is empty, return all expenses
filteredExpenses = expenseService.findAllOrderByDateDescending(userId);
} else {
filteredExpenses = expenseService.findAllOrderByDateDescending(userId)
.stream()
.filter(expense1 -> expense1.getName().toLowerCase().contains(filterValue.toLowerCase()))
.toList();
}
grid.setItems(filteredExpenses);
}
} }