Sucht auch in Start, Ziel & Bemerkungen

This commit is contained in:
Georg Reisinger 2021-04-27 15:51:26 +02:00
parent 34c11dd6ae
commit f45e890fdd

View File

@ -168,8 +168,21 @@ public class TourPlaner{
public static ArrayList<Tour> sucheTour(String tourname){
ArrayList<Tour> touren = new ArrayList<>();
getAllTours().forEach(t ->{
if(t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){
touren.add(t);
ArrayList<Log> logs = t.getLogs();
ArrayList<String> 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;