From 42bf01656e71f4855465a112408540d55b2e60b1 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Fri, 19 Jan 2024 00:19:59 +0100 Subject: [PATCH] Some Bugfixes --- Elwig/Dialogs/AbwertenDialog.xaml.cs | 2 +- Elwig/Models/Dtos/DeliveryConfirmationData.cs | 4 ++++ Elwig/Windows/BaseDataWindow.xaml.Branch.cs | 1 + Elwig/Windows/BaseDataWindow.xaml.Mod.cs | 9 +++++---- Elwig/Windows/BaseDataWindow.xaml.cs | 2 ++ Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs | 2 +- Elwig/Windows/PaymentVariantsWindow.xaml.cs | 8 ++++++-- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Elwig/Dialogs/AbwertenDialog.xaml.cs b/Elwig/Dialogs/AbwertenDialog.xaml.cs index cacae5e..50396e9 100644 --- a/Elwig/Dialogs/AbwertenDialog.xaml.cs +++ b/Elwig/Dialogs/AbwertenDialog.xaml.cs @@ -12,7 +12,7 @@ namespace Elwig.Dialogs { InitializeComponent(); TextLsNr.Text = lsnr; TextMember.Text = name; - TextWeight.Text = $"{weight:N0}{Utils.GroupSeparator}kg"; + TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg"; } private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { diff --git a/Elwig/Models/Dtos/DeliveryConfirmationData.cs b/Elwig/Models/Dtos/DeliveryConfirmationData.cs index a81af4c..2db9c14 100644 --- a/Elwig/Models/Dtos/DeliveryConfirmationData.cs +++ b/Elwig/Models/Dtos/DeliveryConfirmationData.cs @@ -26,6 +26,10 @@ namespace Elwig.Models.Dtos { MgNr = m.MgNr; } + public static DeliveryConfirmationData CreateEmpty(int year, Member m) { + return new([], year, m); + } + public static async Task> ForSeason(DbSet table, int year) { return (await FromDbSet(table, year)) .GroupBy( diff --git a/Elwig/Windows/BaseDataWindow.xaml.Branch.cs b/Elwig/Windows/BaseDataWindow.xaml.Branch.cs index d03b8c3..0955000 100644 --- a/Elwig/Windows/BaseDataWindow.xaml.Branch.cs +++ b/Elwig/Windows/BaseDataWindow.xaml.Branch.cs @@ -125,6 +125,7 @@ namespace Elwig.Windows { if (old != null) _branches[old] = id; branch.ZwstId = id; branch.Name = BranchNameInput.Text; + branch.CountryNum = 40; branch.PostalDestId = (BranchOrtInput.SelectedItem as AT_PlzDest)?.Id; branch.Address = BranchAddressInput.Text; branch.PhoneNr = BranchPhoneNrInput.Text; diff --git a/Elwig/Windows/BaseDataWindow.xaml.Mod.cs b/Elwig/Windows/BaseDataWindow.xaml.Mod.cs index 31193eb..5c1e520 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(new object?[] { 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(new object?[] { year, old })); + Context.Update(Context.Modifiers.Find(year, old)); } await Context.SaveChangesAsync(); @@ -102,8 +102,9 @@ namespace Elwig.Windows { if (_modList == null || SeasonList.SelectedItem is not Season s) return; _modChanged = true; var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : _modList.Count; - var item = Context.CreateProxy(); - item.Year = s.Year; + var item = new Modifier { + Year = s.Year + }; _modList.Insert(idx, item); SeasonModifierList.SelectedIndex = idx; UpdateButtons(); diff --git a/Elwig/Windows/BaseDataWindow.xaml.cs b/Elwig/Windows/BaseDataWindow.xaml.cs index 95ed6dd..4a11df1 100644 --- a/Elwig/Windows/BaseDataWindow.xaml.cs +++ b/Elwig/Windows/BaseDataWindow.xaml.cs @@ -264,6 +264,8 @@ namespace Elwig.Windows { ClearInputStates(); FillInputs(App.Client); LockInputs(); + + await HintContextChange(); } private void FillInputs(ClientParameters p) { diff --git a/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs index 7ffec00..ba3d314 100644 --- a/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs +++ b/Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs @@ -76,7 +76,7 @@ namespace Elwig.Dialogs { IEnumerable list = await members.ToListAsync(); var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year); using var doc = Document.Merge(list.Select(m => - new DeliveryConfirmation(Context, Year, m, data[m.MgNr]) { + new DeliveryConfirmation(Context, Year, m, data.TryGetValue(m.MgNr, out var d) ? d : DeliveryConfirmationData.CreateEmpty(Year, m)) { //DoubleSided = true } )); diff --git a/Elwig/Windows/PaymentVariantsWindow.xaml.cs b/Elwig/Windows/PaymentVariantsWindow.xaml.cs index 28355e8..f398e74 100644 --- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs +++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs @@ -259,8 +259,12 @@ namespace Elwig.Windows { return; CommitButton.IsEnabled = false; Mouse.OverrideCursor = Cursors.AppStarting; - var b = new BillingVariant(v.Year, v.AvNr); - await b.Commit(); + try { + var b = new BillingVariant(v.Year, v.AvNr); + await b.Commit(); + } catch (Exception exc) { + MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); + } Mouse.OverrideCursor = null; RevertButton.IsEnabled = true; await App.HintContextChange();