From 17d00a8524f428ecb74015bbb06cb704efc846c4 Mon Sep 17 00:00:00 2001 From: Thomas Hilscher Date: Thu, 30 Nov 2023 01:44:01 +0100 Subject: [PATCH] MemberAdminWindow: Add member data sheet show button --- Elwig/Documents/MemberDataSheet.cshtml | 4 ++-- Elwig/Windows/MemberAdminWindow.xaml | 3 ++- Elwig/Windows/MemberAdminWindow.xaml.cs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Elwig/Documents/MemberDataSheet.cshtml b/Elwig/Documents/MemberDataSheet.cshtml index af70cfb..98b6675 100644 --- a/Elwig/Documents/MemberDataSheet.cshtml +++ b/Elwig/Documents/MemberDataSheet.cshtml @@ -16,7 +16,7 @@ Mitglieds-Nr. @Model.Member.MgNr Vorgänger MgNr. - @(Model.Member.PredecessorMgNr != null ? Model.Member.PredecessorMgNr : "-") + @Model.Member.PredecessorMgNr Titel (vorangestellt) @@ -36,7 +36,7 @@ Geburtsjahr/-tag - @(Model.Member.Birthday == null ? "-" : string.Join('.', Model.Member.Birthday.Split('-').Reverse())) + @(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse()??Array.Empty())) diff --git a/Elwig/Windows/MemberAdminWindow.xaml b/Elwig/Windows/MemberAdminWindow.xaml index 1af994b..d16de83 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml +++ b/Elwig/Windows/MemberAdminWindow.xaml @@ -53,7 +53,8 @@ - + + diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index c6ca2d3..2e881a1 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -57,6 +57,8 @@ 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; ActiveMemberInput.IsChecked = true; UpdatePhoneNrInputVisibility(); @@ -351,6 +353,16 @@ namespace Elwig.Windows { } } + private async void Menu_Show_Memberdata_Click(object sender, RoutedEventArgs evt) { + if (MemberList.SelectedItem is not Member m) + return; + Mouse.OverrideCursor = Cursors.AppStarting; + using var doc = new MemberDataSheet(m, Context); + await doc.Generate(); + Mouse.OverrideCursor = null; + doc.Show(); + } + private void FocusSearchInput(object sender, RoutedEventArgs evt) { if (!IsEditing && !IsCreating) { SearchInput.Focus(); @@ -637,6 +649,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; FinishInputFilling(); } @@ -644,6 +658,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; StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -"; StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -"; StatusAreaCommitment.Text = "Gebundene Fläche: -";