Bump version to 0.10.8

CHANGELOG.md

@@ -3,6 +3,29 @@ Changelog
 =========
 
 
+[v0.10.8][v0.10.8] (2024-09-05) {#v0.10.8}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.8-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) gibt es eine neue Spalte `Datum` und es können alle Lesepläne nach z.B. einem Mitglied durchsucht werden. (a5638135a3, 7437187630)
+
+### Behobene Fehler {#v0.10.8-bugfixes}
+
+* Versuch 3: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8d9172f91e)
+
+### Sonstiges {#v0.10.8-misc}
+
+* Im Lieferjournal (`DeliveryJournal`) ist die Sortierung der Filter für das Gewicht korrigiert. (22514715c1)
+* In der Anmeldeliste (`DeliveryAncmtList`) wurde die Spalte `Anmldg.` zentriert. (f43d9c020c)
+* In Geschäftsdokumenten (`BusinessDocument`) wurden im Informationsblock `:` hinzugefügt. (26235f8c0a)
+* Im Mitgliedsstammdatenblat (`MemberDataSheet`) wird der USt.-Steuersatz zusätzlich zu _Buchführend: ja/nein_ angezeigt. (a04c7d538e)
+
+[v0.10.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.8
+
+
+
+
 [v0.10.7][v0.10.7] (2024-09-02) {#v0.10.7}
 ------------------------------------------
 
@@ -13,7 +36,7 @@ Changelog
 
 ### Behobene Fehler {#v0.10.7-bugfixes}
 
-* 2. Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12)
+* Versuch 2: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12)
 
 [v0.10.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.7
 

Elwig/App.xaml.cs

@@ -53,7 +53,7 @@ namespace Elwig {
         public static Dispatcher MainDispatcher { get; private set; }
         private DateTime LastChanged;
         private static DateTime CurrentLastWrite => File.GetLastWriteTime(Config.DatabaseFile);
-        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(5) };
+        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(2) };
 
         public App() : base() {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

Elwig/Documents/BusinessDocument.cs

@@ -22,9 +22,9 @@ namespace Elwig.Documents {
             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
                 $"</tbody></table>";
         }
 

Elwig/Documents/CreditNote.cs

@@ -54,9 +54,9 @@ namespace Elwig.Documents {
             }
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
-                $"<tr><th>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
+                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextCreditNote;
             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -35,7 +35,7 @@
                     <td class="number">@a.MgNr</td>
                     <td>@a.AdministrativeName</td>
                     <td>@a.Variety</td>
-                    <td class="small">@(a.Status ?? "-")</td>
+                    <td class="small center">@(a.Status ?? "-")</td>
                     <td class="number">@($"{a.Weight:N0}")</td>
                 </tr>
             }

Elwig/Documents/DeliveryNote.cs

@@ -23,9 +23,9 @@ namespace Elwig.Documents {
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
+                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
+                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;

Elwig/Documents/MemberDataSheet.cshtml

@@ -115,7 +115,7 @@
                 <th>Stammgemeinde:</th>
                 <td>@Model.Member.DefaultKg?.Name</td>
                 <th colspan="2">Buchführend:</th>
-                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
             </tr>
             <tr>
                 <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>

Elwig/Elwig.csproj

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

Elwig/Services/AreaComService.cs

@@ -100,39 +100,40 @@ namespace Elwig.Services {
         }
 
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            using var ctx = new AppDbContext();
             int newFbNr = (int)vm.FbNr!;
 
-            var a = new AreaCom {
-                FbNr = oldFbNr ?? newFbNr,
-                MgNr = (int)vm.MgNr!,
-                YearFrom = (int)vm.YearFrom!,
-                YearTo = vm.YearTo,
-                VtrgId = vm.AreaComType!.VtrgId,
-                CultId = vm.WineCult?.CultId,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                KgNr = vm.Kg!.KgNr,
-                RdNr = vm.Rd?.RdNr,
-                GstNr = vm.GstNr!.Trim(),
-                Area = (int)vm.Area!,
-            };
+            using (var ctx = new AppDbContext()) {
+                var a = new AreaCom {
+                    FbNr = oldFbNr ?? newFbNr,
+                    MgNr = (int)vm.MgNr!,
+                    YearFrom = (int)vm.YearFrom!,
+                    YearTo = vm.YearTo,
+                    VtrgId = vm.AreaComType!.VtrgId,
+                    CultId = vm.WineCult?.CultId,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    KgNr = vm.Kg!.KgNr,
+                    RdNr = vm.Rd?.RdNr,
+                    GstNr = vm.GstNr!.Trim(),
+                    Area = (int)vm.Area!,
+                };
 
-            if (vm.Rd?.RdNr == 0) {
-                vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
-                a.RdNr = vm.Rd.RdNr;
-                ctx.Add(vm.Rd);
-            }
+                if (vm.Rd?.RdNr == 0) {
+                    vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
+                    a.RdNr = vm.Rd.RdNr;
+                    ctx.Add(vm.Rd);
+                }
 
-            if (oldFbNr != null) {
-                ctx.Update(a);
-            } else {
-                ctx.Add(a);
-            }
+                if (oldFbNr != null) {
+                    ctx.Update(a);
+                } else {
+                    ctx.Add(a);
+                }
 
-            await ctx.SaveChangesAsync();
+                await ctx.SaveChangesAsync();
 
-            if (newFbNr != a.FbNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                if (newFbNr != a.FbNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                }
             }
 
             await App.HintContextChange();

Elwig/Services/DeliveryAncmtService.cs

@@ -46,7 +46,7 @@ namespace Elwig.Services {
                 deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == s.Year && a.DsNr == s.DsNr);
                 filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}");
             } else {
-                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason);
+                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0));
                 filterNames.Add($"{vm.FilterSeason}");
             }
 

