From 23a57a7c064701b5b89667bc8de3912fca91faac Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 20 Mar 2023 22:04:11 +0100 Subject: [PATCH] Update search --- Elwig/Windows/MemberAdminWindow.xaml.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index cc14fe1..62ba62e 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -56,7 +56,11 @@ namespace Elwig.Windows { private int CountMatchesInMember(Member m) { if (TextFilter.Count == 0) return 0; - string?[] check = new string?[] { m.MgNr.ToString(), m.FamilyName.ToLower(), m.GivenName.ToLower(), m.DefaultKg?.Name?.ToLower() }; + string?[] check = new string?[] { + m.MgNr.ToString(), + m.FamilyName.ToLower(), m.MiddleName?.ToLower(), m.GivenName.ToLower(), + m.BillingAddress?.Name.ToLower() + }; int i = 0; foreach (string? c in check) { if (c == null) continue; @@ -88,12 +92,11 @@ namespace Elwig.Windows { .Select(a => a.Key) .ToList(); } + members = members.OrderBy(m => m.FamilyName + " " + m.GivenName).ToList(); MemberList.ItemsSource = members; if (members.Count == 1) MemberList.SelectedIndex = 0; - members = members.OrderBy(m => m.FamilyName + " " + m.GivenName).ToList(); - RefreshInputs(); } @@ -278,7 +281,7 @@ namespace Elwig.Windows { } private void SearchInput_TextChanged(object sender, RoutedEventArgs evt) { - TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(s => s.Length >= 3 || s.All(c => char.IsDigit(c))); + TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(s => s.Length >= 2 || s.All(c => char.IsDigit(c))); RefreshMemberListQuery(); }