winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Update search

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-03-20 22:04:11 +01:00
parent 262db9e746
commit 23a57a7c06
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Elwig/Windows/MemberAdminWindow.xaml.cs
View File

@ -56,7 +56,11 @@ namespace Elwig.Windows {
private int CountMatchesInMember(Member m) { private int CountMatchesInMember(Member m) {
if (TextFilter.Count == 0) return 0; 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; int i = 0;
foreach (string? c in check) { foreach (string? c in check) {
if (c == null) continue; if (c == null) continue;
@ -88,12 +92,11 @@ namespace Elwig.Windows {
.Select(a => a.Key) .Select(a => a.Key)
.ToList(); .ToList();
} }
members = members.OrderBy(m => m.FamilyName + " " + m.GivenName).ToList();
MemberList.ItemsSource = members; MemberList.ItemsSource = members;
if (members.Count == 1) if (members.Count == 1)
MemberList.SelectedIndex = 0; MemberList.SelectedIndex = 0;
members = members.OrderBy(m => m.FamilyName + " " + m.GivenName).ToList();
RefreshInputs(); RefreshInputs();
} }
@ -278,7 +281,7 @@ namespace Elwig.Windows {
} }
private void SearchInput_TextChanged(object sender, RoutedEventArgs evt) { 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(); RefreshMemberListQuery();
} }