Elwig/Services/DeliveryService.cs

@@ -389,11 +389,11 @@ namespace Elwig.Services {
                 if (filterOeLt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
 
                 if (filterWeightGt > 0 && filterWeightLt > 0) {
-                    filterNames.Insert(0, $"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
                 } else if (filterWeightGt > 0) {
-                    filterNames.Insert(0, $"ab {filterWeightGt:N0} kg");
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
                 } else if (filterWeightLt > 0) {
-                    filterNames.Insert(0, $"unter {filterWeightLt:N0} kg");
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
                 }
                 if (filterYearGt > 0 && filterYearLt > 0) {
                     filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");

Elwig/Services/MemberService.cs

@@ -502,126 +502,128 @@ namespace Elwig.Services {
         }
 
         public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
-            using var ctx = new AppDbContext();
             var newMgNr = (int)vm.MgNr!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                IsJuridicalPerson = vm.IsJuridicalPerson,
-                Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
-                Name = vm.Name!,
-                Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
-                ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,
 
-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+            using (var ctx = new AppDbContext()) {
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,
 
-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
 
-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                BusinessShares = (int)vm.BusinessShares!,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
-                IsFunktionär = vm.IsFunktionär,
-                ZwstId = vm.Branch?.ZwstId,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                ContactViaPost = vm.ContactViaPost,
-                ContactViaEmail = vm.ContactViaEmail,
-            };
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    IsBuchführend = vm.IsBuchführend,
+                    IsOrganic = vm.IsOrganic,
 
-            if (oldMgNr != null) {
-                ctx.Update(m);
-            } else {
-                ctx.Add(m);
-            }
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    BusinessShares = (int)vm.BusinessShares!,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsActive = vm.IsActive,
+                    IsVollLieferant = vm.IsVollLieferant,
+                    IsFunktionär = vm.IsFunktionär,
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };
 
-            ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
-            if (vm.BillingOrt != null && vm.BillingName != null) {
-                var p = vm.BillingOrt;
-                ctx.Add(new BillingAddr {
-                    MgNr = m.MgNr,
-                    FullName = vm.BillingName,
-                    Address = vm.BillingAddress ?? "",
-                    CountryNum = p.CountryNum,
-                    PostalDestId = p.Id,
-                });
-            }
+                if (oldMgNr != null) {
+                    ctx.Update(m);
+                } else {
+                    ctx.Add(m);
+                }
 
-            ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
-            ctx.AddRange(vm.PhoneNrs
-                .Where(input => input.Number != null && input.Number != "")
-                .Select((input, i) => new MemberTelNr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
-                    Number = input.Number!,
-                    Comment = input.Comment,
-                }));
+                ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
+                if (vm.BillingOrt != null && vm.BillingName != null) {
+                    var p = vm.BillingOrt;
+                    ctx.Add(new BillingAddr {
+                        MgNr = m.MgNr,
+                        FullName = vm.BillingName,
+                        Address = vm.BillingAddress ?? "",
+                        CountryNum = p.CountryNum,
+                        PostalDestId = p.Id,
+                    });
+                }
 
-            ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
-            ctx.AddRange(vm.EmailAddresses
-                .Where(input => input != null && input != "")
-                .Select((input, i) => new MemberEmailAddr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Address = input!,
-                    Comment = null,
-                }));
+                ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
+                ctx.AddRange(vm.PhoneNrs
+                    .Where(input => input.Number != null && input.Number != "")
+                    .Select((input, i) => new MemberTelNr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
+                        Number = input.Number!,
+                        Comment = input.Comment,
+                    }));
 
