From 55c447621b91e0f7edf2ee3d0692dd2b8272417b Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 29 Feb 2024 16:14:13 +0100 Subject: [PATCH] Windows: Get rid of more warnings --- Elwig/Windows/BaseDataWindow.xaml.Mod.cs | 4 ++-- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Elwig/Windows/BaseDataWindow.xaml.Mod.cs b/Elwig/Windows/BaseDataWindow.xaml.Mod.cs index 965c7a7..2f51ace 100644 --- a/Elwig/Windows/BaseDataWindow.xaml.Mod.cs +++ b/Elwig/Windows/BaseDataWindow.xaml.Mod.cs @@ -52,13 +52,13 @@ namespace Elwig.Windows { var year = (SeasonList.SelectedItem as Season)?.Year; foreach (var (modid, _) in _mods.Where(m => m.Value == null)) { - Context.Remove(Context.Modifiers.Find(year, modid)); + Context.Remove(Context.Modifiers.Find(year, modid)!); } foreach (var (mod, old) in _modIds) { mod.ModId = old; } foreach (var (old, modid) in _mods.Where(m => m.Value != null)) { - Context.Update(Context.Modifiers.Find(year, old)); + Context.Update(Context.Modifiers.Find(year, old)!); } await Context.SaveChangesAsync(); diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 24b7fc5..1eae738 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -469,8 +469,8 @@ namespace Elwig.Windows { var s = date.ToString("yyyy-MM-dd"); filterDate.Add((s, s)); filter.RemoveAt(i--); - if (filterNames.Contains(SeasonInput.Value.ToString()) && SeasonInput.Value == date.Year) - filterNames.Remove(SeasonInput.Value.ToString()); + if (filterNames.Contains(SeasonInput.Value.ToString()!) && SeasonInput.Value == date.Year) + filterNames.Remove(SeasonInput.Value.ToString()!); filterNames.Add(date.ToString("dd.MM.yyyy")); } else if (Utils.DateFromToRegex.IsMatch(e)) { var parts = e.Split("-"); @@ -482,11 +482,11 @@ namespace Elwig.Windows { filter.RemoveAt(i--); var n = string.Join('.', s.Split('-').Reverse()); if (dParts[2] == "") { - filterNames.Remove(SeasonInput.Value.ToString()); + filterNames.Remove(SeasonInput.Value.ToString()!); filterNames.Add(n + SeasonInput.Value.ToString()); } else { if (SeasonInput.Value.ToString() == dParts[2]) - filterNames.Remove(SeasonInput.Value.ToString()); + filterNames.Remove(SeasonInput.Value.ToString()!); filterNames.Add(n); } } else if (parts.Length == 2) { @@ -917,17 +917,17 @@ namespace Elwig.Windows { } else if (IsCreating || InputHasChanged(TimeInput)) { d.TimeString = (TimeInput.Text != "") ? TimeInput.Text + ":00" : null; } - d.ZwstId = (BranchInput.SelectedItem as Branch)?.ZwstId; + d.ZwstId = (BranchInput.SelectedItem as Branch)!.ZwstId; d.LsNr = LsNrInput.Text; d.MgNr = int.Parse(MgNrInput.Text); d.Comment = (CommentInput.Text == "") ? null : CommentInput.Text; - p.SortId = (WineVarietyInput.SelectedItem as WineVar)?.SortId; + p.SortId = (WineVarietyInput.SelectedItem as WineVar)!.SortId; p.AttrId = (AttributeInput.SelectedItem as WineAttr)?.AttrId; p.CultId = (CultivationInput.SelectedItem as WineCult)?.CultId; p.Kmw = double.Parse(GradationKmwInput.Text); - p.QualId = (WineQualityLevelInput.SelectedItem as WineQualLevel)?.QualId; - p.HkId = (WineOriginInput.SelectedItem as WineOrigin)?.HkId; + p.QualId = (WineQualityLevelInput.SelectedItem as WineQualLevel)!.QualId; + p.HkId = (WineOriginInput.SelectedItem as WineOrigin)!.HkId; p.KgNr = (WineKgInput.SelectedItem as AT_Kg)?.KgNr; p.RdNr = (WineRdInput.SelectedItem as WbRd)?.RdNr;