From d87f3ce6a689b9f1bb0b4fec762fec0760ebf05f Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Wed, 27 Mar 2024 16:24:29 +0100 Subject: [PATCH] DeliveryAdminWindow: Include more data when refreshing list --- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index aaae88f..8c96b29 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -779,8 +779,11 @@ namespace Elwig.Windows { using var ctx = new AppDbContext(); var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await GetFilters(ctx); var deliveries = await deliveryQuery - .Include(d => d.Parts).ThenInclude(p => p.PartModifiers) - .ThenInclude(m => m.Modifier) + .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier) + .Include(d => d.Parts).ThenInclude(p => p.Attribute) + .Include(d => d.Parts).ThenInclude(p => p.Cultivation) + .Include(d => d.Parts).ThenInclude(p => p.Variety) + .Include(d => d.Member.EmailAddresses) .AsSplitQuery() .ToListAsync(); deliveries.Reverse(); @@ -1253,11 +1256,11 @@ namespace Elwig.Windows { private async void DeliveryList_SelectionChanged(object sender, SelectionChangedEventArgs evt) { await RefreshDeliveryParts(); - if (DeliveryList.SelectedItem != null) { + if (DeliveryList.SelectedItem is Delivery d) { DeleteDeliveryButton.IsEnabled = true; Menu_DeliveryNote_Show.IsEnabled = !IsEditing && !IsCreating; Menu_DeliveryNote_Print.IsEnabled = !IsEditing && !IsCreating; - Menu_DeliveryNote_Email.IsEnabled = !IsEditing && !IsCreating; + Menu_DeliveryNote_Email.IsEnabled = !IsEditing && !IsCreating && App.Config.Smtp != null && d.Member.EmailAddresses.Count > 0; } else { DeleteDeliveryButton.IsEnabled = false; Menu_DeliveryNote_Show.IsEnabled = false;