-            await ctx.SaveChangesAsync();
+                ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
+                ctx.AddRange(vm.EmailAddresses
+                    .Where(input => input != null && input != "")
+                    .Select((input, i) => new MemberEmailAddr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Address = input!,
+                        Comment = null,
+                    }));
 
-            if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
-                    .ToListAsync();
-
-                var fbNr = await ctx.NextFbNr();
-                ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
-                    FbNr = fbNr + i,
-                    MgNr = m.MgNr,
-                    VtrgId = c.VtrgId,
-                    CultId = c.CultId,
-                    Area = c.Area,
-                    KgNr = c.KgNr,
-                    GstNr = c.GstNr,
-                    RdNr = c.RdNr,
-                    YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
-                    YearTo = c.YearTo,
-                }));
-
-                foreach (var ac in areaComs)
-                    ac.YearTo = year - 1;
-                ctx.UpdateRange(areaComs);
                 await ctx.SaveChangesAsync();
-            }
-            vm.TransferPredecessorAreaComs = null;
 
-            if (vm.CancelAreaComs is int yearTo) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
-                    .ToListAsync();
+                if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
+                        .ToListAsync();
 
-                foreach (var ac in areaComs)
-                    ac.YearTo = yearTo;
-                ctx.UpdateRange(areaComs);
-                await ctx.SaveChangesAsync();
-            }
-            vm.CancelAreaComs = null;
+                    var fbNr = await ctx.NextFbNr();
+                    ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
+                        FbNr = fbNr + i,
+                        MgNr = m.MgNr,
+                        VtrgId = c.VtrgId,
+                        CultId = c.CultId,
+                        Area = c.Area,
+                        KgNr = c.KgNr,
+                        GstNr = c.GstNr,
+                        RdNr = c.RdNr,
+                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearTo = c.YearTo,
+                    }));
 
-            if (newMgNr != m.MgNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                    foreach (var ac in areaComs)
+                        ac.YearTo = year - 1;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.TransferPredecessorAreaComs = null;
+
+                if (vm.CancelAreaComs is int yearTo) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
+                        .ToListAsync();
+
+                    foreach (var ac in areaComs)
+                        ac.YearTo = yearTo;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.CancelAreaComs = null;
+
+                if (newMgNr != m.MgNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                }
             }
 
             await App.HintContextChange();

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

@@ -14,6 +14,8 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _filterOnlyUpcoming;
         [ObservableProperty]
