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

[#15] MailWindow: Small quality fixes

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-02-29 11:19:51 +01:00
parent 09a739d135
commit 624c9a6b34
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/App.xaml.cs
View File

@ -252,7 +252,7 @@ namespace Elwig {
} }
public static MailWindow FocusMailWindow(int? year = null) { public static MailWindow FocusMailWindow(int? year = null) {
return FocusWindow<MailWindow>(() => new(year)); return FocusWindow<MailWindow>(() => new(year), w => year == null || w.Year == year);
} }
} }
} }

6
Elwig/Windows/MailWindow.xaml.cs
View File

@ -52,7 +52,7 @@ namespace Elwig.Windows {
CreditNote.Name, CreditNote.Name,
]; ];
protected readonly int? Year; public readonly int? Year;
public ObservableCollection<SelectedDoc> SelectedDocs = []; public ObservableCollection<SelectedDoc> SelectedDocs = [];
public IEnumerable<Member> Recipients = []; public IEnumerable<Member> Recipients = [];
@ -102,7 +102,7 @@ namespace Elwig.Windows {
public MailWindow(int? year = null) { public MailWindow(int? year = null) {
InitializeComponent(); InitializeComponent();
Year = year ?? Context.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year; Year = year ?? Context.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year;
Title = $"Rundschreiben {Year} - Elwig"; Title = $"Rundschreiben - Lese {Year} - Elwig";
AvaiableDocumentsList.ItemsSource = AvaiableDocuments; AvaiableDocumentsList.ItemsSource = AvaiableDocuments;
SelectedDocumentsList.ItemsSource = SelectedDocs; SelectedDocumentsList.ItemsSource = SelectedDocs;
@ -559,7 +559,7 @@ namespace Elwig.Windows {
public void AddDeliveryConfirmation() { public void AddDeliveryConfirmation() {
AvaiableDocumentsList.SelectedIndex = 1; AvaiableDocumentsList.SelectedIndex = 1;
if (AvaiableDocumentsList.SelectedItem is not string s) if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation))
return; return;
SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, ((int)Year!, DocumentNonDeliverersInput.IsChecked == true))); SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, ((int)Year!, DocumentNonDeliverersInput.IsChecked == true)));
SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1; SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;