Bump version to 0.9.3

CHANGELOG.md

@@ -3,6 +3,31 @@ Changelog
 =========
 
 
+[v0.9.3][v0.9.3] (2024-08-02) {#v0.9.3}
+---------------------------------------
+
+### Sonstiges {#v0.9.3-misc}
+
+* Das Lieferjournal als Excel-Liste beinhaltet nun auch Liefer-Zweigstelle und Stamm-Zweigstelle des Liefernaten. (cf05a0c658)
+
+[v0.9.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.3
+
+
+
+
+[v0.9.2][v0.9.2] (2024-08-01) {#v0.9.2}
+---------------------------------------
+
+### Behobene Fehler {#v0.9.2-bugfixes}
+
+* Verhalten beim Schließen des Haupt-Fensters (`MainWindow`) nicht immer richtig. (8db6007264)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) führt beim Erstellen eines Mitglied das Eingeben einer Tel.-Nr. zu einem Fehler. (4403754ada)
+
+[v0.9.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.2
+
+
+
+
 [v0.9.1][v0.9.1] (2024-08-01) {#v0.9.1}
 ---------------------------------------
 

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -49,7 +49,7 @@
                 <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th style="overflow: visible;">Nto./bto.-Zuschl:</th>
+                <th style="overflow: visible;">Rebel-Zuschl.:</th>
                 <td colspan="3" class="center">
                     @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
                     @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.9.1</Version>
+    <Version>0.9.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Elwig/Helpers/Utils.cs

@@ -197,7 +197,7 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
-            MailTo(new string[] { emailAddress });
+            MailTo([emailAddress]);
         }
 
         public static void MailTo(IEnumerable<string> emailAddresses) {

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -14,16 +14,18 @@ namespace Elwig.Models.Dtos {
             ("Pos", "Pos.", null, 10),
             ("Date", "Datum", null, 20),
             ("Time", "Zeit", null, 20),
+            ("DeliveryBranch", "Zweigstelle", null, 30),
             ("MgNr", "MgNr.", null, 12),
             ("Name1", "Name", null, 40),
             ("Name2", "Vorname", null, 40),
+            ("MemberBranch", "Stamm-Zwst.", null, 30),
             ("SortId", "Sorte", null, 10),
             ("AttrId", "Attr.", null, 15),
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qualität", null, 15),
             ("Gradation", "Gradation", "°Oe|°KMW", 40),
             ("Weight", "Gewicht", "kg", 20),
-            ("NetGross", "bto./nto.", null, 20),
+            ("IsNetWeight", "Gerebelt", null, 20),
             ("HkId", "Herkunft", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 40),
             ("Comment", "Anmerkung", null, 60),
@@ -35,7 +37,7 @@ namespace Elwig.Models.Dtos {
 
         public static async Task<DeliveryJournalData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
             return new((await query
-                .Include(p => p.Delivery.Member)
+                .Include(p => p.Delivery.Member.Branch)
                 .Include(p => p.Delivery.Branch)
                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                 .Include(p => p.Variety)
@@ -53,10 +55,12 @@ namespace Elwig.Models.Dtos {
         public int Pos;
         public DateOnly Date;
         public TimeOnly? Time;
+        public string DeliveryBranch;
         public int MgNr;
         public string Name1;
         public string Name2;
         public string AdministrativeName;
+        public string? MemberBranch;
         public string SortId;
         public string Variety;
         public string? AttrId;
@@ -71,7 +75,6 @@ namespace Elwig.Models.Dtos {
         public double Oe => Gradation.Oe;
         public int Weight { get; set; }
         public bool IsNetWeight;
-        public string NetGross => IsNetWeight ? "n" : "b";
         public string? Modifiers;
         public string? Comment;
 
@@ -83,10 +86,12 @@ namespace Elwig.Models.Dtos {
             Pos = p.DPNr;
             Date = d.Date;
             Time = d.Time;
+            DeliveryBranch = d.Branch.Name;
             MgNr = m.MgNr;
             Name1 = m.FamilyName;
             Name2 = m.AdministrativeName2;
             AdministrativeName = m.AdministrativeName;
+            MemberBranch = m.Branch?.Name;
 
             SortId = p.SortId;
             Variety = p.Variety.Name;

Elwig/Services/MemberService.cs

@@ -549,7 +549,7 @@ namespace Elwig.Services {
 
             ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
             ctx.AddRange(vm.PhoneNrs
-                .Where(input => input.Number != null)
+                .Where(input => input.Number != null && input.Number != "")
                 .Select((input, i) => new MemberTelNr {
                     MgNr = m.MgNr,
                     Nr = i + 1,

Elwig/Windows/AdministrationWindow.cs

@@ -402,7 +402,7 @@ namespace Elwig.Windows {
 
         protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
             if (DoShowWarningWindows && !res.IsValid && !IsClosing && (IsEditing || IsCreating))
-                MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
+                MessageBox.Show(res.ErrorContent?.ToString(), msg ?? res.ErrorContent?.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
             return res.IsValid;
         }
 

Elwig/Windows/MainWindow.xaml.cs

@@ -13,6 +13,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -37,13 +38,21 @@ namespace Elwig.Windows {
         }
 
         private void Window_Closing(object sender, CancelEventArgs evt) {
-            if (App.NumWindows > 1 && !App.ForceShutdown && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
-                var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
-                    "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-                if (res != MessageBoxResult.Yes) {
-                    evt.Cancel = true;
-                } else {
-                    Application.Current.Shutdown();
+            if (App.NumWindows > 1 && !App.ForceShutdown) {
+                foreach (var w in App.Current.Windows.Cast<Window>().Where(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                    try {
+                        w.Close();
+                    } catch { }
+                }
+                Thread.Sleep(100);
+                if (App.NumWindows > 1 && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                    var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
+                        "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                    if (res != MessageBoxResult.Yes) {
+                        evt.Cancel = true;
+                    } else {
+                        Application.Current.Shutdown();
+                    }
                 }
             }
         }