+        private bool _filterFromAllSchedules;
+        [ObservableProperty]
         private string? _filterSeasonString;
         public int? FilterSeason {
             get => int.TryParse(FilterSeasonString, out var year) ? year : null;

Elwig/Windows/ChartWindow.xaml.cs

@@ -662,14 +662,15 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
             try {
-                using var ctx = new AppDbContext();
-                var origData = BillingData.FromJson(PaymentVar.Data);
-                var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
-                    AllVaributesAssigned, AllVaributesAssignedAbgew);
+                using (var ctx = new AppDbContext()) {
+                    var origData = BillingData.FromJson(PaymentVar.Data);
+                    var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
+                        AllVaributesAssigned, AllVaributesAssignedAbgew);
 
-                PaymentVar.Data = data.ToJsonString();
-                ctx.Update(PaymentVar);
-                await ctx.SaveChangesAsync();
+                    PaymentVar.Data = data.ToJsonString();
+                    ctx.Update(PaymentVar);
+                    await ctx.SaveChangesAsync();
+                }
                 LockContext = false;
                 await App.HintContextChange();
             } catch (Exception exc) {

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="{Binding Title}" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
+        Title="{Binding Title}" Height="720" Width="1150" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryAdminViewModel/>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -8,7 +8,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Traubenanmeldungen - Elwig" Height="700" Width="940" MinWidth="600" MinHeight="400"
+        Title="Traubenanmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryAncmtAdminViewModel/>
@@ -81,7 +81,7 @@
 
         <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="35"/>
+                <RowDefinition Height="42"/>
                 <RowDefinition Height="1*" MinHeight="100"/>
                 <RowDefinition Height="5"/>
                 <RowDefinition Height="2*" MinHeight="100"/>
@@ -94,7 +94,7 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
-                     Grid.ColumnSpan="3" Margin="5,5,174,0" IsReadOnly="False"
+                     Grid.ColumnSpan="3" Margin="5,10,174,0" IsReadOnly="False"
                      TextChanged="SearchInput_TextChanged">
                 <TextBox.ToolTip>
                     <TextBlock>
@@ -111,11 +111,14 @@
             </TextBox>
             <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
                                 Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
-                                Margin="5,5,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                Margin="5,10,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 TextChanged="SeasonInput_TextChanged"/>
             <CheckBox x:Name="OnlyUpcomingInput" Content="Nur zukünftige" IsChecked="{Binding FilterOnlyUpcoming, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
-                      HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      HorizontalAlignment="Right" Margin="0,7,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
                       Checked="OnlyUpcomingInput_Changed" Unchecked="OnlyUpcomingInput_Changed"/>
+            <CheckBox x:Name="FromAllSchedulesInput" Content="Alle Lesepläne" IsChecked="{Binding FilterFromAllSchedules, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
+                      HorizontalAlignment="Right" Margin="0,24,13.5,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      Checked="FromAllSchedulesInput_Changed" Unchecked="FromAllSchedulesInput_Changed"/>
 
             <ListBox x:Name="DeliveryScheduleList" SelectedItem="{Binding SelectedDeliverySchedule, Mode=TwoWay}" ItemsSource="{Binding DeliverySchedules, Mode=TwoWay}"
                      Grid.Row="1" Grid.ColumnSpan="3" Margin="5,0,5,5" VerticalAlignment="Stretch" IsEnabled="{Binding EnableSearchInputs}"
@@ -145,6 +148,13 @@
                       SelectionChanged="DeliveryAncmtList_SelectionChanged"
                       Margin="5,5,5,0" Grid.Row="3" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Schedule.Date, StringFormat='{}{0:dd.MM.yy}'}" Width="60">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                     <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
@@ -152,7 +162,7 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="160"/>
                     <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -25,7 +25,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlP, Menu_DeliveryAncmtList_ShowSelected_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_DeliveryAncmtList_PrintSelected_Click));
             ExemptInputs = [
-                SearchInput, SeasonInput, OnlyUpcomingInput, DeliveryScheduleList, DeliveryAncmtList,
+                SearchInput, SeasonInput, OnlyUpcomingInput, FromAllSchedulesInput, DeliveryScheduleList, DeliveryAncmtList,
             ];
             RequiredInputs = [
                 MgNrInput, MemberInput, DeliveryScheduleInput, SortIdInput, WineVarietyInput, WeightInput,
@@ -93,7 +93,7 @@ namespace Elwig.Windows {
                 .ToListAsync();
             ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
                 .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
-                .ToList(), DeliveryScheduleList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+                .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged);
         }
 
