diff --git a/Elwig/Windows/MemberAdminWindow.xaml b/Elwig/Windows/MemberAdminWindow.xaml index d16de83..2e486bb 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml +++ b/Elwig/Windows/MemberAdminWindow.xaml @@ -1,4 +1,5 @@ - - - + + diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index 2e881a1..4baf2f0 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -15,29 +15,29 @@ using Elwig.Documents; namespace Elwig.Windows { public partial class MemberAdminWindow : AdministrationWindow { - private List TextFilter = new(); + private List TextFilter = []; private readonly RoutedCommand CtrlF = new(); private readonly (ComboBox, TextBox, TextBox)[] PhoneNrInputs; - private static ObservableCollection> PhoneNrTypes { get; set; } = new() { + private static ObservableCollection> PhoneNrTypes { get; set; } = [ new("landline", "Tel.-Nr. (Festnetz)"), new("mobile", "Tel.-Nr. (mobil)"), new("fax", "Fax-Nr."), - }; + ]; public MemberAdminWindow() { InitializeComponent(); CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control)); CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput)); - ExemptInputs = new Control[] { + ExemptInputs = [ SearchInput, ActiveMemberInput, MemberList, - }; - RequiredInputs = new Control[] { + ]; + RequiredInputs = [ MgNrInput, GivenNameInput, FamilyNameInput, AddressInput, PlzInput, OrtInput, BillingOrtInput, BusinessSharesInput, BranchInput, DefaultKgInput - }; - PhoneNrInputs = new (ComboBox, TextBox, TextBox)[] { + ]; + PhoneNrInputs = [ (PhoneNr1TypeInput, PhoneNr1Input, PhoneNr1CommentInput), (PhoneNr2TypeInput, PhoneNr2Input, PhoneNr2CommentInput), (PhoneNr3TypeInput, PhoneNr3Input, PhoneNr3CommentInput), @@ -47,7 +47,7 @@ namespace Elwig.Windows { (PhoneNr7TypeInput, PhoneNr7Input, PhoneNr7CommentInput), (PhoneNr8TypeInput, PhoneNr8Input, PhoneNr8CommentInput), (PhoneNr9TypeInput, PhoneNr9Input, PhoneNr9CommentInput), - }; + ]; foreach (var input in PhoneNrInputs) input.Item1.ItemsSource = PhoneNrTypes; InitializeDelayTimer(SearchInput, SearchInput_TextChanged); @@ -57,8 +57,9 @@ namespace Elwig.Windows { private void Window_Loaded(object sender, RoutedEventArgs evt) { Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady; Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady; - Menu_Show_Memberdata.IsEnabled = App.IsPrintingReady; - Menu_Print_Memberdata.IsEnabled = App.IsPrintingReady; + Menu_Print_Letterheads_Plz.IsEnabled = App.IsPrintingReady; + Menu_Show_MemberDataSheet.IsEnabled = App.IsPrintingReady; + Menu_Print_MemberDataSheet.IsEnabled = App.IsPrintingReady; ActiveMemberInput.IsChecked = true; UpdatePhoneNrInputVisibility(); @@ -339,7 +340,7 @@ namespace Elwig.Windows { await PrintLetterheads(2); } - private async void Menu_Print_Memberdata_Click(object sender, RoutedEventArgs evt) { + private async void Menu_Print_MemberDataSheet_Click(object sender, RoutedEventArgs evt) { if (MemberList.SelectedItem is not Member m) return; Mouse.OverrideCursor = Cursors.AppStarting; @@ -353,7 +354,7 @@ namespace Elwig.Windows { } } - private async void Menu_Show_Memberdata_Click(object sender, RoutedEventArgs evt) { + private async void Menu_Show_MemberDataSheet_Click(object sender, RoutedEventArgs evt) { if (MemberList.SelectedItem is not Member m) return; Mouse.OverrideCursor = Cursors.AppStarting; @@ -649,8 +650,8 @@ namespace Elwig.Windows { Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0; Menu_Print_Letterhead.IsEnabled = true; - Menu_Show_Memberdata.IsEnabled = true; - Menu_Print_Memberdata.IsEnabled = true; + Menu_Show_MemberDataSheet.IsEnabled = true; + Menu_Print_MemberDataSheet.IsEnabled = true; FinishInputFilling(); } @@ -658,8 +659,8 @@ namespace Elwig.Windows { new protected void ClearInputs(bool validate = false) { Menu_Member_SendEmail.IsEnabled = false; Menu_Print_Letterhead.IsEnabled = false; - Menu_Show_Memberdata.IsEnabled = false; - Menu_Print_Memberdata.IsEnabled = false; + Menu_Show_MemberDataSheet.IsEnabled = false; + Menu_Print_MemberDataSheet.IsEnabled = false; StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -"; StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -"; StatusAreaCommitment.Text = "Gebundene Fläche: -";