diff --git a/Elwig/Windows/AreaComAdminWindow.xaml.cs b/Elwig/Windows/AreaComAdminWindow.xaml.cs index 7f33022..ee3b583 100644 --- a/Elwig/Windows/AreaComAdminWindow.xaml.cs +++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs @@ -156,7 +156,7 @@ namespace Elwig.Windows { AreaInput.Text = a.Area.ToString(); AreaComTypeInput.SelectedItem = a.AreaComType; - WineCultivationInput.SelectedItem = a.WineCult; + WineCultivationInput.SelectedItem = a.WineCult ?? WineCultivationInput.Items[0]; CommentInput.Text = a.Comment; @@ -179,7 +179,9 @@ namespace Elwig.Windows { await base.OnRenewContext(); ControlUtils.RenewItemsSource(KgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr); ControlUtils.RenewItemsSource(AreaComTypeInput, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), i => (i as AreaComType)?.VtrgId); - ControlUtils.RenewItemsSource(WineCultivationInput, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), i => (i as WineCult)?.CultId); + var cultList = await Context.WineCultivations.OrderBy(c => c.Name).Cast().ToListAsync(); + cultList.Insert(0, new NullItem()); + ControlUtils.RenewItemsSource(WineCultivationInput, cultList, i => (i as WineCult)?.CultId); await RefreshAreaCommitmentList(); }