@@ -110,6 +110,7 @@ namespace Elwig.Windows {
                 var dict = deliveryAncmts.AsParallel()
                     .ToDictionary(a => a, a => a.SearchScore(filter))
                     .OrderByDescending(a => a.Value)
+                    .ThenBy(a => a.Key.Schedule.DateString)
                     .ThenBy(a => a.Key.Member.Name)
                     .ThenBy(a => a.Key.Member.GivenName)
                     .ThenBy(a => a.Key.Member.MgNr);
@@ -120,7 +121,8 @@ namespace Elwig.Windows {
                     .ToList();
             } else {
                 deliveryAncmts = deliveryAncmts
-                    .OrderBy(a => a.Member.Name)
+                    .OrderBy(a => a.Schedule.DateString)
+                    .ThenBy(a => a.Member.Name)
                     .ThenBy(a => a.Member.GivenName)
                     .ThenBy(a => a.Member.MgNr)
                     .ToList();
@@ -187,11 +189,13 @@ namespace Elwig.Windows {
                 Menu_DeliveryAncmtList_ShowSelected.IsEnabled = !IsEditing && !IsCreating;
                 Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = !IsEditing && !IsCreating;
                 Menu_DeliveryAncmtList_PrintSelected.IsEnabled = !IsEditing && !IsCreating;
+                ViewModel.FilterFromAllSchedules = false;
             } else {
                 Menu_DeliveryAncmtList_SaveSelected.IsEnabled = false;
                 Menu_DeliveryAncmtList_ShowSelected.IsEnabled = false;
                 Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = false;
                 Menu_DeliveryAncmtList_PrintSelected.IsEnabled = false;
+                ViewModel.FilterFromAllSchedules = true;
             }
         }
 
@@ -201,6 +205,16 @@ namespace Elwig.Windows {
 
         private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
             await RefreshDeliveryScheduleList();
+            await RefreshList(true);
+        }
+
+        private async void FromAllSchedulesInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ViewModel.FilterFromAllSchedules) {
+                DeliveryScheduleList.SelectedItem = null;
+            } else if (DeliveryScheduleList.SelectedItem == null) {
+                ViewModel.FilterFromAllSchedules = true;
+            }
+            await RefreshList(true);
         }
 
         private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -243,6 +257,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
             IsCreating = true;
             DeliveryAncmtList.IsEnabled = false;
+            var mgnr = ViewModel.MgNr;
             ViewModel.SelectedDeliveryAncmt = null;
 
             using var ctx = new AppDbContext();
@@ -259,6 +274,7 @@ namespace Elwig.Windows {
             ShowSaveResetCancelButtons();
             UnlockInputs();
             InitInputs();
+            ViewModel.MgNr = mgnr;
             ViewModel.EnableSearchInputs = false;
         }
 
@@ -337,6 +353,7 @@ namespace Elwig.Windows {
             await RefreshList();
             await RefreshInputs();
             ViewModel.SearchQuery = "";
+            ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
             if (sortid != null)
                 ControlUtils.SelectItemWithPk(DeliveryAncmtList, year, dsnr, mgnr, sortid);
         }

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -225,18 +225,21 @@ namespace Elwig.Windows {
 
         private async void AddButton_Click(object sender, RoutedEventArgs evt) {
             try {
-                using var ctx = new AppDbContext();
-                var v = new PaymentVar {
-                    Year = Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = "Neue Auszahlungsvariante",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
-                };
+                PaymentVar? v;
+                using (var ctx = new AppDbContext()) {
+                    v = new PaymentVar {
+                        Year = Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = "Neue Auszahlungsvariante",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                    };
+
+                    ctx.Add(v);
+                    await ctx.SaveChangesAsync();
+                }
 
-                ctx.Add(v);
-                await ctx.SaveChangesAsync();
                 await App.HintContextChange();
 
                 ControlUtils.SelectItem(PaymentVariantList, v);
@@ -250,18 +253,21 @@ namespace Elwig.Windows {
         private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
             try {
-                using var ctx = new AppDbContext();
-                var n = new PaymentVar {
-                    Year = orig.Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = $"{orig.Name} (Kopie)",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = orig.Data,
-                };
+                PaymentVar? n;
+                using (var ctx = new AppDbContext()) {
+                    n = new PaymentVar {
+                        Year = orig.Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = $"{orig.Name} (Kopie)",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = orig.Data,
+                    };
+
+                    ctx.Add(n);
+                    await ctx.SaveChangesAsync();
+                }
 
-                ctx.Add(n);
-                await ctx.SaveChangesAsync();
                 await App.HintContextChange();
 
                 ControlUtils.SelectItem(PaymentVariantList, n);
@@ -275,9 +281,10 @@ namespace Elwig.Windows {
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
             try {
-                using var ctx = new AppDbContext();
-                ctx.Remove(v);
-                await ctx.SaveChangesAsync();
+                using (var ctx = new AppDbContext()) {
+                    ctx.Remove(v);
+                    await ctx.SaveChangesAsync();
+                }
                 await App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;

Tests/HelperTests/BillingTest.cs

@@ -80,17 +80,17 @@ namespace Tests.HelperTests {
         }
 
         private Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
             return ctx.GetMemberAreaCommitmentBuckets(year, mgnr, Connection);
         }
 
         private Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
             return ctx.GetMemberDeliveryBuckets(year, mgnr, Connection);
         }
 
         private Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
             return ctx.GetMemberPaymentBuckets(year, mgnr, Connection);
         }