diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index f7bcd43..141b725 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -168,8 +168,21 @@ public class TourPlaner{ public static ArrayList sucheTour(String tourname){ ArrayList touren = new ArrayList<>(); getAllTours().forEach(t ->{ - if(t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){ - touren.add(t); + ArrayList logs = t.getLogs(); + ArrayList bemerkungen = new ArrayList<>(); + for (Log l:logs) { + bemerkungen.add(l.getBemerkung().toLowerCase(Locale.ROOT)); + } + bemerkungen.forEach(b -> { + if(b.contains(tourname.toLowerCase(Locale.ROOT))){ + touren.add(t); + } + }); + System.out.println(""+bemerkungen.contains(tourname.toLowerCase()) + t.getZiel().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) + t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) + t.getStart().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())); + if(bemerkungen.contains(tourname.toLowerCase()) || t.getZiel().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getStart().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){ + if(!touren.contains(t)) { + touren.add(t); + } } }); return touren;