From c8139a13b9316f51a78b03a6d4872aaacf33f8ea Mon Sep 17 00:00:00 2001 From: Anton Micke Date: Mon, 24 Mar 2025 15:30:18 +0100 Subject: [PATCH] Make match history filter case-insensitive --- .../org/kickerelo/kickerelo/views/History1vs1View.java | 6 ++++-- .../org/kickerelo/kickerelo/views/History2vs2View.java | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/kickerelo/kickerelo/views/History1vs1View.java b/src/main/java/org/kickerelo/kickerelo/views/History1vs1View.java index d6360b9..1a2bcf8 100644 --- a/src/main/java/org/kickerelo/kickerelo/views/History1vs1View.java +++ b/src/main/java/org/kickerelo/kickerelo/views/History1vs1View.java @@ -61,11 +61,13 @@ public class History1vs1View extends VerticalLayout { grid.sort(List.of(sortOrder)); dataView.addFilter(result -> { - String name1 = result.getGewinner().getName(); - String name2 = result.getVerlierer().getName(); + String name1 = result.getGewinner().getName().toLowerCase(); + String name2 = result.getVerlierer().getName().toLowerCase(); String s1 = filter1.getValue(); + if (s1 != null) s1 = s1.toLowerCase(); boolean p1 = !(s1 == null || s1.isEmpty()); String s2 = filter2.getValue(); + if (s2 != null) s2 = s2.toLowerCase(); boolean p2 = !(s2 == null || s2.isEmpty()); if (p1 && p2) { diff --git a/src/main/java/org/kickerelo/kickerelo/views/History2vs2View.java b/src/main/java/org/kickerelo/kickerelo/views/History2vs2View.java index 1f1e114..416d079 100644 --- a/src/main/java/org/kickerelo/kickerelo/views/History2vs2View.java +++ b/src/main/java/org/kickerelo/kickerelo/views/History2vs2View.java @@ -64,13 +64,15 @@ public class History2vs2View extends VerticalLayout { grid.sort(List.of(sortOrder)); dataView.addFilter(result -> { - String name1 = result.getGewinnerVorn().getName(); - String name2 = result.getVerliererVorn().getName(); - String name3 = result.getVerliererHinten().getName(); - String name4 = result.getGewinnerHinten().getName(); + String name1 = result.getGewinnerVorn().getName().toLowerCase(); + String name2 = result.getVerliererVorn().getName().toLowerCase(); + String name3 = result.getVerliererHinten().getName().toLowerCase(); + String name4 = result.getGewinnerHinten().getName().toLowerCase(); String s1 = filter1.getValue(); + if (s1 != null) s1 = s1.toLowerCase(); boolean p1 = !(s1 == null || s1.isEmpty()); String s2 = filter2.getValue(); + if (s2 != null) s2 = s2.toLowerCase(); boolean p2 = !(s2 == null || s2.isEmpty()); if (p1 && p2) {