diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 8b30e31..a1ac8c5 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -100,6 +100,7 @@ Filtern nach: Sorte: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ... + Rot/Weiß: z.B. r, Rot, w, weiß, ... Qualitätsstufe: z.B. QUW, kab, !ldw (ausgenommen LDW), ... Gradation: z.B. >73, <15, 17-18, 15-, >17,5, 62-75, ... Mitglied: z.B. 1234, 987, ... diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 5c7c78f..f50d015 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -347,7 +347,15 @@ namespace Elwig.Windows { for (int i = 0; i < filter.Count; i++) { var e = filter[i]; - if (e.Length == 2 && var.ContainsKey(e.ToUpper())) { + if (e.ToLower() is "r" or "rot") { + filterVar.AddRange(var.Values.Where(v => v.IsRed).Select(v => v.SortId)); + filter.RemoveAt(i--); + filterNames.Add("Rotweinsorten"); + } else if (e.ToLower() is "w" or "weiß" or "weiss") { + filterVar.AddRange(var.Values.Where(v => v.IsWhite).Select(v => v.SortId)); + filter.RemoveAt(i--); + filterNames.Add("Weißweinsorten"); + } else if (e.Length == 2 && var.ContainsKey(e.ToUpper())) { filterVar.Add(e.ToUpper()); filter.RemoveAt(i--); filterNames.Add(var[e.ToUpper()].Name);