Sucht auch in Start, Ziel & Bemerkungen
This commit is contained in:
		@@ -168,10 +168,23 @@ public class TourPlaner{
 | 
				
			|||||||
    public static ArrayList<Tour> sucheTour(String tourname){
 | 
					    public static ArrayList<Tour> sucheTour(String tourname){
 | 
				
			||||||
        ArrayList<Tour> touren = new ArrayList<>();
 | 
					        ArrayList<Tour> touren = new ArrayList<>();
 | 
				
			||||||
        getAllTours().forEach(t ->{
 | 
					        getAllTours().forEach(t ->{
 | 
				
			||||||
            if(t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){
 | 
					            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);
 | 
					                    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;
 | 
					        return touren;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user