[WIP] Models/Entities: Remove EF proxies

Elwig/App.xaml.cs

@@ -6,6 +6,7 @@ using Elwig.Helpers.Printing;
 using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
 using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -104,7 +105,9 @@ namespace Elwig {
 
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
-                branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
+                branches = ctx.Branches
+                    .Include(b => b.PostalDest)
+                    .ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
                 try {
                     Client = new(ctx);
                 } catch (Exception e) {
@@ -218,7 +221,8 @@ namespace Elwig {
             MainDispatcher.Invoke(() => {
                 foreach (Window w in CurrentApp.Windows) {
                     if (w is not ContextWindow c) continue;
-                    MainDispatcher.BeginInvoke(c.HintContextChange);
+                    MainDispatcher.Invoke(c.HintContextChange);
+                    MainDispatcher.BeginInvoke(c.TryContextReload);
                 }
             });
         }

Elwig/Controls/IntegerUpDown.cs

@@ -41,13 +41,21 @@ namespace Elwig.Controls {
             incButton!.Click += IncrementButton_Click;
             decButton!.Click += DecrementButton_Click;
             base.OnApplyTemplate();
+            UpdateButtons();
+        }
+
+        private void UpdateButtons() {
+            var incButton = GetTemplateChild("IncrementButton") as RepeatButton;
+            var decButton = GetTemplateChild("DecrementButton") as RepeatButton;
+            incButton?.IsEnabled = Maximum == null || Value < Maximum;
+            decButton?.IsEnabled = Minimum == null || Value > Minimum;
         }
 
         private void IntegerUpDown_TextChanged(object sender, TextChangedEventArgs evt) {
             var idx = CaretIndex;
-            Text = new string(Text.Where(char.IsAsciiDigit).Take(4).ToArray());
+            Text = new string([.. Text.Where(char.IsAsciiDigit).Take(4)]);
             CaretIndex = idx;
-            evt.Handled = !(Value >= Minimum && Value <= Maximum);
+            evt.Handled = !((!Minimum.HasValue || Value >= Minimum) && (!Maximum.HasValue || Value <= Maximum));
             if (idx >= 4) {
                 if (Value < Minimum) {
                     Value = Minimum;
@@ -56,6 +64,7 @@ namespace Elwig.Controls {
                 }
                 CaretIndex = 4;
             }
+            UpdateButtons();
         }
 
         private void IntegerUpDown_LostFocus(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -1,4 +1,5 @@
 using Elwig.Helpers;
+using System;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -12,23 +13,27 @@ namespace Elwig.Dialogs {
         public string OrigYearTo { get; set; }
         public string Area { get; set; }
 
-        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete) {
+        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete, bool forceRetroactive = false) {
             Area = $"{area:N0}";
             OrigYearFrom = $"{yearFrom}";
             OrigYearTo = $"{yearTo}";
             InitializeComponent();
             Title = delete ? "Flächenbindung löschen" : "Flächenbindung bearbeiten";
             RetroactiveInput.Content = delete ? "Rückwirkend löschen" : "Rückwirkend bearbeiten";
+            forceRetroactive = forceRetroactive || yearFrom.HasValue && yearTo.HasValue && yearFrom.Value == yearTo.Value;
+            RetroactiveInput.IsEnabled = !forceRetroactive;
             if (delete) {
                 QuestionBlock1.Visibility = Visibility.Hidden;
                 QuestionBlock2.Visibility = Visibility.Visible;
                 DescBlock1.Visibility = Visibility.Hidden;
                 DescBlock2.Visibility = Visibility.Visible;
             }
-            if ((yearTo.HasValue && yearTo < Utils.CurrentNextSeason) || (yearFrom.HasValue && yearFrom >= Utils.CurrentNextSeason)) {
+            SeasonInput.Minimum = yearFrom.HasValue ? yearFrom + 1 : null;
+            SeasonInput.Maximum = yearTo.HasValue ? yearTo : null;
+            if (forceRetroactive || (yearTo.HasValue && yearTo < Utils.CurrentYear) || (yearFrom.HasValue && yearFrom >= Utils.CurrentYear)) {
                 RetroactiveInput.IsChecked = true;
             } else {
-                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+                SeasonInput.Text = $"{Utils.CurrentYear}";
             }
         }
 
@@ -48,7 +53,7 @@ namespace Elwig.Dialogs {
                 DescBlock2.Visibility = Visibility.Hidden;
             } else {
                 SeasonInput.IsEnabled = true;
-                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+                SeasonInput.Text = $"{Math.Max(SeasonInput.Minimum ?? Utils.CurrentYear, Utils.CurrentYear)}";
                 DescBlock1.Visibility = QuestionBlock1.Visibility;
                 DescBlock2.Visibility = QuestionBlock2.Visibility;
             }

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -8,7 +8,7 @@
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="260" Width="450">
+        Title="Flächenbindungen übertragen" Height="240" Width="450">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -48,12 +48,8 @@
                             Minimum="1900" Maximum="9999"
                             HorizontalAlignment="Center" VerticalAlignment="Top"
                             TextChanged="SeasonInput_TextChanged"/>
-        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
-                  HorizontalAlignment="Center" VerticalAlignment="Top"
-                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
-                  IsChecked="{Binding MaintainYearFrom}"/>
 
-        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,90,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
             Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
             und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

@@ -5,51 +5,51 @@ using System.Windows.Controls;
 namespace Elwig.Dialogs {
     public partial class AreaComTransferDialog : Window {
 
-        public int CancelSeason { get; set; }
-        public int SuccessorSeason => CancelSeason + 1;
-        public bool MaintainYearFrom { get; set; }
+        public int CancelSeason => SuccessorSeason - 1;
+        public int SuccessorSeason { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
 
         public AreaComTransferDialog(string name, int areaComNum, int area) {
-            CancelSeason = Utils.FollowingSeason - 1;
+            SuccessorSeason = Utils.FollowingSeason;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
-            SeasonInput.Text = $"{CancelSeason}";
+            SeasonInput.Text = $"{SuccessorSeason}";
+            SeasonInput.Minimum = Utils.CurrentLastSeason;
             Title = $"Aktive Flächenbindungen kündigen - {name}";
             QuestionBlock1.Visibility = Visibility.Hidden;
             QuestionBlock2.Visibility = Visibility.Visible;
             DescBlock1.Visibility = Visibility.Hidden;
             DescBlock2.Visibility = Visibility.Visible;
-            CopyYearToInput.Visibility = Visibility.Hidden;
             Height = 240;
             SeasonInput.Margin = new(0, 40, 0, 0);
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
         public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
-            CancelSeason = Utils.FollowingSeason - 1;
+            SuccessorSeason = Utils.FollowingSeason;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
-            SeasonInput.Text = $"{CancelSeason}";
+            SeasonInput.Text = $"{SuccessorSeason}";
+            SeasonInput.Minimum = Utils.CurrentLastSeason;
             Title = $"Aktive Flächenbindungen übertragen - {name} - {successorName}";
             InfoBlock.Visibility = Visibility.Hidden;
         }
 
         private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            CancelSeason = (int)SeasonInput.Value!;
+            SuccessorSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            TransferSeason.Text = $"{SuccessorSeason}";
+            DescBlock1Season.Text = "inkl. Saison ";
         }
 
         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
-            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            TransferSeason.Text = $"{SuccessorSeason}";
+            DescBlock1Season.Text = "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/DeliverySplittingDialog.xaml.cs

@@ -52,7 +52,6 @@ namespace Elwig.Dialogs {
             ControlUtils.RenewItemsSource(DeliveryInput, await ctx.Deliveries
                 .Where(d => d.DateString == $"{_delivery.Date:yyyy-MM-dd}" && d.ZwstId == _delivery.ZwstId)
                 .OrderBy(d => d.LsNr)
-                .Include(d => d.Member)
                 .Include(d => d.Parts)
                 .ToListAsync());
             if (DeliveryInput.SelectedItem == null)

Elwig/Documents/BusinessDocument.cs

@@ -261,7 +261,7 @@ namespace Elwig.Documents {
         }
 
         protected Table NewBucketTable(
-            Season season, Dictionary<string, MemberBucket> buckets,
+            Season season, Dictionary<string, MemberBucket> buckets, int deliveredWeight,
             bool includeDelivery = true, bool includePayment = false,
             bool isTiny = false, IEnumerable<string>? filter = null
         ) {
@@ -315,10 +315,8 @@ namespace Elwig.Documents {
                 .OrderBy(b => b.Value.Name);
 
             tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
-            tbl.AddCells(FormatRow(Member.BusinessShares * season.MinKgPerBusinessShare,
-                    Member.BusinessShares * season.MaxKgPerBusinessShare,
-                    season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
-                    isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
+            tbl.AddCells(FormatRow(Member.BusinessShares * season.MinKgPerBusinessShare, Member.BusinessShares * season.MaxKgPerBusinessShare,
+                    deliveredWeight, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
 
             if (fbs.Any()) {
                 tbl.AddCell(NewBucketSubHdr("Flächenbindungen" + (vtr.Any() ? " (inkl. Verträge)" : "") + ":", includePayment ? 8 : 7, isTiny: isTiny));

Elwig/Documents/CreditNote.cs

@@ -1,55 +1,82 @@
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class CreditNote : BusinessDocument {
 
         public new static string Name => "Traubengutschrift";
 
-        public PaymentMember? Payment;
+        public PaymentMember Payment;
         public Credit? Credit;
-        public CreditNoteDeliveryData Data;
         public string? Text;
         public string CurrencySymbol;
         public int Precision;
-        public string MemberModifier;
+        public string? MemberModifier;
         public List<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
         public int MemberAutoBusinessShares;
         public decimal MemberAutoBusinessSharesAmount;
         public PaymentCustom? CustomPayment;
 
-        public CreditNote(
-            AppDbContext ctx,
-            PaymentMember p,
-            CreditNoteDeliveryData data,
-            bool considerContractPenalties,
-            bool considerTotalPenalty,
-            bool considerAutoBusinessShares,
-            bool considerCustomModifiers,
-            Dictionary<string, UnderDelivery>? underDeliveries = null
-        ) :
+        protected bool ConsiderContractPenalties;
+        protected bool ConsiderTotalPenalty;
+        protected bool ConsiderAutoBusinessShares;
+        protected bool ConsiderCustomModifiers;
+
+        private CreditNoteDeliveryData? _data;
+        private Dictionary<string, UnderDelivery>? _underDeliveries;
+
+        public CreditNote(PaymentMember p, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) :
             base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
-            Data = data;
             Payment = p;
             Credit = p.Credit;
-            IsPreview = Payment == null || Credit == null;
-            var season = p.Variant.Season;
-            if (considerCustomModifiers) {
-                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
+            Text = App.Client.TextCreditNote;
+            DocumentId = $"Tr.-Gutschr. " + (Credit != null ? $"{Credit.Year}/{Credit.TgNr:000}" : Payment.MgNr);
+            IsPreview = Credit == null;
+            _data = data;
+            _underDeliveries = underDeliveries;
+            CurrencySymbol = Payment.Variant.Season.Currency.Symbol ?? Payment.Variant.Season.Currency.Code;
+            Precision = Payment.Variant.Season.Precision;
+
+            billingData ??= BillingData.FromJson(Payment.Variant.Data);
+            ConsiderContractPenalties = billingData.ConsiderContractPenalties;
+            ConsiderTotalPenalty = billingData.ConsiderTotalPenalty;
+            ConsiderAutoBusinessShares = billingData.ConsiderAutoBusinessShares;
+            ConsiderCustomModifiers = billingData.ConsiderCustomModifiers;
+        }
+
+        public static async Task<CreditNote> Initialize(int year, int avnr, int mgnr, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) {
+            using var ctx = new AppDbContext();
+            var p = await ctx.MemberPayments
+                .Where(p => p.Year == year && p.AvNr == avnr && p.MgNr == mgnr)
+                .SingleAsync();
+            return new CreditNote(p, billingData, data, underDeliveries);
+        }
+
+        protected override async Task LoadData(AppDbContext ctx) {
+            await base.LoadData(ctx);
+            var season = Payment.Variant.Season;
+            if (ConsiderCustomModifiers) {
+                CustomPayment = await ctx.CustomPayments.FindAsync(Payment.Year, Payment.MgNr);
             }
 
-            var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
+            _data ??= (await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, Payment.Year, Payment.AvNr))[Member.MgNr];
+            _underDeliveries ??= await ctx.GetMemberUnderDelivery(Payment.Year, Member.MgNr);
+
+            var mod = App.Client.IsMatzen ? await ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefaultAsync() : null;
             if (CustomPayment?.ModComment != null) {
                 MemberModifier = CustomPayment.ModComment;
             } else if (mod != null) {
@@ -57,32 +84,28 @@ namespace Elwig.Documents {
             } else {
                 MemberModifier = "Sonstige Zu-/Abschläge";
             }
-            Text = App.Client.TextCreditNote;
-            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
-            CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
-            Precision = season.Precision;
 
-            if (considerTotalPenalty) {
-                var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
-                var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
+            if (ConsiderTotalPenalty) {
+                var total = _data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
+                var totalUnderDelivery = total - Member.BusinessShares * season.MinKgPerBusinessShare;
                 MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
                 if (total == 0)
-                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * Member.BusinessShares ?? 0);
             }
-            if (considerAutoBusinessShares) {
+            if (ConsiderAutoBusinessShares) {
                 var fromDate = $"{season.Year}-01-01";
                 var toDate = $"{season.Year}-12-31";
-                MemberAutoBusinessShares = ctx.MemberHistory
-                    .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
+                MemberAutoBusinessShares = await ctx.MemberHistory
+                    .Where(h => h.MgNr == Member.MgNr && h.Type == "auto")
                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
-                    .Sum(h => h.BusinessShares);
+                    .SumAsync(h => h.BusinessShares);
                 MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
-            if (considerContractPenalties) {
-                var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
-                var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-                var comTypes = ctx.AreaCommitmentTypes.ToDictionary(t => t.VtrgId, t => t);
-                MemberUnderDeliveries = underDeliveries?
+            if (ConsiderContractPenalties) {
+                var varieties = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var attributes = await ctx.WineAttributes.ToDictionaryAsync(a => a.AttrId, a => a);
+                var comTypes = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
+                MemberUnderDeliveries = _underDeliveries?
                     .OrderBy(u => u.Key)
                     .Select(u => (
                         varieties[u.Key[..2]].Name + (u.Key.Length > 2 ? " " + attributes[u.Key[2..]].Name : ""),
@@ -104,8 +127,9 @@ namespace Elwig.Documents {
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            if (_data == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
-            doc.Add(NewCreditTable(Data));
+            doc.Add(NewCreditTable(_data));
 
             var div = new Table(ColsMM(60, 105))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
@@ -131,7 +155,7 @@ namespace Elwig.Documents {
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                 .SetKeepTogether(true);
 
-            var sum = Data.Rows.Sum(p => p.Amount);
+            var sum = _data.Rows.Sum(p => p.Amount);
             if (Payment == null) {
                 tbl1.AddCells(FormatRow("Gesamt", sum, bold: true, noTopBorder: true));
             } else {
@@ -139,7 +163,7 @@ namespace Elwig.Documents {
                 if (Payment.NetAmount != Payment.Amount) {
                     tbl1.AddCells(FormatRow("Zwischensumme", Payment.NetAmount, noTopBorder: noBorder));
                     noBorder = false;
-                    tbl1.AddCells(FormatRow(MemberModifier, Payment.Amount - Payment.NetAmount, add: true));
+                    tbl1.AddCells(FormatRow(MemberModifier ?? "", Payment.Amount - Payment.NetAmount, add: true));
                 }
                 if (Credit == null) {
                     tbl1.AddCells(FormatRow("Gesamtbetrag", Payment.Amount, bold: true, noTopBorder: noBorder));

Elwig/Documents/DeliveryConfirmation.cs

@@ -5,33 +5,48 @@ using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
         public new static string Name => "Anlieferungsbestätigung";
 
-        public Season Season;
-        public DeliveryConfirmationDeliveryData Data;
+        private readonly int _year;
+        public Season? Season;
+        public int MemberDeliveredWeight;
+        public DeliveryConfirmationDeliveryData? Data;
         public string? Text = App.Client.TextDeliveryConfirmation;
-        public Dictionary<string, MemberBucket> MemberBuckets;
-        public List<MemberStat> MemberStats;
+        public Dictionary<string, MemberBucket> MemberBuckets = [];
+        public List<MemberStat> MemberStats = [];
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) :
+        public DeliveryConfirmation(int year, Member m, DeliveryConfirmationDeliveryData? data = null) :
             base($"{Name} {year}", m) {
-            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
+            _year = year;
             ShowDateAndLocation = true;
             UseBillingAddress = true;
-            DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
+            DocumentId = $"Anl.-Best. {_year}/{m.MgNr}";
             Data = data;
-            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
-            MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult();
+        }
+
+        protected override async Task LoadData(AppDbContext ctx) {
+            await base.LoadData(ctx);
+            Season = ctx.Seasons.Find(_year) ?? throw new ArgumentException("invalid season");
+            MemberDeliveredWeight = await ctx.Deliveries
+                .Where(d => d.Year == Season.Year && d.MgNr == Member.MgNr)
+                .SelectMany(d => d.Parts)
+                .SumAsync(p => p.Weight);
+            MemberBuckets = await ctx.GetMemberBuckets(Season.Year, Member.MgNr);
+            MemberStats = await AppDbContext.GetMemberStats(Season.Year, Member.MgNr);
+            Data ??= await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, Season.Year, Member);
         }
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            if (Data == null) throw new Exception("Call LoadData before BeforeRenderBody");
             base.BeforeRenderBody(doc, pdf);
             var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
             var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
@@ -42,12 +57,13 @@ namespace Elwig.Documents {
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            if (Season == null || Data == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
 
             doc.Add(NewDeliveryListTable(Data));
             doc.Add(NewWeightsTable(MemberStats)
                 .SetMarginTopMM(10).SetKeepTogether(true));
-            doc.Add(NewBucketTable(Season, MemberBuckets, includePayment: true)
+            doc.Add(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeight, includePayment: true)
                 .SetMarginTopMM(10).SetKeepTogether(true));
 
             if (Text != null) {

Elwig/Documents/DeliveryNote.cs

@@ -5,10 +5,12 @@ using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Layout;
 using iText.Layout.Properties;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class DeliveryNote : BusinessDocument {
@@ -17,7 +19,8 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public Dictionary<string, MemberBucket> MemberBuckets;
+        public int MemberDeliveredWeight;
+        public Dictionary<string, MemberBucket> MemberBuckets = [];
 
         // 0 - none
         // 1 - GA only
@@ -25,7 +28,7 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext? ctx = null) :
+        public DeliveryNote(Delivery d) :
             base($"{Name} Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
@@ -34,7 +37,34 @@ namespace Elwig.Documents {
             DocumentId = d.LsNr;
             Date = DateOnly.FromDateTime(d.ModifiedAt);
             IsDoublePaged = true;
-            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
+        }
+
+        public static async Task<DeliveryNote> Initialize(int year, int did) {
+            using var ctx = new AppDbContext();
+            await ctx.WineOrigins.LoadAsync();
+            var d = await ctx.Deliveries
+                .Where(d => d.Year == year && d.DId == did)
+                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                .SingleAsync();
+            return new DeliveryNote(d);
+        }
+
+        public static async Task<DeliveryNote> Initialize(string lsnr) {
+            using var ctx = new AppDbContext();
+            await ctx.WineOrigins.LoadAsync();
+            var d = await ctx.Deliveries
+                .Where(d => d.LsNr == lsnr)
+                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                .SingleAsync();
+            return new DeliveryNote(d);
+        }
+
+        protected override async Task LoadData(AppDbContext ctx) {
+            await base.LoadData(ctx);
+            MemberDeliveredWeight = await ctx.DeliveryParts
+                .Where(d => d.Year == Delivery.Year && d.Delivery.MgNr == Member.MgNr)
+                .SumAsync(p => p.Weight);
+            MemberBuckets = await ctx.GetMemberBuckets(Delivery.Year, Member.MgNr) ?? [];
         }
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
@@ -53,7 +83,7 @@ namespace Elwig.Documents {
                 doc.Add(new KernedParagraph($"Anmerkung zur Lieferung: {Delivery.Comment}", 10).SetMarginsMM(5, 0, 0, 0));
             }
             if (DisplayStats > 0) {
-                doc.Add(NewBucketTable(Delivery.Season, MemberBuckets, isTiny: true,
+                doc.Add(NewBucketTable(Delivery.Season, MemberBuckets, MemberDeliveredWeight, isTiny: true,
                         filter: DisplayStats > 2 ? null : DisplayStats == 1 ? [] : Delivery.Parts.Select(p => p.SortId).Distinct().ToList())
                     .SetKeepTogether(true)
                     .SetMarginsMM(5, 0, 0, 0));

Elwig/Documents/Document.cs

@@ -128,6 +128,8 @@ namespace Elwig.Documents {
             }
         }
 
+        protected virtual async Task LoadData(AppDbContext ctx) { }
+
         protected virtual void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
 
         protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
@@ -136,7 +138,7 @@ namespace Elwig.Documents {
             return new KernedParagraph(App.Client.NameFull, 10);
         }
 
-        public async Task Generate(CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
+        public async Task Generate(AppDbContext ctx, CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
             if (_pdfFile != null)
                 return;
             progress?.Report(0.0);
@@ -181,6 +183,7 @@ namespace Elwig.Documents {
                             merger.Merge(src, 1, src.GetNumberOfPages());
                             p += src.GetNumberOfPages();
                         } else {
+                            await doc.LoadData(ctx);
                             int pageNum = doc.Render(tmpPdf.FilePath);
                             if (IsDoublePaged && doc is Letterhead) {
                                 using var reader = new PdfReader(tmpPdf.FilePath);
@@ -233,6 +236,7 @@ namespace Elwig.Documents {
                     throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                 var pdf = new TempFile("pdf");
                 try {
+                    await LoadData(ctx);
                     TotalPages = Render(pdf.FilePath);
                 } catch {
                     pdf.Dispose();

Elwig/Documents/MemberDataSheet.cs

@@ -5,31 +5,55 @@ using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class MemberDataSheet : BusinessDocument {
 
         public new static string Name => "Stammdatenblatt";
 
-        public Season Season;
-        public Dictionary<string, MemberBucket> MemberBuckets;
-        public List<AreaCom> ActiveAreaCommitments;
+        public Season? Season;
+        public int MemberDeliveredWeight;
+        public Dictionary<string, MemberBucket> MemberBuckets = [];
+        public List<AreaCom> ActiveAreaCommitments = [];
 
-        public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
+        public MemberDataSheet(Member m) :
+            base($"{Name} {m.AdministrativeName}", m) {
             DocumentId = $"{Name} {m.MgNr}";
-            Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
-            MemberBuckets = ctx.GetMemberBuckets(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult();
-            ActiveAreaCommitments = [.. m.ActiveAreaCommitments(ctx)];
+        }
+
+        public static async Task<MemberDataSheet> Initialize(int mgnr) {
+            using var ctx = new AppDbContext();
+            return new MemberDataSheet(await ctx.Members
+                .Include(m => m.EmailAddresses)
+                .Include(m => m.TelephoneNumbers)
+                .Where(m => m.MgNr == mgnr)
+                .SingleAsync());
+        }
+
+        protected override async Task LoadData(AppDbContext ctx) {
+            await base.LoadData(ctx);
+            Season = await ctx.Seasons.OrderBy(s => s.Year).LastOrDefaultAsync() ?? throw new ArgumentException("invalid season");
+            MemberBuckets = await ctx.GetMemberBuckets(Utils.CurrentYear, Member.MgNr);
+            ActiveAreaCommitments = await Member.ActiveAreaCommitments(ctx)
+                .Include(c => c.Contract).ThenInclude(c => c.Revisions)
+                .ToListAsync();
+            MemberDeliveredWeight = await ctx.Deliveries
+                .Where(d => d.Year == Season.Year && d.MgNr == Member.MgNr)
+                .SelectMany(d => d.Parts)
+                .SumAsync(p => p.Weight);
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            if (Season == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
-            doc.Add(NewMemberData().SetMarginBottomMM(5));
-            doc.Add(NewBucketTable(Season, MemberBuckets, includeDelivery: false));
+            doc.Add(NewMemberData(Season).SetMarginBottomMM(5));
+            doc.Add(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeight, includeDelivery: false));
             if (ActiveAreaCommitments.Count != 0) {
                 bool firstOnPage = false;
                 if (pdf.GetNumberOfPages() == 1) {
@@ -37,7 +61,7 @@ namespace Elwig.Documents {
                     firstOnPage = true;
                 }
                 doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 12, 0));
-                doc.Add(NewAreaComTable());
+                doc.Add(NewAreaComTable(ActiveAreaCommitments));
             }
         }
 
@@ -51,7 +75,7 @@ namespace Elwig.Documents {
                 .SetPaddingRightMM(0);
         }
 
-        protected Table NewMemberData() {
+        protected Table NewMemberData(Season season) {
             var tbl = new Table(ColsMM(30.0, 51.5, 20.0, 12.0, 18.0, 31.5))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
@@ -116,7 +140,7 @@ namespace Elwig.Documents {
                 .AddCell(NewDataTh("UID:", colspan: 2)).AddCell(NewTd(Member.UstIdNr, colspan: 2))
                 .AddCell(NewDataTh("Stammgemeinde:")).AddCell(NewTd(Member.DefaultKg?.Name))
                 .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
-                    .Add(Normal($"({(Member.IsBuchführend ? Season.VatNormal : Season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
+                    .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
                 .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(Member.IsOrganic ? "Ja" : "Nein", colspan: 2))
                 .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
@@ -133,10 +157,10 @@ namespace Elwig.Documents {
             return tbl;
         }
 
-        protected Table NewAreaComTable() {
-            var areaComs = ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
+        protected Table NewAreaComTable(IEnumerable<AreaCom> activeAreaComs) {
+            var areaComs = activeAreaComs.GroupBy(a => a.AreaComType).Select(group => new {
                 Type = group.Key,
-                AreaComs = group.OrderBy(c => c.Kg.AtKg.Name).ToList(),
+                AreaComs = group.OrderBy(c => c.Contract.Kg.AtKg.Name).ToList(),
                 Size = group.Sum(c => c.Area)
             }).OrderByDescending(a => a.Size).ToList();
 
@@ -164,18 +188,19 @@ namespace Elwig.Documents {
                         .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER));
 
                 foreach (var areaCom in contractType.AreaComs) {
-                    tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{areaCom.Kg.AtKg.Name} ")).Add(Normal($"({areaCom.Kg.AtKg.KgNr:00000})", 8))))
-                        .AddCell(NewTd(areaCom.Rd?.Name))
+                    var c = areaCom.Contract;
+                    tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{c.Kg.AtKg.Name} ")).Add(Normal($"({c.Kg.AtKg.KgNr:00000})", 8))))
+                        .AddCell(NewTd(c.Rd?.Name))
                         .AddCell(NewTd(Regex.Replace(areaCom.GstNr.Replace(",", ", ").Replace("-", "\u2013"), @"\s+", " "), 10))
                         .AddCell(NewTd($"{areaCom.Area:N0}", right: true))
                         .AddCell(NewTd(areaCom.WineCult?.Name, center: true))
-                        .AddCell(NewTd(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"), center: true));
+                        .AddCell(NewTd(c.YearTo == null ? (c.YearFrom == null ? "unbefristet" : $"ab {c.YearFrom}") : (c.YearFrom == null ? $"bis {c.YearTo}" : $"{c.YearFrom}–{c.YearTo}"), center: true));
                     lastContract = contractType.Type.DisplayName;
                 }
             }
 
             tbl.AddCell(NewTd("Gesamt:", 12, colspan: 2, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
-            tbl.AddCell(NewTd($"{ActiveAreaCommitments.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            tbl.AddCell(NewTd($"{activeAreaComs.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
             tbl.AddCell(NewTd(colspan: 2, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
 
             return tbl;

Elwig/Documents/PaymentVariantSummary.cs

@@ -7,40 +7,60 @@ using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class PaymentVariantSummary : Document {
 
         public new static string Name => "Auszahlungsvariante";
 
-        public PaymentVariantSummaryData Data;
+        public PaymentVariantSummaryData? Data;
         public PaymentVar Variant;
         public BillingData BillingData;
         public string CurrencySymbol;
         public int MemberNum;
         public int DeliveryNum;
         public int DeliveryPartNum;
-        public List<ModifierStat> ModifierStat;
-        public Dictionary<string, Modifier> Modifiers;
+        public List<ModifierStat>? ModifierStat;
+        public Dictionary<string, Modifier>? Modifiers;
 
-        public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) :
+        private List<Credit> _credits = [];
+        private List<PaymentDeliveryPart> _parts = [];
+
+        public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData? data = null) :
             base($"{Name} {v.Year} - {v.Name}") {
             Variant = v;
             BillingData = BillingData.FromJson(v.Data);
             Data = data;
             CurrencySymbol = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
-            MemberNum = v.Credits.Count;
+        }
+
+        public static async Task<PaymentVariantSummary> Initialize(int year, int avnr, PaymentVariantSummaryData? data = null) {
+            using var ctx = new AppDbContext();
+            var v = await ctx.PaymentVariants
+                .Where(v => v.Year == year && v.AvNr == avnr)
+                .SingleAsync();
+            return new PaymentVariantSummary(v, data);
+        }
+
+        protected override async Task LoadData(AppDbContext ctx) {
+            _credits = await ctx.Credits.Where(c => c.Year == Variant.Year && c.AvNr == Variant.AvNr).ToListAsync();
+            _parts = await ctx.PaymentDeliveryParts.Where(p => p.Year == Variant.Year && p.AvNr == Variant.AvNr).ToListAsync();
+            MemberNum = _credits.Count;
             IsPreview = MemberNum == 0;
-            DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count();
-            DeliveryPartNum = v.DeliveryPartPayments.Count;
-            ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
-            Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
+            DeliveryNum = await ctx.Deliveries.Where(d => d.Year == Variant.Year).CountAsync();
+            DeliveryPartNum = await ctx.DeliveryParts.Where(d => d.Year == Variant.Year).CountAsync();
+            Data ??= await PaymentVariantSummaryData.ForPaymentVariant(Variant, ctx.PaymentVariantSummaryRows);
+            ModifierStat = await AppDbContext.GetModifierStats(Variant.Year, Variant.AvNr);
+            Modifiers = await ctx.Modifiers.Where(m => m.Year == Variant.Year).ToDictionaryAsync(m => m.ModId);
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            if (Data == null || Modifiers == null || ModifierStat == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
             doc.Add(new KernedParagraph($"{Name} Lese {Variant.Year}", 24)
                 .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
@@ -48,10 +68,10 @@ namespace Elwig.Documents {
             doc.Add(new KernedParagraph(Variant.Name, 14)
                 .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
                 .SetMarginsMM(0, 0, 10, 0));
-            doc.Add(NewVariantStatTable().SetMarginBottomMM(10));
-            doc.Add(NewModifierStatTable());
+            doc.Add(NewVariantStatTable(Data).SetMarginBottomMM(10));
+            doc.Add(NewModifierStatTable(Modifiers, ModifierStat));
             doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
-            doc.Add(NewPriceTable());
+            doc.Add(NewPriceTable(Data));
         }
 
         protected Cell NewSectionHdr(string text, int colspan = 1, bool borderLeft = false) {
@@ -67,33 +87,33 @@ namespace Elwig.Documents {
                 .SetBorderLeft(borderLeft ? new SolidBorder(BorderThickness) : Border.NO_BORDER);
         }
 
-        protected Table NewVariantStatTable() {
+        protected Table NewVariantStatTable(PaymentVariantSummaryData data) {
             var tbl = new Table(ColsMM(20, 30, 4.5, 4.5, 23.5, 47.5, 15, 20))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                 .SetBorder(new SolidBorder(BorderThickness));
 
-            //var sum1 = Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
-            //var sum2 = Variant.Credits.Sum(p => p.);  //Variant.MemberPayments.Sum(p => p.Amount);
-            var deliveryModifiers = Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
-            var memberModifiers = Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
-            var sum2 = Variant.Credits.Sum(p => p.NetAmount);
+            //var sum1 = _parts.Sum(p => p.NetAmount);
+            //var sum2 = _credits.Sum(p => p.);  //Variant.MemberPayments.Sum(p => p.Amount);
+            var deliveryModifiers = _parts.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = _credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
+            var sum2 = _credits.Sum(p => p.NetAmount);
             var sum1 = sum2 - deliveryModifiers - memberModifiers;
-            var payed = -Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var netSum = Variant.Credits.Sum(p => p.NetAmount) - Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var vat = Variant.Credits.Sum(p => p.VatAmount);
-            var grossSum = Variant.Credits.Sum(p => p.GrossAmount);
-            var totalMods = Variant.Credits.Sum(p => p.Modifiers ?? 0m);
-            var considered = -Variant.Credits.Sum(p => p.PrevModifiers ?? 0m);
-            var totalSum = Variant.Credits.Sum(p => p.Amount);
+            var payed = -_credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var netSum = _credits.Sum(p => p.NetAmount) - _credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var vat = _credits.Sum(p => p.VatAmount);
+            var grossSum = _credits.Sum(p => p.GrossAmount);
+            var totalMods = _credits.Sum(p => p.Modifiers ?? 0m);
+            var considered = -_credits.Sum(p => p.PrevModifiers ?? 0m);
+            var totalSum = _credits.Sum(p => p.Amount);
 
-            var weiRows = Data.Rows.Where(r => r.QualityLevel == "Wein");
+            var weiRows = data.Rows.Where(r => r.QualityLevel == "Wein");
             var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
             var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
-            var quwRows = Data.Rows.Where(r => r.QualityLevel != "Wein");
+            var quwRows = data.Rows.Where(r => r.QualityLevel != "Wein");
             var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
             var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
-            var gebRows = Data.Rows
+            var gebRows = data.Rows
                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
             var minGeb = gebRows.Min();
@@ -191,26 +211,26 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(totalMods):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (ungebunden):", borderLeft: true, borderTop: true))
-                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
 
                 .AddCell(NewSectionTh("Bereits berücksichtigte Abzüge:", colspan: 2))
                 .AddCell(NewTd(Utils.GetSign(considered)))
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(considered):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (gebunden):", borderLeft: true))
-                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
 
                 .AddCell(NewSectionTh("Auszahlungsbetrag:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
                 .AddCell(NewTd(CurrencySymbol, borderTop: true))
                 .AddCell(NewTd($"{totalSum:N2}", right: true, borderTop: true))
                 .AddCell(NewSectionTh("Gesamtmenge:", borderLeft: true))
-                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
+                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
 
             return tbl;
         }
 
-        protected Table NewModifierStatTable() {
+        protected Table NewModifierStatTable(Dictionary<string, Modifier> modifiers, IEnumerable<ModifierStat> modStat) {
             var tbl = new Table(ColsMM(35, 30, 25, 25, 25, 25))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
@@ -228,8 +248,8 @@ namespace Elwig.Documents {
                 .AddCell(NewTh($"[{CurrencySymbol}]"))
                 .AddCell(NewTh($"[{CurrencySymbol}]"));
 
-            foreach (var m in ModifierStat) {
-                var mod = Modifiers[m.ModId];
+            foreach (var m in modStat) {
+                var mod = modifiers[m.ModId];
                 tbl.AddCell(NewTd(mod.Name, italic: true))
                     .AddCell(NewTd(mod.ValueStr, right: true))
                     .AddCell(NewTd($"{m.Count:N0}", right: true))
@@ -241,7 +261,7 @@ namespace Elwig.Documents {
             return tbl;
         }
 
-        protected Table NewPriceTable() {
+        protected Table NewPriceTable(PaymentVariantSummaryData data) {
             var tbl = new Table(ColsMM(25, 19, 18, 15, 18, 15, 18, 15, 22))
                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
@@ -262,10 +282,10 @@ namespace Elwig.Documents {
                 .AddHeaderCell(NewTh($"[{CurrencySymbol}]"));
 
             string? lastHdr = null;
-            foreach (var row in Data.Rows) {
+            foreach (var row in data.Rows) {
                 var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
                 if (lastHdr != hdr) {
-                    var rows = Data.Rows
+                    var rows = data.Rows
                         .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation)
                         .ToList();
                     var border = lastHdr != null;

Elwig/Elwig.csproj

@@ -29,7 +29,6 @@
     <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
     <PackageReference Include="LinqKit" Version="1.3.11" />
     <PackageReference Include="MailKit" Version="4.15.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.5" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3856.49" />

Elwig/Helpers/AppDbContext.cs

@@ -1,16 +1,16 @@
-using Microsoft.EntityFrameworkCore;
-using Elwig.Models.Entities;
-using System.Linq;
-using System.Threading.Tasks;
-using System.IO;
-using System;
-using System.Windows;
-using Microsoft.Extensions.Logging;
-using Microsoft.Data.Sqlite;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
 using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
 using System.Data;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers {
 
@@ -48,6 +48,7 @@ namespace Elwig.Helpers {
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
         public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
         public DbSet<MemberHistory> MemberHistory { get; private set; }
+        public DbSet<AreaComContract> AreaCommitmentContracts { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
@@ -118,11 +119,55 @@ namespace Elwig.Helpers {
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
-            optionsBuilder.UseLazyLoadingProxies();
             optionsBuilder.LogTo(Log, LogLevel.Information);
             base.OnConfiguring(optionsBuilder);
         }
 
+        protected override void OnModelCreating(ModelBuilder modelBuilder) {
+            modelBuilder.Entity<WbKg>().Navigation(k => k.AtKg).AutoInclude();
+            modelBuilder.Entity<WbKg>().Navigation(k => k.Gl).AutoInclude();
+            modelBuilder.Entity<AT_Kg>().Navigation(k => k.Gem).AutoInclude();
+            modelBuilder.Entity<PostalDest>().Navigation(p => p.Country).AutoInclude();
+            modelBuilder.Entity<PostalDest>().Navigation(p => p.AtPlz).AutoInclude();
+            modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.AtPlz).AutoInclude();
+            modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.Ort).AutoInclude();
+            modelBuilder.Entity<Member>().Navigation(m => m.DefaultWbKg).AutoInclude();
+            modelBuilder.Entity<Member>().Navigation(m => m.Country).AutoInclude();
+            modelBuilder.Entity<Member>().Navigation(m => m.PostalDest).AutoInclude();
+            modelBuilder.Entity<Member>().Navigation(m => m.BillingAddress).AutoInclude();
+            modelBuilder.Entity<BillingAddr>().Navigation(a => a.Country).AutoInclude();
+            modelBuilder.Entity<BillingAddr>().Navigation(a => a.PostalDest).AutoInclude();
+            modelBuilder.Entity<Modifier>().Navigation(m => m.Season).AutoInclude();
+            modelBuilder.Entity<Season>().Navigation(s => s.Currency).AutoInclude();
+            modelBuilder.Entity<PaymentVar>().Navigation(v => v.Season).AutoInclude();
+            modelBuilder.Entity<PaymentDeliveryPart>().Navigation(p => p.Variant).AutoInclude();
+            modelBuilder.Entity<Credit>().Navigation(c => c.Payment).AutoInclude();
+            modelBuilder.Entity<Delivery>().Navigation(d => d.Member).AutoInclude();
+            modelBuilder.Entity<Delivery>().Navigation(d => d.Season).AutoInclude();
+            modelBuilder.Entity<Delivery>().Navigation(d => d.Branch).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Quality).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Variety).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Attribute).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Cultivation).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Kg).AutoInclude();
+            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Rd).AutoInclude();
+            modelBuilder.Entity<DeliveryPartModifier>().Navigation(m => m.Modifier).AutoInclude();
+            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Kg).AutoInclude();
+            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Rd).AutoInclude();
+            modelBuilder.Entity<AreaCom>().Navigation(c => c.Contract).AutoInclude();
+            modelBuilder.Entity<AreaCom>().Navigation(c => c.WineCult).AutoInclude();
+            modelBuilder.Entity<AreaCom>().Navigation(c => c.AreaComType).AutoInclude();
+            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineVar).AutoInclude();
+            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineAttr).AutoInclude();
+            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Credit).AutoInclude();
+            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Member).AutoInclude();
+            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Variant).AutoInclude();
+            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Member).AutoInclude();
+            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Schedule).AutoInclude();
+            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Variety).AutoInclude();
+            modelBuilder.Entity<DeliverySchedule>().Navigation(s => s.Branch).AutoInclude();
+        }
+
         public override void Dispose() {
             base.Dispose();
             LogFile?.Dispose();
@@ -142,7 +187,7 @@ namespace Elwig.Helpers {
         }
 
         public async Task<bool> FbNrExists(int fbnr) {
-            return await AreaCommitments.FindAsync(fbnr) != null;
+            return await AreaCommitmentContracts.FindAsync(fbnr) != null;
         }
 
         public async Task<bool> SortIdExists(string sortId) {
@@ -166,11 +211,18 @@ namespace Elwig.Helpers {
 
         public async Task<int> NextFbNr() {
             int c = 0;
-            (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
+            (await AreaCommitmentContracts.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
+        public async Task<int> NextRevNr(int fbnr) {
+            int c = 0;
+            (await AreaCommitments.Where(c => c.FbNr == fbnr).Select(c => c.RevNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
         public async Task<int> NextLNr(DateOnly date, string zwstid) {
             var dateStr = date.ToString("yyyy-MM-dd");
             int c = 0;
@@ -391,10 +443,12 @@ namespace Elwig.Helpers {
             var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
             if (ownCnx) await cnx.DisposeAsync();
 
+            var varieties = await WineVarieties.ToDictionaryAsync(v => v.SortId);
+            var attributes = await WineAttributes.ToDictionaryAsync(a => a.AttrId);
             var buckets = new Dictionary<string, MemberBucket>();
             foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
-                var variety = await WineVarieties.FindAsync(id[..2]);
-                var attribute = await WineAttributes.FindAsync(id[2..]);
+                var variety = varieties.GetValueOrDefault(id[..2]);
+                var attribute = attributes.GetValueOrDefault(id[2..]);
                 var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
                 buckets[id] = new(
                     name,

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 37;
+        public static readonly int RequiredSchemaVersion = 38;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Billing/Billing.cs

@@ -21,7 +21,7 @@ namespace Elwig.Helpers.Billing {
             using var ctx = new AppDbContext();
             Season = ctx.Seasons.Find(Year)!;
             Attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
-            Modifiers = ctx.Modifiers.Where(m => m.Year == Year).Include(m => m.Season).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
+            Modifiers = ctx.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
             AreaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
         }
 

Elwig/Helpers/Billing/BillingVariant.cs

@@ -16,7 +16,7 @@ namespace Elwig.Helpers.Billing {
         public BillingVariant(int year, int avnr) : base(year) {
             AvNr = avnr;
             using var ctx = new AppDbContext();
-            PaymentVariant = ctx.PaymentVariants.Include(v => v.Season).Where(v => v.Year == Year && v.AvNr == AvNr).Single() ?? throw new ArgumentException("PaymentVar not found");
+            PaymentVariant = ctx.PaymentVariants.Where(v => v.Year == Year && v.AvNr == AvNr).Single();
             Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
         }
 

Elwig/Helpers/Export/ElwigData.cs

@@ -60,13 +60,14 @@ namespace Elwig.Helpers.Export {
                     List<MemberTelNr> TelephoneNumbers,
                     List<MemberEmailAddr> EmailAddresses,
                     List<AreaCom> AreaCommitments,
+                    List<AreaComContract> Contracts,
                     List<WbRd> Riede,
                     List<WbKg> WbKgs,
                     List<WbGl> WbGls,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
                     List<DeliveryPartModifier> Modifiers,
-                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
+                    Dictionary<string, List<(int Id1, int Id2, int Id3, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
 
                 var metaData = new List<(string FileName, string ZwstId, string Device,
                     int? MemberNum, string? MemberFilters,
@@ -75,10 +76,12 @@ namespace Elwig.Helpers.Export {
 
                 foreach (var filename in filenames) {
                     try {
-                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
+                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], [], new() {
                             ["member"] = [],
+                            ["area_commitment_contract"] = [],
                             ["area_commitment"] = [],
                             ["delivery"] = [],
+                            ["delivery_part"] = [],
                         })));
                         var r = data[^1];
 
@@ -86,9 +89,11 @@ namespace Elwig.Helpers.Export {
                         using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
                         await zip.CheckIntegrity();
 
+                        string[] acceptableVersions = ["1", "2"];
                         var version = zip.GetEntry("version");
                         using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                            if (await reader.ReadToEndAsync() != "elwig:1")
+                            var v = await reader.ReadToEndAsync();
+                            if (!v.StartsWith("elwig:") || !acceptableVersions.Contains(v[6..]))
                                 throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
                         }
 
@@ -96,8 +101,8 @@ namespace Elwig.Helpers.Export {
                         var meta = await JsonNode.ParseAsync(metaJson!.Open());
                         var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
                         var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var areaComCount = meta!["area_commitment_contracts"]?["count"]?.AsValue().GetValue<int>();
+                        var areaComFilters = meta!["area_commitment_contracts"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
                         var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         metaData.Add((Path.GetFileName(filename),
@@ -133,23 +138,48 @@ namespace Elwig.Helpers.Export {
                                 r.TelephoneNumbers.AddRange(telNrs);
                                 r.EmailAddresses.AddRange(emailAddrs);
                                 if (timestamps.HasValue)
-                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["member"].Add((m.MgNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                             }
                         }
 
+                        // legacy area commitments
                         var areaComsJson = zip.GetEntry("area_commitments.json");
                         if (areaComsJson != null) {
                             using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
+                                var (contract, areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
+                                r.Contracts.Add(contract);
                                 r.AreaCommitments.Add(areaCom);
                                 if (wbrd != null) {
                                     r.Riede.Add(wbrd);
                                 }
+                                if (timestamps.HasValue) {
+                                    r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                }
+                            }
+                        }
+
+                        var contractsJson = zip.GetEntry("area_commitment_contracts.json");
+                        if (contractsJson != null) {
+                            using var reader = new StreamReader(contractsJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (contract, areaComs, wbrd, timestamps) = obj.ToAreaComContract(currentWbRde);
+                                r.Contracts.Add(contract);
+                                r.AreaCommitments.AddRange(areaComs.Select(v => v.Item1));
+                                if (wbrd != null) {
+                                    r.Riede.Add(wbrd);
+                                }
                                 if (timestamps.HasValue)
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                foreach (var (areaCom, ts) in areaComs) {
+                                    if (!ts.HasValue) continue;
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, ts.Value.CreatedAt, ts.Value.ModifiedAt));
+                                }
                             }
                         }
 
@@ -161,11 +191,15 @@ namespace Elwig.Helpers.Export {
                                 var obj = JsonNode.Parse(line)!.AsObject();
                                 var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
                                 r.Deliveries.Add(d);
-                                r.DeliveryParts.AddRange(parts);
+                                r.DeliveryParts.AddRange(parts.Select(p => p.Item1));
                                 r.Modifiers.AddRange(mods);
                                 r.Riede.AddRange(rde);
                                 if (timestamps.HasValue)
-                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["delivery"].Add((d.Year, d.DId, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                foreach (var (part, ts) in parts) {
+                                    if (!ts.HasValue) continue;
+                                    r.Timestamps["area_commitment"].Add((part.Year, part.DId, part.DPNr, ts.Value.CreatedAt, ts.Value.ModifiedAt));
+                                }
                             }
                         }
                     } catch (Exception exc) when (
@@ -189,11 +223,11 @@ namespace Elwig.Helpers.Export {
                     }
                 }
 
-                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
-                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
-                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string? Filters)>();
+                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
 
-                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
@@ -220,11 +254,20 @@ namespace Elwig.Helpers.Export {
                     if (duplicateMgNrs.Count > 0)
                         importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count);
 
-                    var fbnrs = areaCommitments.Select(c => c.FbNr).ToList();
-                    var duplicateFbNrs = await ctx.AreaCommitments
+                    var fbnrs = contracts.Select(c => c.FbNr).ToList();
+                    var duplicateFbNrs = await ctx.AreaCommitmentContracts
                         .Where(c => fbnrs.Contains(c.FbNr))
                         .Select(c => c.FbNr)
                         .ToListAsync();
+                    bool importNewContracts = false, importDuplicateContracts = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (fbnrs.Count - duplicateFbNrs.Count > 0)
+                            importNewContracts = ImportQuestion(branch.Name, device, "Flächenbindungsverträge", false, fbnrs.Count - duplicateFbNrs.Count);
+                    } else {
+                        importNewContracts = true;
+                    }
+                    if (duplicateFbNrs.Count > 0)
+                        importDuplicateContracts = ImportQuestion(branch.Name, device, "Flächenbindungsverträge", true, duplicateFbNrs.Count);
 
                     var lsnrs = deliveries.Select(d => d.LsNr).ToList();
                     var duplicateLsNrs = await ctx.Deliveries
@@ -258,7 +301,7 @@ namespace Elwig.Helpers.Export {
                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
                     }
 
-                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
+                    if (importDuplicateMembers || importNewMembers || importDuplicateContracts || importNewContracts || importDuplicateDeliveries || importNewDeliveries) {
                         ctx.AddRange(wbGls);
                         ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
                         ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
@@ -272,25 +315,31 @@ namespace Elwig.Helpers.Export {
                         ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                         ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
                         ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
-                        ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
-                        ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
                     }
                     if (importNewMembers) {
                         ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr)));
                         ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
                         ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr)));
                         ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
-                        ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
-                        ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
                     }
                     if (members.Count > 0) {
                         var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0;
                         var o = importDuplicateMembers ? duplicateMgNrs.Count : 0;
                         importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
                     }
-                    if (areaCommitments.Count > 0) {
+
+                    if (importDuplicateContracts) {
+                        ctx.RemoveRange(ctx.AreaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.UpdateRange(contracts.Where(c => duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (importNewContracts) {
+                        ctx.AddRange(contracts.Where(c => !duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (contracts.Count > 0) {
                         ctx.AddRange(riede);
-                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
+                        var imported = contracts.Where(c => (importNewContracts && !duplicateFbNrs.Contains(c.FbNr)) || (importDuplicateContracts && duplicateFbNrs.Contains(c.FbNr))).ToList();
                         importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
                     }
 
@@ -335,15 +384,17 @@ namespace Elwig.Helpers.Export {
                     await ctx.SaveChangesAsync();
 
                     var primaryKeys = new Dictionary<string, string>() {
-                        ["member"] = "mgnr, 0",
-                        ["area_commitment"] = "fbnr, 0",
-                        ["delivery"] = "year, did",
+                        ["member"] = "mgnr, 0, 0",
+                        ["area_commitment_contract"] = "fbnr, 0, 0",
+                        ["area_commitment"] = "fbnr, revnr, 0",
+                        ["delivery"] = "year, did, 0",
+                        ["delivery_part"] = "year, did, dpnr",
                     };
                     var updateStmts = timestamps
                         .SelectMany(e => e.Value.Select(m => $"UPDATE {e.Key} " +
                                                              $"SET ctime = {((DateTimeOffset)m.CreatedAt.ToUniversalTime()).ToUnixTimeSeconds()}, " +
                                                                  $"mtime = {((DateTimeOffset)m.ModifiedAt.ToUniversalTime()).ToUnixTimeSeconds()} " +
-                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2});"));
+                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2}, {m.Id3});"));
                     using var cnx = AppDbContext.Connect();
                     await cnx.ExecuteBatch($"""
                         BEGIN;
@@ -407,7 +458,7 @@ namespace Elwig.Helpers.Export {
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaComContract> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
                 AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
@@ -425,7 +476,7 @@ namespace Elwig.Helpers.Export {
         public class ElwigExport {
             public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
             public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
-            public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
+            public (IEnumerable<AreaComContract> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
 
             public async Task Export(string filename) {
@@ -434,7 +485,7 @@ namespace Elwig.Helpers.Export {
 
                 var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
                 using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                    await writer.WriteAsync("elwig:1");
+                    await writer.WriteAsync("elwig:2");
                 }
 
                 var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
@@ -456,8 +507,9 @@ namespace Elwig.Helpers.Export {
                             ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
                     if (AreaComs != null)
-                        obj["area_commitments"] = new JsonObject {
+                        obj["area_commitment_contracts"] = new JsonObject {
                             ["count"] = AreaComs.Value.AreaComs.Count(),
+                            ["revisions"] = AreaComs.Value.AreaComs.Sum(c => c.Revisions.Count),
                             ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
                     if (Deliveries != null)
@@ -485,7 +537,7 @@ namespace Elwig.Helpers.Export {
                     }
                 }
                 if (AreaComs != null) {
-                    var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
+                    var json = zip.CreateEntry("area_commitment_contracts.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var c in AreaComs.Value.AreaComs) {
                         await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
@@ -639,42 +691,102 @@ namespace Elwig.Helpers.Export {
                 CountryNum = a["country"]!.AsValue().GetValue<int>(),
                 PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(),
                 Address = a["address"]!.AsValue().GetValue<string>(),
-            } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
+            } : null, [.. json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
                 MgNr = mgnr,
                 Nr = i + 1,
                 Type = n["type"]!.AsValue().GetValue<string>(),
                 Number = n["number"]!.AsValue().GetValue<string>(),
                 Comment = n["comment"]?.AsValue().GetValue<string>(),
-            }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
+            })], [.. json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
                 MgNr = mgnr,
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            }).ToList(),
+            })],
             createdAt == null || modifiedAt == null ? null :
             (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
              DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
-        public static JsonObject ToJson(this AreaCom c) {
+        public static JsonObject ToJson(this AreaComContract c) {
             return new JsonObject {
                 ["fbnr"] = c.FbNr,
-                ["mgnr"] = c.MgNr,
-                ["vtrgid"] = c.VtrgId,
-                ["cultid"] = c.CultId,
-                ["area"] = c.Area,
                 ["kgnr"] = c.KgNr,
-                ["gstnr"] = c.GstNr,
                 ["ried"] = c.Rd?.Name,
-                ["year_from"] = c.YearFrom,
-                ["year_to"] = c.YearTo,
+                ["revisions"] = new JsonArray(c.Revisions.OrderBy(r => r.RevNr).Select(r => r.ToJson()).ToArray()),
                 ["comment"] = c.Comment,
                 ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
                 ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+        private static JsonObject ToJson(this AreaCom c) {
+            return new JsonObject {
+                ["revnr"] = c.RevNr,
+                ["mgnr"] = c.MgNr,
+                ["vtrgid"] = c.VtrgId,
+                ["cultid"] = c.CultId,
+                ["area"] = c.Area,
+                ["gstnr"] = c.GstNr,
+                ["year_from"] = c.YearFrom,
+                ["year_to"] = c.YearTo,
+                ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (AreaComContract, List<(AreaCom, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaComContract(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
+            var ried = json["ried"]?.AsValue().GetValue<string>();
+            var fbnr = json["fbnr"]!.AsValue()!.GetValue<int>();
+            WbRd? rd = null;
+            bool newRd = false;
+            if (ried != null) {
+                var rde = riede.GetValueOrDefault(kgnr, []);
+                rd = rde.FirstOrDefault(r => r.Name == ried);
+                if (rd == null) {
+                    newRd = true;
+                    rd = new WbRd {
+                        KgNr = kgnr,
+                        RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                        Name = ried,
+                    };
+                    rde.Add(rd);
+                    riede[rd.KgNr] = rde;
+                }
+            }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            return (new AreaComContract {
+                FbNr = fbnr,
+                KgNr = kgnr,
+                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, [.. json["revisions"]!.AsArray().Select(r => r!.AsObject()).Select<JsonObject, (AreaCom, (DateTime, DateTime)?)>(r => {
+                var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+                var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+                return (new AreaCom {
+                    FbNr = fbnr,
+                    RevNr = r["revnr"]!.AsValue().GetValue<int>(),
+                    MgNr = r["mgnr"]!.AsValue().GetValue<int>(),
+                    VtrgId = r["vtrgid"]!.AsValue().GetValue<string>(),
+                    CultId = r["cultid"]?.AsValue().GetValue<string>(),
+                    Area = r["area"]!.AsValue().GetValue<int>(),
+                    GstNr = r["gstnr"]?.AsValue().GetValue<string>() ?? "-",
+                    YearFrom = r["year_from"]?.AsValue().GetValue<int>(),
+                    YearTo = r["year_to"]?.AsValue().GetValue<int>(),
+                    ImportedAt = DateTime.Now,
+                }, createdAt == null || modifiedAt == null ? null :
+                (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+                 DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+            })], newRd ? rd : null,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+
+        public static (AreaComContract, AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             WbRd? rd = null;
@@ -695,18 +807,22 @@ namespace Elwig.Helpers.Export {
             }
             var createdAt = json["created_at"]?.AsValue().GetValue<string>();
             var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-            return (new AreaCom {
+            return (new AreaComContract {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
+                KgNr = kgnr,
+                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, new AreaCom {
+                FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
+                RevNr = 1,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(),
                 CultId = json["cultid"]?.AsValue().GetValue<string>(),
                 Area = json["area"]!.AsValue().GetValue<int>(),
-                KgNr = kgnr,
                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
-                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
                 YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
             }, newRd ? rd : null,
             createdAt == null || modifiedAt == null ? null :
@@ -723,43 +839,45 @@ namespace Elwig.Helpers.Export {
                 ["lnr"] = d.LNr,
                 ["time"] = d.Time != null ? $"{d.Time:HH:mm:ss}" : null,
                 ["mgnr"] = d.MgNr,
-                ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => {
-                    var obj = new JsonObject {
-                        ["dpnr"] = p.DPNr,
-                        ["sortid"] = p.SortId,
-                        ["attrid"] = p.AttrId,
-                        ["cultid"] = p.CultId,
-                        ["weight"] = p.Weight,
-                        ["kmw"] = p.Kmw,
-                        ["qualid"] = p.QualId,
-                        ["hkid"] = p.HkId,
-                        ["kgnr"] = p.KgNr,
-                        ["ried"] = p.Rd?.Name,
-                        ["net_weight"] = p.IsNetWeight,
-                        ["manual_weighing"] = p.IsManualWeighing,
-                        ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
-                        ["comment"] = p.Comment,
-                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
-                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
-                    };
-                    if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
-                    if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
-                    if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
-                    if (p.Unloading != null) obj["unloading"] = p.Unloading;
-                    if (p.Temperature != null) obj["temperature"] = p.Temperature;
-                    if (p.Acid != null) obj["acid"] = p.Acid;
-                    if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
-                    if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
-                    if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
-                    return obj;
-                }).ToArray()),
+                ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => p.ToJson()).ToArray()),
                 ["comment"] = d.Comment,
                 ["created_at"] = $"{d.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
                 ["modified_at"] = $"{d.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+        private static JsonObject ToJson(this DeliveryPart p) {
+            var obj = new JsonObject {
+                ["dpnr"] = p.DPNr,
+                ["sortid"] = p.SortId,
+                ["attrid"] = p.AttrId,
+                ["cultid"] = p.CultId,
+                ["weight"] = p.Weight,
+                ["kmw"] = p.Kmw,
+                ["qualid"] = p.QualId,
+                ["hkid"] = p.HkId,
+                ["kgnr"] = p.KgNr,
+                ["ried"] = p.Rd?.Name,
+                ["net_weight"] = p.IsNetWeight,
+                ["manual_weighing"] = p.IsManualWeighing,
+                ["modids"] = new JsonArray(p.PartModifiers.Select(m => (JsonNode)m.ModId).ToArray()),
+                ["comment"] = p.Comment,
+                ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+            if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
+            if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
+            if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
+            if (p.Unloading != null) obj["unloading"] = p.Unloading;
+            if (p.Temperature != null) obj["temperature"] = p.Temperature;
+            if (p.Acid != null) obj["acid"] = p.Acid;
+            if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
+            if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
+            if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
+            return obj;
+        }
+
+        public static (Delivery, List<(DeliveryPart, (DateTime CreatedAt, DateTime ModifiedAt)?)>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -782,7 +900,7 @@ namespace Elwig.Helpers.Export {
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
-            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
+            }, [.. json["parts"]!.AsArray().Select(p => p!.AsObject()).Select<JsonObject, (DeliveryPart, (DateTime, DateTime)?)>(p => {
                 var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
                 var ried = p["ried"]?.AsValue().GetValue<string>();
                 WbRd? rd = null;
@@ -800,7 +918,9 @@ namespace Elwig.Helpers.Export {
                         wbRde.Add(rd);
                     }
                 }
-                return new DeliveryPart {
+                var createdAt = p["created_at"]?.AsValue().GetValue<string>();
+                var modifiedAt = p["modified_at"]?.AsValue().GetValue<string>();
+                return (new DeliveryPart {
                     Year = year,
                     DId = did,
                     DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
@@ -825,13 +945,15 @@ namespace Elwig.Helpers.Export {
                     ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
                     WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
                     WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
-                };
-            }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
+                }, createdAt == null || modifiedAt == null ? null :
+                (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+                 DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+            })], [.. json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
                 Year = year,
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList(),
+            }))],
             wbRde,
             createdAt == null || modifiedAt == null ? null :
             (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),

Elwig/Helpers/Utils.cs

@@ -557,7 +557,9 @@ namespace Elwig.Helpers {
                         "Vorläufiges Dokument", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
-                await doc.Generate();
+                using (var ctx = new AppDbContext()) {
+                    await doc.Generate(ctx);
+                }
                 await doc.Print();
             } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
                 if (doc.IsPreview) {
@@ -565,7 +567,9 @@ namespace Elwig.Helpers {
                         "Vorläufiges Dokument", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
-                await doc.Generate();
+                using (var ctx = new AppDbContext()) {
+                    await doc.Generate(ctx);
+                }
                 var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
                 if (success)
                     MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mail im Posteingang des Empfängers aufscheint.", "E-Mail verschickt",
@@ -582,12 +586,16 @@ namespace Elwig.Helpers {
                     Title = $"{doc.Title} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    await doc.Generate();
+                    using (var ctx = new AppDbContext()) {
+                        await doc.Generate(ctx);
+                    }
                     doc.SaveTo(d.FileName);
                     Process.Start("explorer.exe", d.FileName);
                 }
             } else {
-                await doc.Generate();
+                using (var ctx = new AppDbContext()) {
+                    await doc.Generate(ctx);
+                }
                 doc.Show();
             }
         }

Elwig/Helpers/Validator.cs

@@ -580,7 +580,7 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaCom? c) {
+        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaComContract? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -28,9 +28,9 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
-            var variant = await paymentVariants.FindAsync(year, avnr);
+            var variant = await paymentVariants.Include(v => v.Season.Modifiers).SingleAsync(v => v.Year == year && v.AvNr == avnr);
             BillingData? varData = null;
-            try { varData = variant != null ? BillingData.FromJson(variant.Data) : null; } catch { }
+            try { varData = variant.Data != null ? BillingData.FromJson(variant.Data) : null; } catch { }
             return (await FromDbSet(table, year, avnr))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -28,12 +28,7 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<DeliveryAncmtListData> FromQuery(IQueryable<DeliveryAncmt> query, List<string> filterNames) {
-            return new((await query
-                .Include(a => a.Schedule.Branch)
-                .Include(a => a.Member)
-                .Include(a => a.Variety)
-                .AsSplitQuery()
-                .ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
+            return new((await query.ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
         }
     }
 

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -52,12 +52,8 @@ namespace Elwig.Models.Dtos {
             if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
             await q
                  .Include(p => p.Delivery)
-                 .Include(p => p.Variety)
-                 .Include(p => p.Attribute)
-                 .Include(p => p.Quality)
                  .Include(p => p.Buckets)
-                 .Include(p => p.PartModifiers)
-                 .ThenInclude(m => m.Modifier)
+                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                  .LoadAsync();
             return await table.FromSqlRaw($"""
                     SELECT p.*
@@ -65,7 +61,7 @@ namespace Elwig.Models.Dtos {
                         JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
                     WHERE (p.year = {y} OR {y} IS NULL) AND (v.mgnr = {m} OR {m} IS NULL)
                     ORDER BY p.year, v.mgnr, v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
-                    """).ToListAsync();
+                    """).IgnoreAutoIncludes().ToListAsync();
         }
     }
 

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -40,12 +40,7 @@ namespace Elwig.Models.Dtos {
                 .Include(p => p.Delivery.Member.Branch)
                 .Include(p => p.Delivery.Branch)
                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-                .Include(p => p.Variety)
-                .Include(p => p.Attribute)
-                .Include(p => p.Cultivation)
                 .Include(p => p.Origin)
-                .Include(p => p.Quality)
-                .AsSplitQuery()
                 .ToListAsync()).Select(d => new DeliveryJournalRow(d)), filterNames);
         }
     }

Elwig/Models/Dtos/MemberListData.cs

@@ -47,15 +47,11 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCom) {
-            var areaComs = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
+            var areaComs = await query.Include(m => m.AreaCommitments).ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
             return new((await query
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .Include(m => m.Branch)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
                 .Include(m => m.TelephoneNumbers)
                 .Include(m => m.EmailAddresses)
-                .AsSplitQuery()
                 .ToListAsync()).Select(m => new MemberListRow(m,
                     areaComs[m.MgNr].Sum(c => c.Area),
                     areaComs[m.MgNr].Where(c => filterAreaCom.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),

Elwig/Models/Entities/AreaCom.cs

@@ -1,15 +1,16 @@
-using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
-    [Table("area_commitment"), PrimaryKey("FbNr")]
+    [Table("area_commitment"), PrimaryKey("FbNr", "RevNr")]
     public class AreaCom {
         [Column("fbnr")]
         public int FbNr { get; set; }
 
+        [Column("revnr")]
+        public int RevNr { get; set; }
+
         [Column("mgnr")]
         public int MgNr { get; set; }
 
@@ -22,24 +23,15 @@ namespace Elwig.Models.Entities {
         [Column("area")]
         public int Area { get; set; }
 
-        [Column("kgnr")]
-        public int KgNr { get; set; }
-
         [Column("gstnr")]
         public required string GstNr { get; set; }
 
-        [Column("rdnr")]
-        public int? RdNr { get; set; }
-
         [Column("year_from")]
         public int? YearFrom { get; set; }
 
         [Column("year_to")]
         public int? YearTo { get; set; }
 
-        [Column("comment")]
-        public string? Comment { get; set; }
-
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public long CTime { get; set; }
         [NotMapped]
@@ -72,6 +64,9 @@ namespace Elwig.Models.Entities {
             set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
         }
 
+        [ForeignKey("FbNr")]
+        public virtual AreaComContract Contract { get; private set; } = null!;
+
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;
 
@@ -80,17 +75,5 @@ namespace Elwig.Models.Entities {
 
         [ForeignKey("CultId")]
         public virtual WineCult? WineCult { get; private set; }
-
-        [ForeignKey("KgNr")]
-        public virtual WbKg Kg { get; private set; } = null!;
-
-        [ForeignKey("KgNr, RdNr")]
-        public virtual WbRd? Rd { get; private set; }
-
-        public int SearchScore(IEnumerable<string> keywords) {
-            return Utils.GetSearchScore([
-                 WineCult?.Name, Kg.AtKg.Name, Rd?.Name, GstNr, Comment,
-            ], keywords);
-        }
     }
 }

Elwig/Models/Entities/AreaComContract.cs

@@ -0,0 +1,78 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
+namespace Elwig.Models.Entities {
+    [Table("area_commitment_contract"), PrimaryKey("FbNr")]
+    public class AreaComContract {
+        [Column("fbnr")]
+        public int FbNr { get; set; }
+
+        [Column("kgnr")]
+        public int KgNr { get; set; }
+
+        [Column("rdnr")]
+        public int? RdNr { get; set; }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; set; }
+        [NotMapped]
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; set; }
+        [NotMapped]
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [ForeignKey("KgNr")]
+        public virtual WbKg Kg { get; private set; } = null!;
+
+        [ForeignKey("KgNr, RdNr")]
+        public virtual WbRd? Rd { get; private set; }
+
+        [InverseProperty(nameof(AreaCom.Contract))]
+        public virtual ICollection<AreaCom> Revisions { get; private set; } = null!;
+
+        [NotMapped]
+        public AreaCom? Latest => Revisions.OrderBy(r => r.RevNr).LastOrDefault();
+
+        [NotMapped]
+        public int? YearFrom => Revisions.Any(r => r.YearFrom == null) ? null : Revisions.Min(r => r.YearFrom);
+        [NotMapped]
+        public int? YearTo => Revisions.Any(r => r.YearTo == null) ? null : Revisions.Max(r => r.YearTo);
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            return Utils.GetSearchScore([
+                 ..Revisions.Select(r => r.WineCult?.Name), Kg.AtKg.Name, Rd?.Name, ..Revisions.Select(r => r.GstNr), Comment,
+            ], keywords);
+        }
+    }
+}

Elwig/Models/Entities/Delivery.cs

@@ -106,21 +106,21 @@ namespace Elwig.Models.Entities {
         [InverseProperty(nameof(DeliveryPart.Delivery))]
         public virtual ICollection<DeliveryPart> Parts { get; private set; } = null!;
         [NotMapped]
-        public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
+         public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
 
         [NotMapped]
         public Predicate<DeliveryPart>? PartFilter { get; set; }
 
-        public int Weight => Parts.Select(p => p.Weight).Sum();
-        public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
+        public int Weight => Parts.Sum(p => p.Weight);
+        public int FilteredWeight => FilteredParts.Sum(p => p.Weight);
 
         public IEnumerable<RawVaribute> Vaributes => Parts
             .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
-            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
+            .OrderByDescending(g => g.Sum(p => p.Weight))
             .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
         public IEnumerable<RawVaribute> FilteredVaributes => FilteredParts
             .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
-            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
+            .OrderByDescending(g => g.Sum(p => p.Weight))
             .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
         public string VaributeString => string.Join(", ", Vaributes);
         public string FilteredVaributeString => string.Join(", ", FilteredVaributes);
@@ -153,7 +153,7 @@ namespace Elwig.Models.Entities {
                 Member.Name, Member.MiddleName, Member.GivenName, Member.BillingAddress?.FullName,
                 Comment
             }.ToList();
-            list.AddRange(Parts.Select(p => p.Comment).Distinct());
+            list.AddRange(FilteredParts.Select(p => p.Comment).Distinct());
             return Utils.GetSearchScore(list, keywords);
         }
     }

Elwig/Models/Entities/WineOrigin.cs

@@ -27,13 +27,15 @@ namespace Elwig.Models.Entities {
         public virtual ICollection<WbGem> Gems { get; private set; } = null!;
 
         [InverseProperty(nameof(Parent))]
-        public virtual ICollection<WineOrigin> Children { get; private set; } = null!;
+        public virtual ICollection<WineOrigin> RealChildren { get; private set; } = null!;
+        [NotMapped]
+        public List<WineOrigin> Children { get; private set; } = [];
 
         public int Level => (Parent?.Level + 1) ?? 0;
 
         public string HkIdLevel => $"{new string(' ', Level * 2)}{HkId}";
 
-        public int TotalChildNum => 1 + Children.Select(c => c.TotalChildNum).Sum();
+        public int TotalChildNum => 1 + Children.Sum(c => c.TotalChildNum);
 
         private int SortKey1 => (Parent?.SortKey1 ?? 0) | (TotalChildNum << ((3 - Level) * 8));
         public int SortKey => SortKey1 | ((Level < 3) ? (-1 >>> (Level * 8 + 8)) : 0);

Elwig/Resources/Sql/37-38.sql

@@ -0,0 +1,218 @@
+-- schema version 37 to 38
+
+UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+
+DROP TRIGGER t_area_commitment_i_ctime;
+DROP TRIGGER t_area_commitment_u_ctime;
+DROP TRIGGER t_area_commitment_i_mtime;
+DROP TRIGGER t_area_commitment_u_mtime;
+
+CREATE TABLE area_commitment_contract (
+    fbnr      INTEGER NOT NULL,
+
+    kgnr      INTEGER NOT NULL,
+    rdnr      INTEGER,
+
+    comment   TEXT             DEFAULT NULL,
+    ctime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+    mtime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+    xtime     INTEGER          DEFAULT NULL,
+    itime     INTEGER          DEFAULT NULL,
+
+    CONSTRAINT area_commitment_contract PRIMARY KEY (fbnr),
+    CONSTRAINT fk_area_commitment_contract_wb_kg FOREIGN KEY (kgnr) REFERENCES wb_kg (kgnr)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_area_commitment_contract_wb_rd FOREIGN KEY (kgnr, rdnr) REFERENCES wb_rd (kgnr, rdnr)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+CREATE TABLE area_commitment_new (
+    fbnr      INTEGER NOT NULL,
+    revnr     INTEGER NOT NULL,
+    mgnr      INTEGER NOT NULL,
+
+    vtrgid    TEXT    NOT NULL,
+    cultid    TEXT             DEFAULT NULL,
+    area      INTEGER NOT NULL,
+    gstnr     TEXT    NOT NULL,
+
+    year_from INTEGER CHECK (year_from >= 1000 AND year_from <= 9999) DEFAULT NULL,
+    year_to   INTEGER CHECK (year_to   >= 1000 AND year_to   <= 9999) DEFAULT NULL,
+
+    ctime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+    mtime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+    xtime     INTEGER          DEFAULT NULL,
+    itime     INTEGER          DEFAULT NULL,
+
+    CONSTRAINT pk_area_commitment PRIMARY KEY (fbnr, revnr),
+    CONSTRAINT fk_area_commitment_area_commitment_contract FOREIGN KEY (fbnr) REFERENCES area_commitment_contract (fbnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_area_commitment_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_area_commitment_area_commitment_type FOREIGN KEY (vtrgid) REFERENCES area_commitment_type (vtrgid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_area_commitment_wine_cultivation FOREIGN KEY (cultid) REFERENCES wine_cultivation (cultid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr, comment, ctime, mtime, xtime, itime)
+SELECT fbnr, kgnr, rdnr, comment, ctime, mtime, xtime, itime
+FROM area_commitment;
+
+INSERT INTO area_commitment_new (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to, ctime, mtime, xtime, itime)
+SELECT fbnr, 1, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to, ctime, mtime, xtime, itime
+FROM area_commitment;
+
+PRAGMA foreign_keys = OFF;
+PRAGMA writable_schema = ON;
+DROP TABLE area_commitment;
+ALTER TABLE area_commitment_new RENAME TO area_commitment;
+PRAGMA writable_schema = OFF;
+PRAGMA foreign_keys = ON;
+
+CREATE TRIGGER t_area_commitment_contract_i_ctime
+    AFTER INSERT ON area_commitment_contract FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.ctime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment_contract SET ctime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
+END;
+
+CREATE TRIGGER t_area_commitment_contract_u_ctime
+    BEFORE UPDATE ON area_commitment_contract FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND OLD.ctime != NEW.ctime
+BEGIN
+    SELECT RAISE(ABORT, 'It is not allowed to change ctime');
+END;
+
+CREATE TRIGGER t_area_commitment_contract_i_mtime
+    AFTER INSERT ON area_commitment_contract FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
+END;
+
+CREATE TRIGGER t_area_commitment_contract_u_mtime
+    AFTER UPDATE ON area_commitment_contract FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
+END;
+
+CREATE TRIGGER t_area_commitment_i_ctime
+    AFTER INSERT ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.ctime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment SET ctime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
+END;
+
+CREATE TRIGGER t_area_commitment_u_ctime
+    BEFORE UPDATE ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND OLD.ctime != NEW.ctime
+BEGIN
+    SELECT RAISE(ABORT, 'It is not allowed to change ctime');
+END;
+
+CREATE TRIGGER t_area_commitment_i_mtime
+    AFTER INSERT ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment SET mtime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
+END;
+
+CREATE TRIGGER t_area_commitment_u_mtime
+    AFTER UPDATE ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE area_commitment SET mtime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
+END;
+
+CREATE TRIGGER t_area_commitment_i_mtime_contract
+    AFTER INSERT ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
+BEGIN
+    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
+END;
+
+CREATE TRIGGER t_area_commitment_u_mtime_contract
+    AFTER UPDATE ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
+BEGIN
+    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr OR fbnr = OLD.fbnr;
+END;
+
+CREATE TRIGGER t_area_commitment_d_mtime_contract
+    AFTER DELETE ON area_commitment FOR EACH ROW
+    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
+BEGIN
+    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = OLD.fbnr;
+END;
+
+-- fix user fiddling - set actual year_from
+UPDATE area_commitment AS b
+SET fbnr = a.fbnr, revnr = b.fbnr, year_from = a.year_to + 1
+FROM area_commitment AS a
+WHERE a.fbnr < b.fbnr
+  AND COALESCE(a.year_from <= a.year_to, TRUE)
+  AND COALESCE(b.year_from <= b.year_to, TRUE)
+  AND SUBSTR(a.vtrgid, 0, 2) = SUBSTR(b.vtrgid, 0, 2)
+  AND (SELECT c.kgnr = d.kgnr AND COALESCE(c.rdnr = d.rdnr, TRUE) FROM area_commitment_contract c, area_commitment_contract d WHERE c.fbnr = a.fbnr AND d.fbnr = b.fbnr)
+  AND ((IIF(INSTR(a.gstnr, b.gstnr) > 0, 1, 0) + IIF(INSTR(b.gstnr, a.gstnr) > 0, 1, 0) + IIF(a.area = b.area, 2, 0) + (a.mgnr = b.mgnr)) > 1)
+  AND ((a.year_from = b.year_from AND b.year_to IS NULL AND a.year_to IS NOT NULL));
+
+-- simple
+UPDATE area_commitment AS b
+SET fbnr = a.fbnr, revnr = b.fbnr
+FROM area_commitment AS a
+WHERE a.fbnr < b.fbnr
+  AND COALESCE(a.year_from <= a.year_to, TRUE)
+  AND COALESCE(b.year_from <= b.year_to, TRUE)
+  AND SUBSTR(a.vtrgid, 0, 2) = SUBSTR(b.vtrgid, 0, 2)
+  AND (SELECT c.kgnr = d.kgnr AND COALESCE(c.rdnr = d.rdnr, TRUE) FROM area_commitment_contract c, area_commitment_contract d WHERE c.fbnr = a.fbnr AND d.fbnr = b.fbnr)
+  AND (a.gstnr = b.gstnr OR a.gstnr IN ('offen', '', '-')) AND a.area = b.area
+  AND a.year_to + 1 = b.year_from;
+
+-- copy comments
+UPDATE area_commitment_contract AS b
+SET comment = IIF(b.comment IS NULL, a.comment, CONCAT(b.comment, '; ', a.comment))
+FROM area_commitment_contract AS a
+WHERE a.comment IS NOT NULL AND a.fbnr IN (SELECT revnr FROM area_commitment WHERE revnr > 1 AND fbnr = b.fbnr);
+
+-- fix revnr
+UPDATE area_commitment AS b
+SET revnr = a.revnr + 1
+FROM area_commitment AS a
+WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
+UPDATE area_commitment AS b
+SET revnr = a.revnr + 1
+FROM area_commitment AS a
+WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
+UPDATE area_commitment AS b
+SET revnr = a.revnr + 1
+FROM area_commitment AS a
+WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
+
+-- fix year_from
+UPDATE area_commitment AS b
+SET year_from = a.year_to + 1
+FROM area_commitment AS a
+WHERE a.fbnr = b.fbnr AND a.revnr = b.revnr - 1
+  AND a.year_to = b.year_from;
+UPDATE area_commitment AS b
+SET year_from = a.year_to + 1
+FROM area_commitment AS a
+WHERE a.fbnr = b.fbnr AND a.revnr = b.revnr - 1
+  AND a.year_to = b.year_from;
+
+-- delete unreferenced contracts
+DELETE FROM area_commitment_contract
+WHERE fbnr IN (SELECT c.fbnr FROM area_commitment_contract c
+                           LEFT JOIN area_commitment a ON a.fbnr = c.fbnr
+               WHERE a.fbnr IS NULL);
+
+UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';

Elwig/Services/AreaComService.cs

@@ -20,35 +20,39 @@ namespace Elwig.Services {
         }
 
         public static void ClearInputs(this AreaComAdminViewModel vm) {
+            vm.Period = null;
+        }
+
+        public static void FillInputs(this AreaComAdminViewModel vm, AreaComContract c) {
+            vm.FbNr = c.FbNr;
+            vm.Period = c.YearTo == null ? $"ab {c.YearFrom}" : $"{c.YearFrom}\u2013{c.YearTo}";
+            vm.Comment = c.Comment;
+            vm.Kg = ControlUtils.GetItemFromSourceWithPk(vm.KgSource, c.KgNr) as AT_Kg;
+            vm.Rd = ControlUtils.GetItemFromSourceWithPk(vm.RdSource, c.KgNr, c.RdNr) as WbRd;
         }
 
         public static void FillInputs(this AreaComAdminViewModel vm, AreaCom a) {
-            vm.FbNr = a.FbNr;
             vm.MgNr = a.MgNr;
             vm.YearFrom = a.YearFrom;
             vm.YearTo = a.YearTo;
             vm.AreaComType = ControlUtils.GetItemFromSourceWithPk(vm.AreaComTypeSource, a.VtrgId) as AreaComType;
             vm.WineCult = ControlUtils.GetItemFromSourceWithPk(vm.WineCultSource, a.CultId) as WineCult;
-            vm.Comment = a.Comment;
-            vm.Kg = ControlUtils.GetItemFromSourceWithPk(vm.KgSource, a.KgNr) as AT_Kg;
-            vm.Rd = ControlUtils.GetItemFromSourceWithPk(vm.RdSource, a.KgNr, a.RdNr) as WbRd;
             vm.GstNr = a.GstNr;
             vm.Area = a.Area;
         }
 
-        public static async Task<(List<string>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
+        public static async Task<(List<string>, IQueryable<AreaComContract>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
             List<string> filterNames = [];
             IQueryable<AreaCom> areaComQuery = ctx.AreaCommitments.Where(a => a.MgNr == vm.FilterMember.MgNr).OrderBy(a => a.FbNr);
-            if (vm.ShowOnlyActiveAreaComs) {
-                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, Utils.CurrentLastSeason);
-                filterNames.Add($"laufend {Utils.CurrentLastSeason}");
+            if (vm.FilterSeason is int season) {
+                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, season);
+                filterNames.Add($"laufend {season}");
             }
 
             var filterVar = new List<string>();
             var filterNotVar = new List<string>();
             var filterAttr = new List<string>();
             var filterNotAttr = new List<string>();
-            var filterSeasons = new List<int>();
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
@@ -88,10 +92,6 @@ namespace Elwig.Services {
                         filter.RemoveAt(i--);
                         filterNames.Add($"ohne {var[e[1..3].ToUpper()].Name}");
                         filterNames.Add($"ohne Attribut {attrId[e[3..].ToUpper()].Name}");
-                    } else if (e.Length == 4 && int.TryParse(e, out var year)) {
-                        filterSeasons.Add(year);
-                        filter.RemoveAt(i--);
-                        filterNames.Add($"laufend {e}");
                     }
                 }
 
@@ -99,38 +99,50 @@ namespace Elwig.Services {
                 if (filterNotVar.Count > 0) areaComQuery = areaComQuery.Where(a => !filterNotVar.Contains(a.AreaComType.WineVar.SortId));
                 if (filterAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId != null && filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
                 if (filterNotAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId == null || !filterNotAttr.Contains(a.AreaComType.WineAttr.AttrId));
-                foreach (var year in filterSeasons) areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, year);
             }
 
-            return (filterNames, areaComQuery, filter);
+            IQueryable<AreaComContract> contracts = areaComQuery
+                .Select(c => c.Contract).Distinct()
+                .OrderBy(c => c.FbNr);
+
+            return (filterNames, contracts, areaComQuery, filter);
         }
 
-        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
+        public static async Task<(int FbNr, int RevNr)> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr, int? revNr) {
             int newFbNr = vm.FbNr!.Value;
 
             return await Task.Run(async () => {
                 using var ctx = new AppDbContext();
+                var c = new AreaComContract {
+                    FbNr = oldFbNr ?? newFbNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    KgNr = vm.Kg!.KgNr,
+                    RdNr = vm.Rd?.RdNr,
+                };
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
+                    RevNr = revNr ?? await ctx.NextRevNr(oldFbNr ?? newFbNr),
                     MgNr = vm.MgNr!.Value,
                     YearFrom = 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 = vm.Area!.Value,
                 };
 
                 if (vm.Rd?.RdNr == 0) {
-                    vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
-                    a.RdNr = vm.Rd.RdNr;
+                    vm.Rd.RdNr = await ctx.NextRdNr(c.KgNr);
+                    c.RdNr = vm.Rd.RdNr;
                     ctx.Add(vm.Rd);
                 }
 
                 if (oldFbNr != null) {
+                    ctx.Update(c);
+                } else {
+                    ctx.Add(c);
+                }
+                if (revNr != null) {
                     ctx.Update(a);
                 } else {
                     ctx.Add(a);
@@ -139,10 +151,10 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
 
                 if (newFbNr != a.FbNr) {
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_contract SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
 
-                return newFbNr;
+                return (newFbNr, a.RevNr);
             });
         }
 
@@ -256,7 +268,16 @@ namespace Elwig.Services {
         public static async Task DeleteAreaCom(int fbnr) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
+                var l = (await ctx.AreaCommitmentContracts.FindAsync(fbnr))!;
+                ctx.Remove(l);
+                await ctx.SaveChangesAsync();
+            });
+        }
+
+        public static async Task DeleteAreaComRevision(int fbnr, int revnr) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var l = (await ctx.AreaCommitments.FindAsync(fbnr, revnr))!;
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
             });

Elwig/Services/DeliveryService.cs

@@ -27,10 +27,7 @@ namespace Elwig.Services {
 
         public static async Task<Member?> GetMemberAsync(int mgnr) {
             using var ctx = new AppDbContext();
-            return await ctx.Members
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
-                .FirstOrDefaultAsync(m => m.MgNr == mgnr);
+            return await ctx.Members.FirstOrDefaultAsync(m => m.MgNr == mgnr);
         }
 
         public static Member? GetMember(int mgnr) {
@@ -71,7 +68,7 @@ namespace Elwig.Services {
             vm.IsNetWeight = p.IsNetWeight;
 
             vm.Modifiers.Clear();
-            foreach (var m in p.Modifiers) {
+            foreach (var m in p.PartModifiers) {
                 vm.Modifiers.Add((Modifier)ControlUtils.GetItemFromSourceWithPk(vm.ModifiersSource, m.Year, m.ModId)!);
             }
 
@@ -472,6 +469,7 @@ namespace Elwig.Services {
                 DeliveryPart p;
 
                 using var ctx = new AppDbContext();
+                using var tx = await ctx.Database.BeginTransactionAsync();
                 int year = oldYear ?? Utils.CurrentYear;
                 int did = oldDid ?? await ctx.NextDId(year);
                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -556,13 +554,13 @@ namespace Elwig.Services {
                 if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
                     // update origin (KgNr), if default is selected
                     var newKgNr = (await ctx.Members.FindAsync(d.MgNr))?.DefaultKgNr;
-                    foreach (var part in d.Parts.Where(part => part.DPNr != dpnr && part.KgNr == originalMemberKgNr)) {
-                        part.KgNr = newKgNr;
-                        ctx.Update(part);
-                    }
+                    await ctx.DeliveryParts
+                        .Where(p => p.Year == d.Year && p.DId == d.DId && p.DPNr != dpnr && p.KgNr == originalMemberKgNr)
+                        .ExecuteUpdateAsync(u => u.SetProperty(p => p.KgNr, newKgNr));
                 }
 
                 await ctx.SaveChangesAsync();
+                await tx.CommitAsync();
 
                 return p;
             });
@@ -574,7 +572,10 @@ namespace Elwig.Services {
 
                 using var ctx = new AppDbContext();
                 bool anyLeft = false;
-                var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                var d = await ctx.Deliveries
+                    .Where(d => d.Year == year && d.DId == did)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                    .SingleAsync();
                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
                 n = new Delivery {
                     Year = year,
@@ -601,7 +602,11 @@ namespace Elwig.Services {
                         anyLeft = true;
                         p.Weight -= w;
                         ctx.Update(p);
-                        var s = ctx.CreateProxy<DeliveryPart>();
+                        var s = new DeliveryPart {
+                            SortId = null!,
+                            QualId = null!,
+                            HkId = null!,
+                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(s).CurrentValues.SetValues(values);
                         s.Year = n.Year;
@@ -633,7 +638,10 @@ namespace Elwig.Services {
                 using var ctx = new AppDbContext();
                 var anyLeft = false;
                 n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
-                var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                var d = await ctx.Deliveries
+                    .Where(d => d.Year == year && d.DId == did)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                    .SingleAsync();
                 var dpnr = await ctx.NextDPNr(n.Year, n.DId);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
                     if (w <= 0) {
@@ -645,7 +653,11 @@ namespace Elwig.Services {
                         anyLeft = true;
                         p.Weight -= w;
                         ctx.Update(p);
-                        var s = ctx.CreateProxy<DeliveryPart>();
+                        var s = new DeliveryPart {
+                            SortId = null!,
+                            QualId = null!,
+                            HkId = null!,
+                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(s).CurrentValues.SetValues(values);
                         s.Year = n.Year;
@@ -674,7 +686,10 @@ namespace Elwig.Services {
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                var d = await ctx.Deliveries
+                    .Where(d => d.Year == year && d.DId == did)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                    .SingleAsync();
                 var dpnr = await ctx.NextDPNr(year, did);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
                     if (w <= 0) {
@@ -686,7 +701,11 @@ namespace Elwig.Services {
                     } else {
                         p.Weight -= w;
                         ctx.Update(p);
-                        var n = ctx.CreateProxy<DeliveryPart>();
+                        var n = new DeliveryPart {
+                            SortId = null!,
+                            QualId = null!,
+                            HkId = null!,
+                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(n).CurrentValues.SetValues(values);
                         n.DPNr = dpnr++;
@@ -711,10 +730,8 @@ namespace Elwig.Services {
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 try {
-                    using var ctx = new AppDbContext();
-                    var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    using var doc = new DeliveryNote(d, ctx);
-                    await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
+                    using var doc = await DeliveryNote.Initialize(year, did);
+                    await Utils.ExportDocument(doc, mode, doc.Delivery.LsNr, (doc.Member, $"{DeliveryNote.Name} Nr. {doc.Delivery.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {doc.Delivery.LsNr}"));
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
@@ -792,9 +809,6 @@ namespace Elwig.Services {
                                 .Select(p => p.Delivery)
                                 .Distinct()
                                 .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                                .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                                .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
-                                .AsSplitQuery()
                                 .ToListAsync();
                             var wbKgs = list
                                 .SelectMany(d => d.Parts)

Elwig/Services/MemberService.cs

@@ -395,8 +395,7 @@ namespace Elwig.Services {
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 try {
-                    using var ctx = new AppDbContext();
-                    using var doc = new MemberDataSheet(m, ctx);
+                    using var doc = new MemberDataSheet(m);
                     await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -414,9 +413,7 @@ namespace Elwig.Services {
                     await b.CalculateBuckets();
                     App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
-                    using var doc = new DeliveryConfirmation(ctx, year, m, data);
+                    using var doc = new DeliveryConfirmation(year, m);
                     await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -429,16 +426,8 @@ namespace Elwig.Services {
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 try {
-                    using var ctx = new AppDbContext();
-                    var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                    var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr);
-                    var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
-                    var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
-
-                    using var doc = new CreditNote(ctx, p, data[m.MgNr],
-                        b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
-                        await ctx.GetMemberUnderDelivery(year, m.MgNr));
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
+                    using var doc = await CreditNote.Initialize(year, avnr, m.MgNr);
+                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {doc.Payment.Variant.Name}", $"Im Anhang finden Sie die Traubengutschrift {doc.Payment.Variant.Name}"));
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
@@ -520,10 +509,8 @@ namespace Elwig.Services {
                         try {
                             var members = await query
                                 .OrderBy(m => m.MgNr)
-                                .Include(m => m.BillingAddress)
                                 .Include(m => m.TelephoneNumbers)
                                 .Include(m => m.EmailAddresses)
-                                .AsSplitQuery()
                                 .ToListAsync();
                             using var exporter = new VCard(d.FileName);
                             await exporter.ExportAsync(members);
@@ -548,16 +535,13 @@ namespace Elwig.Services {
                         try {
                             var members = await query
                                 .OrderBy(m => m.MgNr)
-                                .Include(m => m.BillingAddress)
                                 .Include(m => m.TelephoneNumbers)
                                 .Include(m => m.EmailAddresses)
-                                .Include(m => m.DefaultWbKg!.Gl)
-                                .AsSplitQuery()
                                 .ToListAsync();
                             var areaComs = await query
                                 .SelectMany(m => m.AreaCommitments)
-                                .Include(c => c.Rd)
-                                .Include(c => c.Kg.Gl)
+                                .Select(c => c.Contract).Distinct()
+                                .Include(c => c.Revisions)
                                 .ToListAsync();
                             var wbKgs = members
                                 .Where(m => m.DefaultWbKg != null)
@@ -681,19 +665,17 @@ namespace Elwig.Services {
                         .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,
+                    ctx.AddRange(await Task.WhenAll(areaComs.Select(async (c, i) => new AreaCom {
+                        FbNr = c.FbNr,
+                        RevNr = await ctx.NextRevNr(c.FbNr),
                         MgNr = m.MgNr,
                         VtrgId = c.VtrgId,
                         CultId = c.CultId,
                         Area = c.Area,
-                        KgNr = c.KgNr,
                         GstNr = c.GstNr,
-                        RdNr = c.RdNr,
-                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
+                        YearFrom = year,
                         YearTo = c.YearTo,
-                    }));
+                    })));
 
                     foreach (var ac in areaComs)
                         ac.YearTo = year - 1;
@@ -725,18 +707,20 @@ namespace Elwig.Services {
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
+                using var tx = await ctx.Database.BeginTransactionAsync();
                 var l = (await ctx.Members.FindAsync(mgnr))!;
                 if (deletePaymentData) {
-                    ctx.RemoveRange(l.Credits);
+                    await ctx.Credits.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
                 }
                 if (deleteDeliveries) {
-                    ctx.RemoveRange(l.Deliveries);
+                    await ctx.Deliveries.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
                 }
                 if (deleteAreaComs) {
-                    ctx.RemoveRange(l.AreaCommitments);
+                    await ctx.AreaCommitments.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
                 }
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
+                await tx.CommitAsync();
             });
         }
     }

Elwig/Services/PaymentVariantService.cs

@@ -214,9 +214,7 @@ namespace Elwig.Services {
                 Mouse.OverrideCursor = Cursors.Wait;
                 await Task.Run(async () => {
                     try {
-                        using var ctx = new AppDbContext();
-                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                        using var doc = new PaymentVariantSummary((await ctx.PaymentVariants.FindAsync(v.Year, v.AvNr))!, data);
+                        using var doc = await PaymentVariantSummary.Initialize(v.Year, v.AvNr);
                         await Utils.ExportDocument(doc, mode);
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);

Elwig/Services/SyncService.cs

@@ -16,6 +16,7 @@ namespace Elwig.Services {
     public static class SyncService {
 
         public static readonly Expression<Func<Member, bool>> ChangedMembers = (m) => ((m.XTime == null && m.MTime > 1751328000) || m.MTime > m.XTime) && (m.ITime == null || m.MTime > m.ITime);
+        public static readonly Expression<Func<AreaComContract, bool>> ChangedAreaComContracts = (c) => ((c.XTime == null && c.MTime > 1751328000) || c.MTime > c.XTime) && (c.ITime == null || c.MTime > c.ITime);
         public static readonly Expression<Func<Delivery, bool>> ChangedDeliveries = (d) => ((d.XTime == null && d.MTime > 1751328000) || d.MTime > d.XTime) && (d.ITime == null || d.MTime > d.ITime);
 
         public static async Task Upload(string url, string username, string password, IQueryable<Member> query, IEnumerable<string> filterNames) {
@@ -24,17 +25,14 @@ namespace Elwig.Services {
                 var path = Path.Combine(App.TempPath, filename);
                 var members = await query
                     .OrderBy(m => m.MgNr)
-                    .Include(m => m.BillingAddress)
                     .Include(m => m.TelephoneNumbers)
                     .Include(m => m.EmailAddresses)
-                    .Include(m => m.DefaultWbKg!.Gl)
-                    .AsSplitQuery()
                     .ToListAsync();
                 var areaComs = await query
                     .SelectMany(m => m.AreaCommitments)
-                    .OrderBy(c => c.MgNr).ThenBy(c => c.FbNr)
-                    .Include(c => c.Rd)
-                    .Include(c => c.Kg.Gl)
+                    .Select(c => c.Contract).Distinct()
+                    .OrderBy(c => c.FbNr)
+                    .Include(c => c.Revisions)
                     .ToListAsync();
                 var wbKgs = members
                     .Where(m => m.DefaultWbKg != null)
@@ -50,7 +48,7 @@ namespace Elwig.Services {
                     var exportedAt = DateTime.Now;
                     await ElwigData.Export(path, members, areaComs, wbKgs, filterNames);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, [], exportedAt);
+                    await UpdateExportedAt(members, areaComs, [], exportedAt);
                     MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
                 }
@@ -70,10 +68,7 @@ namespace Elwig.Services {
                 var list = await query
                     .Select(p => p.Delivery)
                     .Distinct()
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-                    .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                    .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
-                    .AsSplitQuery()
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
                     .ToListAsync();
                 var wbKgs = list
                     .SelectMany(d => d.Parts)
@@ -89,7 +84,7 @@ namespace Elwig.Services {
                     var exportedAt = DateTime.Now;
                     await ElwigData.Export(path, list, wbKgs, filterNames);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt([], list, exportedAt);
+                    await UpdateExportedAt([], [], list, exportedAt);
                     MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
                 }
@@ -106,32 +101,24 @@ namespace Elwig.Services {
             try {
                 var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
                 List<Member> members;
-                List<AreaCom> areaComs;
+                List<AreaComContract> areaComs;
                 List<Delivery> deliveries;
                 using (var ctx = new AppDbContext()) {
                     members = await ctx.Members
                         .Where(ChangedMembers)
-                        .Include(m => m.BillingAddress)
                         .Include(m => m.TelephoneNumbers)
                         .Include(m => m.EmailAddresses)
-                        .Include(m => m.DefaultWbKg!.Gl)
                         .OrderBy(m => m.MgNr)
-                        .AsSplitQuery()
                         .ToListAsync();
-                    areaComs = await ctx.Members
-                       .Where(ChangedMembers)
-                       .SelectMany(m => m.AreaCommitments)
-                       .Include(c => c.Rd)
-                       .Include(c => c.Kg.Gl)
-                       .OrderBy(c => c.MgNr).ThenBy(c => c.FbNr)
+                    areaComs = await ctx.AreaCommitmentContracts
+                       .Where(ChangedAreaComContracts)
+                       .Include(c => c.Revisions)
+                       .OrderBy(c => c.FbNr)
                        .ToListAsync();
                     deliveries = await ctx.Deliveries
                         .Where(ChangedDeliveries)
-                        .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-                        .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                        .Include(d => d.Parts).ThenInclude(p => p.Kg).ThenInclude(k => k!.Gl)
+                        .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
                         .OrderBy(d => d.DateString).ThenBy(d => d.TimeString).ThenBy(d => d.LsNr)
-                        .AsSplitQuery()
                         .ToListAsync();
                 }
                 var wbKgs = members
@@ -151,13 +138,13 @@ namespace Elwig.Services {
                     var exportedAt = DateTime.Now;
                     await (new ElwigData.ElwigExport {
                         Members = (members, ["geändert seit letztem Export"]),
-                        AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+                        AreaComs = (areaComs, ["geändert seit letztem Export"]),
                         Deliveries = (deliveries, ["geändert seit letzem Export"]),
                         WbKgs = (wbKgs, ["von exportierten Mitgliedern, Flächenbindungen und Lieferungen"]),
                     }).Export(path);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, deliveries, exportedAt);
-                    MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern und {deliveries.Count:N0} Lieferungen erfolgreich!", "Mitglieder und Lieferungen hochladen",
+                    await UpdateExportedAt(members, areaComs, deliveries, exportedAt);
+                    MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern, {areaComs.Count:N0} Flächenbindungsverträgen, und {deliveries.Count:N0} Lieferungen erfolgreich!", "Mitglieder und Lieferungen hochladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {
@@ -176,11 +163,8 @@ namespace Elwig.Services {
                 using var ctx = new AppDbContext();
                 var deliveries = await ctx.Deliveries
                     .Where(d => d.Year == year && d.ZwstId == App.ZwstId)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-                    .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                    .Include(d => d.Parts).ThenInclude(p => p.Kg).ThenInclude(k => k!.Gl)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
                     .OrderBy(d => d.DateString).ThenBy(d => d.TimeString).ThenBy(d => d.LsNr)
-                    .AsSplitQuery()
                     .ToListAsync();
                 var wbKgs = deliveries
                     .SelectMany(d => d.Parts)
@@ -195,7 +179,7 @@ namespace Elwig.Services {
                     var exportedAt = DateTime.Now;
                     await ElwigData.Export(path, deliveries, wbKgs, [$"{year}", $"Zweigstelle {App.BranchName}"]);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt([], deliveries, exportedAt);
+                    await UpdateExportedAt([], [], deliveries, exportedAt);
                     MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
                 }
@@ -251,19 +235,21 @@ namespace Elwig.Services {
             }
         }
 
-        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<Delivery> deliveries, DateTime dateTime) {
+        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<AreaComContract> contracts, IEnumerable<Delivery> deliveries, DateTime dateTime) {
             var timestamp = ((DateTimeOffset)dateTime.ToUniversalTime()).ToUnixTimeSeconds();
             var mgnrs = string.Join(",", member.Select(m => $"{m.MgNr}").Append("0"));
+            var fbnrs = string.Join(",", contracts.Select(c => $"{c.FbNr}").Append("0"));
             var dids = string.Join(",", deliveries.Select(d => $"({d.Year},{d.DId})").Append("(0,0)"));
             using (var cnx = await AppDbContext.ConnectAsync()) {
                 await cnx.ExecuteBatch($"""
                     BEGIN;
-                    UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
-                    UPDATE member           SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
-                    UPDATE area_commitment  SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
-                    UPDATE delivery         SET xtime = {timestamp} WHERE (year, did) IN ({dids});
-                    UPDATE delivery_part    SET xtime = {timestamp} WHERE (year, did) IN ({dids});
-                    UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                    UPDATE client_parameter          SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                    UPDATE member                    SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
+                    UPDATE area_commitment_contract  SET xtime = {timestamp} WHERE fbnr IN ({fbnrs});
+                    UPDATE area_commitment           SET xtime = {timestamp} WHERE fbnr IN ({fbnrs});
+                    UPDATE delivery                  SET xtime = {timestamp} WHERE (year, did) IN ({dids});
+                    UPDATE delivery_part             SET xtime = {timestamp} WHERE (year, did) IN ({dids});
+                    UPDATE client_parameter          SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
                     COMMIT;
                     """);
             }
@@ -272,7 +258,7 @@ namespace Elwig.Services {
 
         public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password) {
             try {
-                return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
+                return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.AreaCommitmentContracts.AnyAsync(ChangedAreaComContracts) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
             } catch {
                 return false;
             }

Elwig/ViewModels/AreaComAdminViewModel.cs

@@ -20,7 +20,11 @@ namespace Elwig.ViewModels {
         }
 
         [ObservableProperty]
-        private bool _showOnlyActiveAreaComs;
+        private string? _filterSeasonString;
+        public int? FilterSeason {
+            get => int.TryParse(FilterSeasonString, out var year) ? year : null;
+            set => FilterSeasonString = $"{value}";
+        }
 
         [ObservableProperty]
         private string? _fbNrString;
@@ -46,6 +50,8 @@ namespace Elwig.ViewModels {
             get => int.TryParse(YearToString, out var year) ? year : null;
             set => YearToString = $"{value}";
         }
+        [ObservableProperty]
+        private string? _period;
 
         [ObservableProperty]
         private AreaComType? _areaComType;

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -11,7 +11,6 @@ namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
-        public bool MaintainAreaComYearFrom = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
@@ -21,7 +20,7 @@ namespace Elwig.ViewModels {
         public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
-        private bool _showOnlyActiveMembers;
+        private bool _showOnlyActiveMembers = true;
 
         [ObservableProperty]
         private Member? _selectedMember;

Elwig/Windows/AdministrationWindow.cs

@@ -349,7 +349,6 @@ namespace Elwig.Windows {
                 using var ctx = new AppDbContext();
                 list = await ctx.PlzDestinations
                    .Where(p => p.Plz == plz)
-                   .Include(p => p.Ort)
                    .ToListAsync();
             }
 

Elwig/Windows/AreaComAdminWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860">
+        Title="{Binding Title}" Height="600" MinHeight="550" Width="1000" MinWidth="860">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
     </Window.DataContext>
@@ -56,7 +56,7 @@
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*" MinWidth="500"/>
+            <ColumnDefinition Width="2*" MinWidth="500"/>
             <ColumnDefinition Width="5"/>
             <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
@@ -77,7 +77,7 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Grid.ColumnSpan="3" Margin="5,5,190,0" IsReadOnly="False"
+                     Grid.ColumnSpan="3" Margin="5,5,66,0" IsReadOnly="False"
                      TextChanged="SearchInput_TextChanged">
                 <TextBox.ToolTip>
                     <TextBlock>
@@ -93,9 +93,10 @@
                     </TextBlock>
                 </TextBox.ToolTip>
             </TextBox>
-            <CheckBox x:Name="ActiveAreaCommitmentInput" Content="Nur laufende anzeigen (2020)" IsChecked="{Binding ShowOnlyActiveAreaComs}"
-                      Checked="ActiveAreaCommitmentInput_Changed" Unchecked="ActiveAreaCommitmentInput_Changed"
-                      HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+            <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                                Margin="0,5,5,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                TextChanged="SeasonInput_TextChanged"/>
 
             <DataGrid x:Name="AreaCommitmentList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
@@ -109,25 +110,24 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding Latest.AreaComType.VtrgId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding Latest.AreaComType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Fläche" Binding="{Binding Area, StringFormat='{}{0:N0} m² '}" Width="80">
+                    <DataGridTextColumn Header="Fläche" Binding="{Binding Latest.Area, StringFormat='{}{0:N0} m² '}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="100"/>
                     <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="130"/>
-                    <DataGridTextColumn Header="Bewirt."            Binding="{Binding WineCult.Name}" Width="60"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding Latest.GstNr}"         Width="130"/>
+                    <DataGridTextColumn Header="Bewirt."            Binding="{Binding Latest.WineCult.Name}" Width="60"/>
                     <DataGridTextColumn Header="Von"                Binding="{Binding YearFrom}"      Width="48"/>
                     <DataGridTextColumn Header="Bis"                Binding="{Binding YearTo}"        Width="48"/>
                 </DataGrid.Columns>
@@ -176,91 +176,119 @@
 
         <Grid Grid.Column="2" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="1.125*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="230"/>
             </Grid.RowDefinitions>
 
-            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+            <GroupBox Header="Vertrag" Grid.Row="0" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="48"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False"
-                             Margin="0,10,0,0" Width="48" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"/>
-
-                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <Label Content="FB-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="FbNrInput" Text="{Binding FbNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Width="56" HorizontalAlignment="Left" Grid.Column="3" TextAlignment="Right"
+                             Margin="0,10,0,0" Width="56" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"
                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                    <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <Label Content="–" Grid.Column="1" Grid.ColumnSpan="3" Margin="45,40,0,0"/>
-                    <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="3" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="Laufzeit:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <TextBlock x:Name="Period" Text="{Binding Period}"
+                               Margin="0,14,10,0" Grid.Column="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
 
-                    <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                    <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
-                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"/>
-                    <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
-                            Click="AreaComTypeDetailsButton_Click"
+                    <Label Content="KG:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="KgInput" SelectedItem="{Binding Kg, Mode=TwoWay}" ItemsSource="{Binding KgSource, Mode=TwoWay}"
+                              ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,40,40,10" Grid.Column="1" Grid.ColumnSpan="3"
+                              SelectionChanged="KgInput_SelectionChanged"/>
+                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="KgDetailsButton_Click"
+                            Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,40,10,10"/>
+
+                    <Label Content="Ried:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="RdInput" SelectedItem="{Binding RdObj, Mode=TwoWay}" ItemsSource="{Binding RdSource, Mode=TwoWay}"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name" IsEditable="True"
+                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"
+                              SelectionChanged="RdInput_SelectionChanged"/>
+                    <Button x:Name="RdAddButton" Content="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0,0,0,0" IsEnabled="False"
+                            Click="RdAddButton_Click"
                             Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
 
-                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                    <ComboBox x:Name="WineCultivationInput" SelectedItem="{Binding WineCultObj, Mode=TwoWay}" ItemsSource="{Binding WineCultSource, Mode=TwoWay}"
-                              DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-
-                    <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <Label Content="Anmerkung:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              TextChanged="TextBox_TextChanged"
-                             HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                             HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+
+                    <ListBox x:Name="RevisionList" Grid.ColumnSpan="4" Margin="5,135,5,5"
+                             SelectionChanged="RevisionList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding YearFrom}" Width="28" TextAlignment="Right" Margin="0,0,0,0"/>
+                                    <TextBlock Text="&#x2013;" TextAlignment="Center" Margin="0,0,0,0"/>
+                                    <TextBlock Text="{Binding YearTo}" Width="28" TextAlignment="Left" Margin="0,0,0,0"/>
+                                    <TextBlock Text="{Binding VtrgId}" Width="40" TextAlignment="Center" Foreground="{Binding AreaComType.WineVar.Color}"/>
+                                    <TextBlock Text="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding Member.AdministrativeName}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
+            <GroupBox Header="Revision" Grid.Row="1" Margin="5,5,5,10">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="KgInput" SelectedItem="{Binding Kg, Mode=TwoWay}" ItemsSource="{Binding KgSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                              HorizontalAlignment="Stretch" Margin="0,10,40,10" Grid.Column="1"
-                              SelectionChanged="KgInput_SelectionChanged"/>
-                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
-                            Click="KgDetailsButton_Click"
-                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,10,10,10"/>
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+                    <ComboBox x:Name="MemberInput"
+                              Grid.Column="1" Margin="53,10,40,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged"/>
+                    <Button x:Name="MemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0,0,0,0"
+                            Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
+                            Click="MemberReferenceButton_Click"/>
 
-                    <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="RdInput" SelectedItem="{Binding RdObj, Mode=TwoWay}" ItemsSource="{Binding RdSource, Mode=TwoWay}"
-                              DisplayMemberPath="Name" TextSearch.TextPath="Name" IsEditable="True"
-                              HorizontalAlignment="Stretch" Margin="0,40,40,10" Grid.Column="1"
-                              SelectionChanged="RdInput_SelectionChanged"/>
-                    <Button x:Name="RdAddButton" Content="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0,0,0,0" IsEnabled="False"
-                            Click="RdAddButton_Click"
-                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,40,10,10"/>
+                    <Label Content="Laufzeit:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="&#x2013;" Grid.Column="1" Margin="45,40,0,0"/>
+                    <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                    <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="GstNrInput" Text="{Binding GstNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
-                             TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
+                              ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
+                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1"/>
+                    <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="AreaComTypeDetailsButton_Click"
+                            Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
 
-                    <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="WineCultivationInput" SelectedItem="{Binding WineCultObj, Mode=TwoWay}" ItemsSource="{Binding WineCultSource, Mode=TwoWay}"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1"/>
+
+                    <Label Content="Fläche:" Margin="10,130,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" Text="{Binding AreaString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       TextChanged="IntegerInput_TextChanged"
-                                      Grid.Column="1" Width="70" Margin="0,100,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                      Grid.Column="1" Width="70" Margin="0,130,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+
+                    <Label Content="Parzelle(n):" Margin="10,160,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GstNrInput" Text="{Binding GstNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,160,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
+                             TextChanged="TextBox_TextChanged"/>
                 </Grid>
             </GroupBox>
         </Grid>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -25,19 +25,18 @@ namespace Elwig.Windows {
             ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ExemptInputs = [
-                MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
-                EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
-                ResetButton, CancelButton, SearchInput, ActiveAreaCommitmentInput
+                AreaCommitmentList, RevisionList,
+                NewAreaCommitmentButton, EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
+                ResetButton, CancelButton, SearchInput, SeasonInput
             ];
             RequiredInputs = [
-                FbNrInput, YearFromInput, KgInput, RdInput,
+                FbNrInput, MgNrInput, MemberInput, YearFromInput, KgInput, RdInput,
                 GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
             ];
 
             ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
-            ActiveAreaCommitmentInput.Content = ((string)ActiveAreaCommitmentInput.Content).Replace("2020", $"{Utils.CurrentLastSeason}");
-            ActiveAreaCommitmentInput.IsChecked = true;
+            ViewModel.FilterSeason = Utils.CurrentYear;
         }
 
         protected override async Task OnInit(AppDbContext ctx) {
@@ -55,38 +54,35 @@ namespace Elwig.Windows {
             var vm = ViewModel;
             var cursor = Mouse.OverrideCursor != null;
             if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
-            var query = (vm.SearchQuery, vm.ShowOnlyActiveAreaComs);
-            var (filter, areaComs, areaComCount, stat) = await Task.Run(async () => {
+            var query = (vm.SearchQuery, vm.FilterSeason);
+            var (filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var (_, areaComQuery, filter) = await vm.GetFilters(ctx);
-                var areaComs = await areaComQuery
-                    .Include(a => a.Kg.AtKg)
-                    .Include(a => a.Rd!.Kg.AtKg)
-                    .Include(a => a.WineCult)
-                    .Include(a => a.AreaComType.WineAttr)
-                    .Include(a => a.AreaComType.WineVar)
+                var (_, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
+                var contracts = await contractQuery
+                    .Include(c => c.Revisions).ThenInclude(a => a.Member)
                     .ToListAsync();
+                var areaComs = await areaComQuery.ToListAsync();
 
-                if (filter.Count > 0 && areaComs.Count > 0) {
-                    var dict = areaComs.AsParallel()
+                if (filter.Count > 0 && contracts.Count > 0) {
+                    var dict = contracts.AsParallel()
                         .ToDictionary(d => d, d => d.SearchScore(vm.TextFilter))
                         .OrderByDescending(c => c.Value);
                     var threshold = dict.Max(a => a.Value) * 3 / 4;
-                    areaComs = [.. dict
-                        .Where(a => a.Value > threshold)
-                        .Select(a => a.Key)];
+                    contracts = [.. dict
+                    .Where(a => a.Value > threshold)
+                    .Select(a => a.Key)];
                 }
 
                 var areaComCount = await areaComQuery.CountAsync();
                 var season = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
                 var stat = await AreaComService.GenerateToolTipData(areaComQuery, season?.MaxKgPerHa ?? 10_000);
 
-                return (filter, areaComs, areaComCount, stat);
+                return (filter, contracts, areaComs, areaComCount, stat);
             });
             if (!cursor) Mouse.OverrideCursor = null;
-            if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveAreaComs)) return;
+            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason)) return;
 
-            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs,
+            ControlUtils.RenewItemsSource(AreaCommitmentList, contracts,
                 AreaCommitmentList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             RefreshInputs();
 
@@ -96,8 +92,8 @@ namespace Elwig.Windows {
                 ViewModel.StatusArea = text;
                 ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
             } else {
-                ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
-                ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";
+                ViewModel.StatusAreaCommitments = $"{contracts.Count:N0}";
+                ViewModel.StatusArea = $"{areaComs.Sum(a => a.Area):N0} m²";
                 ViewModel.StatusAreaToolTip = null;
             }
             var groups = areaComs.GroupBy(a => $"{a.AreaComType.SortId}{a.AreaComType.AttrId}").Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
@@ -106,12 +102,25 @@ namespace Elwig.Windows {
                 ViewModel.StatusContracts += $" ({string.Join(", ", groups.Select(g => g.Key))})";
         }
 
+        private async Task RefreshRevisions() {
+            using var ctx = new AppDbContext();
+            if (AreaCommitmentList.SelectedItem is AreaComContract c) {
+                ControlUtils.RenewItemsSource(RevisionList, c.Revisions.OrderByDescending(p => p.RevNr).ToList(), RevisionList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+            } else {
+                RevisionList.ItemsSource = null;
+            }
+        }
+
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            if (AreaCommitmentList.SelectedItem is AreaCom a) {
+            if (RevisionList.SelectedItem is AreaCom a) {
                 EditAreaCommitmentButton.IsEnabled = true;
                 DeleteAreaCommitmentButton.IsEnabled = true;
                 FillInputs(a);
+            } else if (AreaCommitmentList.SelectedItem is AreaComContract c) {
+                EditAreaCommitmentButton.IsEnabled = true;
+                DeleteAreaCommitmentButton.IsEnabled = true;
+                FillInputs(c);
             } else {
                 EditAreaCommitmentButton.IsEnabled = false;
                 DeleteAreaCommitmentButton.IsEnabled = false;
@@ -123,7 +132,15 @@ namespace Elwig.Windows {
             GC.Collect();
         }
 
+        private void FillInputs(AreaComContract c) {
+            ClearOriginalValues();
+            ClearDefaultValues();
+            ViewModel.FillInputs(c);
+            FinishInputFilling();
+        }
+
         private void FillInputs(AreaCom a) {
+            FillInputs(a.Contract);
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(a);
@@ -138,6 +155,11 @@ namespace Elwig.Windows {
             ValidateRequiredInputs();
         }
 
+        new protected void ClearInputs(bool validate = false) {
+            ViewModel.ClearInputs();
+            base.ClearInputs(validate);
+        }
+
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
 
@@ -158,6 +180,9 @@ namespace Elwig.Windows {
                 .Include(c => c.WineAttr)
                 .OrderBy(v => v.VtrgId)
                 .ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .OrderBy(m => m.Name).ThenBy(m => m.GivenName).ThenBy(m => m.MgNr)
+                .ToListAsync());
             var cultList = await ctx.WineCultivations
                 .OrderBy(c => c.Name)
                 .Cast<object>().ToListAsync();
@@ -176,6 +201,7 @@ namespace Elwig.Windows {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
+            RevisionList.IsEnabled = false;
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
             UnlockInputs();
@@ -196,6 +222,7 @@ namespace Elwig.Windows {
 
             IsEditing = true;
             AreaCommitmentList.IsEnabled = false;
+            RevisionList.IsEnabled = false;
 
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
@@ -210,10 +237,10 @@ namespace Elwig.Windows {
         }
 
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (AreaCommitmentList.SelectedItem is not AreaCom a)
+            if (RevisionList.SelectedItem is not AreaCom a)
                 return;
 
-            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true);
+            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
             if (d.ShowDialog() != true)
                 return;
 
@@ -221,7 +248,7 @@ namespace Elwig.Windows {
             try {
                 if (d.YearTo is int yearTo) {
                     ViewModel.YearTo = yearTo;
-                    await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
+                    await ViewModel.UpdateAreaCommitment(a.FbNr, a.RevNr);
                 } else {
                     await AreaComService.DeleteAreaCom(a.FbNr);
                 }
@@ -244,42 +271,38 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
 
             int? yearTo = null;
-            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput)) {
-                var a = (AreaCommitmentList.SelectedItem as AreaCom)!;
-                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false);
-                if (d.ShowDialog() != true)
+            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput) || InputHasChanged(MgNrInput)) {
+                var a = (RevisionList.SelectedItem as AreaCom)!;
+                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
+                if (d.ShowDialog() != true) {
+                    SaveButton.IsEnabled = true;
                     return;
+                }
                 yearTo = d.YearTo;
             }
 
-            int fbnr;
+            int fbnr, revnr;
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 AreaCom? temp = null;
                 if (yearTo != null && (!ViewModel.YearTo.HasValue || yearTo < ViewModel.YearTo)) {
                     temp = new AreaCom {
-                        FbNr = ViewModel.FbNr!.Value,
                         MgNr = ViewModel.MgNr!.Value,
                         YearFrom = ViewModel.YearFrom,
                         YearTo = ViewModel.YearTo,
                         VtrgId = ViewModel.AreaComType!.VtrgId,
                         CultId = ViewModel.WineCult?.CultId,
-                        Comment = ViewModel.Comment,
-                        KgNr = ViewModel.Kg!.KgNr,
-                        RdNr = ViewModel.Rd?.RdNr,
                         GstNr = ViewModel.GstNr?.Trim() ?? "-",
                         Area = ViewModel.Area!.Value,
                     };
                     RefreshInputs();
                     ViewModel.YearTo = yearTo;
                 }
-                fbnr = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
+                (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, (RevisionList.SelectedItem as AreaCom)?.RevNr);
                 if (temp is AreaCom t) {
-                    await ViewModel.InitInputs();
-                    t.FbNr = ViewModel.FbNr!.Value;
                     t.YearFrom = yearTo + 1;
                     ViewModel.FillInputs(t);
-                    fbnr = await ViewModel.UpdateAreaCommitment(null);
+                    (fbnr, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, null);
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
@@ -294,6 +317,7 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
+            RevisionList.IsEnabled = true;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             LockInputs();
@@ -302,7 +326,9 @@ namespace Elwig.Windows {
             await EnsureContextRenewed();
             Mouse.OverrideCursor = null;
             ViewModel.SearchQuery = "";
-            ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
+            ViewModel.FilterSeason = ViewModel.YearTo ?? ViewModel.YearFrom ?? ViewModel.FilterSeason;
+            ControlUtils.SelectItemWithPk(AreaCommitmentList, fbnr);
+            ControlUtils.SelectItemWithPk(RevisionList, fbnr, revnr);
         }
 
         protected override void ShortcutReset() {
@@ -324,6 +350,7 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
+            RevisionList.IsEnabled = true;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             RefreshInputs();
@@ -385,22 +412,46 @@ namespace Elwig.Windows {
 
         private void LockSearchInputs() {
             SearchInput.IsEnabled = false;
-            ActiveAreaCommitmentInput.IsEnabled = false;
+            SeasonInput.IsEnabled = false;
         }
 
         private void UnlockSearchInputs() {
             SearchInput.IsEnabled = true;
-            ActiveAreaCommitmentInput.IsEnabled = true;
+            SeasonInput.IsEnabled = true;
         }
 
-        private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private async void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (AreaCommitmentList.SelectedItem != null)
                 AreaCommitmentList.ScrollIntoView(AreaCommitmentList.SelectedItem);
-            RefreshInputs();
+            await RefreshRevisions();
         }
 
-        private void AttributesInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void RevisionList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            RefreshInputs();
+            if (RevisionList.SelectedItem is AreaCom c) {
+                EditAreaCommitmentButton.IsEnabled = true;
+            } else {
+                EditAreaCommitmentButton.IsEnabled = false;
+            }
+        }
 
+        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var valid = InputTextChanged((TextBox)sender, Validator.CheckMgNr);
+            var text = MgNrInput.Text;
+            var caret = MgNrInput.CaretIndex;
+            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
+            MgNrInput.Text = text;
+            MgNrInput.CaretIndex = caret;
+        }
+
+        private void MgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
+            var valid = InputLostFocus((TextBox)sender, Validator.CheckMgNr);
+            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
+        }
+
+        private void MemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            var m = MemberInput.SelectedItem as Member;
+            ViewModel.MgNr = m?.MgNr;
         }
 
         private async void ActiveAreaCommitmentInput_Changed(object sender, RoutedEventArgs evt) {
@@ -413,6 +464,11 @@ namespace Elwig.Windows {
             await RefreshList(true);
         }
 
+        private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (ViewModel.FilterSeason == null) return;
+            await RefreshList();
+        }
+
         private void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (KgInput.SelectedItem is AT_Kg kg) {
                 var rdList = kg.WbKg!.Rds.OrderBy(r => r.Name).Cast<object>().ToList();
@@ -450,12 +506,12 @@ namespace Elwig.Windows {
             RdInput.SelectedIndex = s.Count();
         }
 
-        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker) {
-            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem));
+        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker) {
+            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem));
         }
 
-        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker, string? msg = null) {
-            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem), msg);
+        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker, string? msg = null) {
+            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem), msg);
         }
 
         private void FbNrInput_TextChanged(object sender, RoutedEventArgs evt) {
@@ -465,5 +521,10 @@ namespace Elwig.Windows {
         private void FbNrInput_LostFocus(object sender, RoutedEventArgs evt) {
             InputLostFocus((TextBox)sender, Validator.CheckFbNr);
         }
+
+        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            App.FocusMember(m.MgNr);
+        }
     }
 }

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -21,8 +21,6 @@ namespace Elwig.Windows {
         private async Task AreaCommitmentTypesInitEditing(AppDbContext ctx) {
             _actList = new(await ctx.AreaCommitmentTypes
                 .OrderBy(v => v.VtrgId)
-                .Include(t => t.WineVar)
-                .Include(t => t.WineAttr)
                 .ToListAsync());
             _acts = _actList.ToDictionary(v => v.VtrgId, v => (string?)v.VtrgId);
             _actIds = _actList.ToDictionary(v => v, v => v.VtrgId);

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -21,7 +21,7 @@ namespace Elwig.Windows {
         private async Task BranchesInitEditing(AppDbContext ctx) {
             _branchList = new(await ctx.Branches
                 .OrderBy(b => b.Name)
-                .Include(b => b.PostalDest!.AtPlz)
+                .Include(b => b.PostalDest)
                 .ToListAsync());
             _branches = _branchList.ToDictionary(b => b.ZwstId, b => (string?)b.ZwstId);
             _branchIds = _branchList.ToDictionary(b => b, b => b.ZwstId);
@@ -32,7 +32,7 @@ namespace Elwig.Windows {
         private async Task BranchesFinishEditing(AppDbContext ctx) {
             ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
                 .OrderBy(b => b.Name)
-                .Include(b => b.PostalDest!.AtPlz)
+                .Include(b => b.PostalDest)
                 .ToListAsync());
             _branchList = null;
             _branches = null;

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -22,7 +22,6 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
-                .Include(s => s.Currency)
                 .ToListAsync());
             SeasonList_SelectionChanged(null, null);
         }
@@ -33,7 +32,6 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
-                .Include(s => s.Currency)
                 .ToListAsync());
             _seasonChanged = false;
         }

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -163,12 +163,11 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
-                .Include(s => s.Currency)
                 .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             var year = (SeasonList.SelectedItem as Season)?.Year;
             ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
                 .OrderBy(b => b.Name)
-                .Include(b => b.PostalDest!.AtPlz)
+                .Include(b => b.PostalDest)
                 .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(WineAttributeList, await ctx.WineAttributes
                 .OrderBy(a => a.Name)
@@ -181,8 +180,6 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(AreaCommitmentTypeWineAttributeInput, attrList);
             ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await ctx.AreaCommitmentTypes
                 .OrderBy(t => t.VtrgId)
-                .Include(t => t.WineVar)
-                .Include(t => t.WineAttr)
                 .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(WineCultivationList, await ctx.WineCultivations
                 .OrderBy(c => c.Name)

Elwig/Windows/ContextWindow.cs

@@ -30,11 +30,19 @@ namespace Elwig.Windows {
         }
 
         public async void ForceContextReload(object sender, EventArgs evt) {
-            await HintContextChange();
+            await ForceContextReload();
         }
 
-        public async Task HintContextChange() {
+        public async Task ForceContextReload() {
+            HintContextChange();
+            await TryContextReload();
+        }
+
+        public void HintContextChange() {
             _renewPending = true;
+        }
+
+        public async Task TryContextReload() {
             if (LockContext) return;
             await EnsureContextRenewed();
         }
@@ -49,9 +57,9 @@ namespace Elwig.Windows {
 
         protected async Task EnsureContextRenewed() {
             if (!_renewPending) return;
+            _renewPending = false;
             using var ctx = new AppDbContext();
             await OnRenewContext(ctx);
-            _renewPending = false;
         }
 
         virtual protected async Task OnInit(AppDbContext ctx) { }

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -424,15 +424,13 @@ namespace Elwig.Windows {
             var cursor = Mouse.OverrideCursor != null;
             if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
             var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterAllSeasons, vm.FilterTodayOnly);
-            var (filter, deliveries, deliveryPartsNum, varieties, stat) = await Task.Run(async () => {
+            var (filter, deliveries, deliveryPartsNum, varieties, members, stat) = await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await vm.GetFilters(ctx);
                 var deliveries = await deliveryQuery
                     .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-                    .Include(d => d.Parts).ThenInclude(p => p.Attribute)
-                    .Include(d => d.Parts).ThenInclude(p => p.Cultivation)
-                    .Include(d => d.Parts).ThenInclude(p => p.Variety)
                     .Include(d => d.Member.EmailAddresses)
+                    .IgnoreAutoIncludes()
                     .AsSplitQuery()
                     .ToListAsync();
                 deliveries.Reverse();
@@ -442,7 +440,7 @@ namespace Elwig.Windows {
                         .ToDictionary(d => d, d => d.SearchScore(vm.TextFilter))
                         .OrderByDescending(a => a.Value)
                         .ThenBy(a => a.Key.DateTime);
-                    var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                    var threshold = dict.Max(a => a.Value) * 3 / 4;
                     deliveries = [.. dict
                         .Where(a => a.Value > threshold)
                         .Select(a => a.Key)];
@@ -452,9 +450,10 @@ namespace Elwig.Windows {
 
                 var deliveryPartsNum = await deliveryPartsQuery.CountAsync();
                 var varieties = await deliveryPartsQuery.Select(d => d.SortId).Distinct().ToListAsync();
+                var members = await deliveryQuery.Select(d => d.Member).Distinct().IgnoreAutoIncludes().ToListAsync();
                 var stat = await DeliveryService.GenerateToolTipData(deliveryPartsQuery);
 
-                return (filter, deliveries, deliveryPartsNum, varieties, stat);
+                return (filter, deliveries, deliveryPartsNum, varieties, members, stat);
             });
             if (!cursor) Mouse.OverrideCursor = null;
             if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterAllSeasons, ViewModel.FilterTodayOnly)) return;
@@ -463,7 +462,6 @@ namespace Elwig.Windows {
                 DeliveryList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             await RefreshDeliveryParts();
 
-            var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
             ViewModel.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
             ViewModel.StatusDeliveries = $"{deliveries.Count:N0}";
 
@@ -498,7 +496,7 @@ namespace Elwig.Windows {
 
             int year = 0;
             Menu_Bki_SaveList.Items.Clear();
-            foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
+            foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).IgnoreAutoIncludes().ToListAsync()) {
                 if (s.Year > year) year = s.Year;
                 var i = new MenuItem {
                     Header = $"Saison {s.Year}",
@@ -515,7 +513,7 @@ namespace Elwig.Windows {
             };
             noAttr.Click += Menu_BulkAction_SetAttribute_Click;
             Menu_BulkAction_SetAttribute.Items.Add(noAttr);
-            foreach (var attr in await ctx.WineAttributes.OrderBy(a => a.AttrId).ToListAsync()) {
+            foreach (var attr in await ctx.WineAttributes.OrderBy(a => a.AttrId).IgnoreAutoIncludes().ToListAsync()) {
                 var i = new MenuItem {
                     Header = attr.Name,
                 };
@@ -525,7 +523,7 @@ namespace Elwig.Windows {
 
             Menu_BulkAction_AddModifier.Items.Clear();
             Menu_BulkAction_RemoveModifier.Items.Clear();
-            foreach (var mod in await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.ModId).ToListAsync()) {
+            foreach (var mod in await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.ModId).IgnoreAutoIncludes().ToListAsync()) {
                 var i1 = new MenuItem {
                     Header = mod.Name,
                 };
@@ -543,8 +541,6 @@ namespace Elwig.Windows {
             var y = d?.Year ?? ViewModel.FilterSeason;
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsCreating)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ToListAsync());
@@ -561,22 +557,22 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                 .Where(m => m.Year == y && (!IsCreating || m.IsActive))
                 .OrderBy(m => m.Ordering)
-                .Include(m => m.Season.Currency)
                 .ToListAsync());
-            ControlUtils.RenewItemsSource(WineOriginInput, (await ctx.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId));
+            var origins = await ctx.WineOrigins.ToListAsync();
+            origins.ForEach(o => { origins.FirstOrDefault(p => p.HkId == o.ParentHkId)?.Children.Add(o); });
+            origins = [.. origins.OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId)];
+            ControlUtils.RenewItemsSource(WineOriginInput, origins);
             var kgList = (await ctx.Katastralgemeinden
                 .Where(k => k.WbKg != null)
                 .Include(k => k.WbKg)
                 .Include(k => k.Gem.WbGem)
                 .OrderBy(k => k.Name)
-                .AsSplitQuery()
                 .ToListAsync()).Cast<object>().ToList();
             kgList.Insert(0, new NullItem());
             ControlUtils.RenewItemsSource(WineKgInput, kgList);
             UpdateRdInput();
             if (IsCreating) await UpdateLsNr();
 
-            await RefreshDeliveryParts();
             RefreshInputs();
         }
 
@@ -593,14 +589,12 @@ namespace Elwig.Windows {
                 ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                     .Where(m => m.Year == d.Year && (!IsCreating || m.IsActive))
                     .OrderBy(m => m.Ordering)
-                    .Include(m => m.Season.Currency)
                     .ToListAsync());
-                ControlUtils.RenewItemsSource(DeliveryPartList, d.FilteredParts.OrderBy(p => p.DPNr).ToList(), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+                ControlUtils.RenewItemsSource(DeliveryPartList, d.Parts, DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
                 ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                     .Where(m => m.Year == ViewModel.FilterSeason && (!IsCreating || m.IsActive))
                     .OrderBy(m => m.Ordering)
-                    .Include(m => m.Season.Currency)
                     .ToListAsync());
                 DeliveryPartList.ItemsSource = null;
             }
@@ -608,16 +602,17 @@ namespace Elwig.Windows {
 
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            if (DeliveryPartList.SelectedItem is DeliveryPart p) {
-                FillInputs(p);
-            } else if (DeliveryList.SelectedItem is Delivery d) {
+            if (DeliveryList.SelectedItem is Delivery d) {
                 FillInputs(d);
+                if (DeliveryPartList.SelectedItem is DeliveryPart p) {
+                    FillInputs(p);
+                }
             } else {
                 ClearOriginalValues();
                 ClearDefaultValues();
                 ClearInputs(validate);
                 ClearInputStates();
-            }            
+            }
             GC.Collect();
         }
 
@@ -629,7 +624,6 @@ namespace Elwig.Windows {
         }
 
         private void FillInputs(DeliveryPart p) {
-            FillInputs(p.Delivery);
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(p);
@@ -824,11 +818,12 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
+
             await EnsureContextRenewed();
             Mouse.OverrideCursor = null;
-            ControlUtils.SelectItem(DeliveryList, p?.Delivery);
+            ControlUtils.SelectItemWithPk(DeliveryList, p?.Year, p?.DId);
             DeliveryPartList.SelectedItem = null;
-            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
+            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().LastOrDefault());
             InitialInputs();
         }
 
@@ -861,25 +856,22 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
-            await EnsureContextRenewed();
-            if (p?.Delivery != null) {
-                try {
-                    using var ctx = new AppDbContext();
-                    using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
-                    await doc.Generate();
-                    if (App.Config.Debug) {
-                        doc.Show();
-                    } else {
-                        await doc.Print(2);
-                    }
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
 
+            Utils.RunBackground("Lieferschein drucken", async () => {
+                using var doc = await DeliveryNote.Initialize(p.Year, p.DId);
+                using (var ctx = new AppDbContext()) {
+                    await doc.Generate(ctx);
+                }
+                if (App.Config.Debug) {
+                    doc.Show();
+                } else {
+                    await doc.Print(2);
+                }
+            });
+
+            await EnsureContextRenewed();
             Mouse.OverrideCursor = null;
             DeliveryList.SelectedItem = null;
-            await EnsureContextRenewed();
             InitInputs();
         }
 
@@ -896,8 +888,6 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !ViewModel.IsReceipt)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ToListAsync());
@@ -938,12 +928,9 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                 .Where(m => m.Year == ViewModel.FilterSeason && m.IsActive)
                 .OrderBy(m => m.Ordering)
-                .Include(m => m.Season.Currency)
                 .ToListAsync());
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !ViewModel.IsReceipt)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ToListAsync());

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -85,7 +85,6 @@ namespace Elwig.Windows {
             using var ctx = new AppDbContext();
             var list = await ctx.DeliverySchedules
                 .Where(s => s.Year == ViewModel.FilterSeason)
-                .Include(s => s.Branch)
                 .OrderBy(s => s.DateString)
                 .ThenBy(s => s.Branch.Name)
                 .ThenBy(s => s.Description)
@@ -110,12 +109,7 @@ namespace Elwig.Windows {
             var (filter, deliveryAncmts, stat) = await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var (_, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
-                var deliveryAncmts = await deliveryAncmtQuery
-                    .Include(a => a.Member.BillingAddress)
-                    .Include(a => a.Schedule)
-                    .Include(a => a.Variety)
-                    .AsSplitQuery()
-                    .ToListAsync();
+                var deliveryAncmts = await deliveryAncmtQuery.ToListAsync();
 
                 if (filter.Count > 0 && deliveryAncmts.Count > 0) {
                     var dict = deliveryAncmts.AsParallel()
@@ -189,8 +183,6 @@ namespace Elwig.Windows {
 
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsCreating)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ThenBy(m => m.MgNr)
@@ -286,8 +278,6 @@ namespace Elwig.Windows {
             using var ctx = new AppDbContext();
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsCreating)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ThenBy(m => m.MgNr)
@@ -415,8 +405,6 @@ namespace Elwig.Windows {
             using var ctx = new AppDbContext();
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsCreating)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .ThenBy(m => m.MgNr)

Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs

@@ -47,8 +47,6 @@ namespace Elwig.Windows {
                 var (_, deliveryScheduleQuery, filter) = await vm.GetFilters(ctx);
                 var deliverySchedules = await deliveryScheduleQuery
                     .Include(s => s.Varieties)
-                    .Include(s => s.Branch)
-                    .AsSplitQuery()
                     .ToListAsync();
 
                 if (filter.Count > 0 && deliverySchedules.Count > 0) {

Elwig/Windows/MailWindow.xaml.cs

@@ -155,7 +155,7 @@ namespace Elwig.Windows {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var season = await ctx.Seasons.FindAsync(Year);
+            var season = await ctx.Seasons.Include(s => s.PaymentVariants).SingleAsync(s => s.Year == Year);
             var l = new List<string> {
                 MemberDataSheet.Name
             };
@@ -207,13 +207,8 @@ namespace Elwig.Windows {
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .Include(m => m.Branch)
-                .Include(m => m.DefaultWbKg!.AtKg)
                 .Include(m => m.EmailAddresses)
                 .Include(m => m.TelephoneNumbers)
-                .Include(m => m.PostalDest.AtPlz!.Ort)
-                .Include(m => m.PostalDest.AtPlz!.Country)
-                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberCustomInput.SelectedItems.Count == 0) {
                 MemberCustomInput.SelectionChanged -= MemberInput_SelectionChanged;
@@ -492,13 +487,8 @@ namespace Elwig.Windows {
                 }
                 Recipients = await query
                     .Include(m => m.Branch)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Country)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
                     .ToListAsync();
             }
             UpdatePostalEmailRecipients();
@@ -758,7 +748,7 @@ namespace Elwig.Windows {
                         if (doc.Type == DocType.Custom) {
                             return [new GeneratedDoc((string)doc.Details!)];
                         } else if (doc.Type == DocType.MemberDataSheet) {
-                            return [new GeneratedDoc(new MemberDataSheet(m, ctx) { Date = postalDate })];
+                            return [new GeneratedDoc(new MemberDataSheet(m) { Date = postalDate })];
                         } else if (doc.Type == DocType.DeliveryConfirmation) {
                             var year = (int)doc.Details!;
                             DeliveryConfirmationDeliveryData data;
@@ -769,21 +759,14 @@ namespace Elwig.Windows {
                             } else {
                                 return [];
                             }
-                            return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data) { Date = postalDate })];
+                            return [new GeneratedDoc(new DeliveryConfirmation(year, m, data) { Date = postalDate })];
                         } else if (doc.Type == DocType.CreditNote) {
                             var details = ((int, int))doc.Details!;
                             var year = details.Item1;
                             var avnr = details.Item2;
                             var data = cnData[(year, avnr)];
                             try {
-                                return [new GeneratedDoc(new CreditNote(
-                                    ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
-                                    data.Item3.ConsiderContractPenalties,
-                                    data.Item3.ConsiderTotalPenalty,
-                                    data.Item3.ConsiderAutoBusinessShares,
-                                    data.Item3.ConsiderCustomModifiers,
-                                    ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
-                                ) { Date = postalDate })];
+                                return [new GeneratedDoc(new CreditNote(data.Item2[m.MgNr], data.Item3, data.Item1[m.MgNr]) { Date = postalDate })];
                             } catch (Exception) {
                                 return [];
                             }
@@ -827,7 +810,7 @@ namespace Elwig.Windows {
             var emailRecipients = email.Select(d => d.Key.MgNr).ToHashSet();
             foreach (var item1 in email.Select((e, i) => new { Index = i, e.Key, e.Value })) {
                 foreach (var item2 in item1.Value.Select((d, i) => new { Index = i, Doc = d })) {
-                    await item2.Doc.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                    await item2.Doc.Generate(ctx, CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
                         ProgressBar.Value = offset + v * (item2.Index + 1) / item1.Value.Count / totalNum + 100.0 * item1.Index / totalNum;
                     })));
                 }
@@ -861,7 +844,7 @@ namespace Elwig.Windows {
 
             if (printDocs.Count > 0) {
                 var print = Document.Merge(printDocs);
-                await print.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                await print.Generate(ctx, CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
                     ProgressBar.Value = offset + v * printNum / totalNum;
                 })));
                 PrintDocument = print;

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -121,14 +121,9 @@ namespace Elwig.Windows {
                 using var ctx = new AppDbContext();
                 var (_, memberQuery, filter) = await vm.GetFilters(ctx);
                 var members = await memberQuery
-                    .Include(m => m.Branch)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Country)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
+                    .AsSplitQuery()
                     .ToListAsync();
 
                 if (filter.Count > 0 && members.Count > 0) {
@@ -200,7 +195,7 @@ namespace Elwig.Windows {
 
             var font = new System.Windows.Media.FontFamily("Segoe MDL2 Assets");
             MenuItem? temp = null;
-            var seasons = await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync();
+            var seasons = await ctx.Seasons.Include(s => s.PaymentVariants).OrderByDescending(s => s.Year).ToListAsync();
             Menu_DeliveryConfirmation.Items.Clear();
             foreach (var s in seasons) {
                 var i = new MenuItem {
@@ -339,6 +334,7 @@ namespace Elwig.Windows {
         }
 
         private async void ActiveMemberInput_Changed(object sender, RoutedEventArgs evt) {
+            if (!IsInitialized) return;
             await RefreshList();
         }
 
@@ -509,7 +505,9 @@ namespace Elwig.Windows {
             try {
                 await Task.Run(async () => {
                     using var doc = new Letterhead(m);
-                    await doc.Generate();
+                    using (var ctx = new AppDbContext()) {
+                        await doc.Generate(ctx);
+                    }
                     if (!App.Config.Debug) {
                         await doc.Print();
                     } else {
@@ -807,7 +805,6 @@ namespace Elwig.Windows {
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
-                ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();

Elwig/Windows/OriginHierarchyWindow.xaml.cs

@@ -21,12 +21,11 @@ namespace Elwig.Windows {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var origins = (await ctx.WineOrigins
-                    .Include("Gems.AtGem.Kgs.WbKg.Gl")
-                    .AsSplitQuery()
-                    .ToListAsync())
-                    .OrderByDescending(o => o.SortKey)
-                    .ThenBy(o => o.HkId);
+            var origins = await ctx.WineOrigins
+                .Include(o => o.Gems).ThenInclude(g => g.AtGem.Kgs).ThenInclude(k => k.WbKg!.Gl)
+                .ToListAsync();
+            origins.ForEach(o => { origins.FirstOrDefault(p => p.HkId == o.ParentHkId)?.Children.Add(o); });
+            origins = [.. origins.OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId)];
             ControlUtils.RenewItemsSource(WineOrigins, origins, WineOrigins_SelectionChanged);
             if (WineOrigins.SelectedItem == null) {
                 var hkid = await ctx.WbKgs
@@ -39,8 +38,7 @@ namespace Elwig.Windows {
             }
             var gls = await ctx.WbGls
                 .OrderBy(g => g.GlNr)
-                .Include("Kgs.Rds")
-                .AsSplitQuery()
+                .Include(g => g.Kgs).ThenInclude(k => k.Rds)
                 .ToListAsync();
             ControlUtils.RenewItemsSource(WbGls, gls, WbGls_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             UpdateWbGems();
@@ -100,8 +98,8 @@ namespace Elwig.Windows {
                 var allMembers = await ctx.Members.Where(m => m.DefaultKgNr == k.KgNr).CountAsync();
                 StatusDefaultKgs.Text += $"{activeMembers:N0} ({allMembers:N0})";
                 var year = Utils.CurrentNextSeason;
-                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr), year).CountAsync();
-                var allAreaComs = await ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr).CountAsync();
+                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr), year).CountAsync();
+                var allAreaComs = await ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr).CountAsync();
                 StatusAreaCommitments.Text += $"{activeAreaComs:N0} ({allAreaComs:N0})";
                 var deliveryParts = await ctx.DeliveryParts.Where(p => p.KgNr == k.KgNr).CountAsync();
                 var deliveries = await ctx.Deliveries.Where(d => d.Parts.Any(p => p.KgNr == k.KgNr)).CountAsync();
@@ -214,7 +212,7 @@ namespace Elwig.Windows {
                 App.HintContextChange();
                 ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
             } catch (Exception exc) {
-                await HintContextChange();
+                await ForceContextReload();
                 var str = "Der Eintrag konnte nicht aus der Datenbank gelöscht werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Katastralgemeinde deaktivieren", MessageBoxButton.OK, MessageBoxImage.Error);

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -48,7 +48,6 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(PaymentVariantList, await ctx.PaymentVariants
                 .Where(v => v.Year == Year)
                 .OrderBy(v => v.AvNr)
-                .Include(v => v.Season.Currency)
                 .ToListAsync());
             if (PaymentVariantList.SelectedItem == null && PaymentVariantList.Items.Count > 0) {
                 PaymentVariantList.SelectedIndex = PaymentVariantList.Items.Count - 1;
@@ -256,13 +255,13 @@ namespace Elwig.Windows {
                 await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                await HintContextChange();
+                await ForceContextReload();
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
-            await HintContextChange();
+            await EnsureContextRenewed();
             CommentInput_TextChanged(null, null);
             DateInput_TextChanged(null, null);
             TransferDateInput_TextChanged(null, null);

Tests/DatabaseSetup.cs

@@ -2,6 +2,7 @@ using Elwig;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System.Reflection;
 
 namespace Tests {
@@ -22,7 +23,7 @@ namespace Tests {
         public void Setup_2_Client() {
             using var ctx = new AppDbContext();
             App.Client = new ClientParameters(ctx);
-            App.SetBranch(ctx.Branches.Single());
+            App.SetBranch(ctx.Branches.Include(b => b.PostalDest).Single());
         }
 
         [OneTimeSetUp]

Tests/Resources/Sql/BillingDelete.sql

@@ -3,7 +3,7 @@
 DELETE FROM credit;
 DELETE FROM payment_variant;
 DELETE FROM delivery;
-DELETE FROM area_commitment;
+DELETE FROM area_commitment_contract;
 DELETE FROM area_commitment_type;
 DELETE FROM season;
 DELETE FROM wine_attribute;

Tests/Resources/Sql/BillingInsert.sql

@@ -22,10 +22,15 @@ INSERT INTO area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, p
 ('GVQ', 'GV', 'Q',  NULL, 5000, 1000, 1000000, NULL),
 ('GVR', 'GV', 'R',  NULL, 5000, 1000, 1000000, NULL);
 
-INSERT INTO area_commitment (fbnr, mgnr, vtrgid, cultid, area, kgnr, gstnr, rdnr, year_from, year_to) VALUES
-( 1, 101, 'GV', 'KIP', 10000, 06109, '123/4', NULL, 2000, 2019),
-( 2, 101, 'GV', 'KIP', 10000, 06109, '123/5', NULL, 2025, 2030),
-( 3, 101, 'GV', 'KIP', 10000, 06109, '123/6', NULL, 2021, 2031);
+INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr) VALUES
+( 1, 06109, NULL),
+( 2, 06109, NULL),
+( 3, 06109, NULL);
+
+INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to) VALUES
+( 1, 1, 101, 'GV', 'KIP', 10000, '123/4', 2000, 2019),
+( 2, 1, 101, 'GV', 'KIP', 10000, '123/5', 2025, 2030),
+( 3, 1, 101, 'GV', 'KIP', 10000, '123/6', 2021, 2031);
 
 INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
 (2020, 'EUR', 1000, 2000, NULL, NULL, NULL, NULL, NULL),

Tests/Resources/Sql/DocumentInsert.sql

@@ -64,6 +64,10 @@ INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw,
 (2020, 12, 1, 'BP', NULL, NULL,  2410, 18.0, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 12, 2, 'BP', NULL, NULL,  2313, 18.1, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL);
 
+INSERT INTO delivery_part_modifier (year, did, dpnr, modid) VALUES
+(2020, 2, 1, 'S'),
+(2020, 2, 2, 'A');
+
 INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value) VALUES
 (2020, 1, 1, 0, '_', 3219),
 (2020, 3, 1, 0, '_', 2561),

Tests/Resources/Sql/ServiceDelete.sql

@@ -4,7 +4,7 @@ DELETE FROM credit;
 DELETE FROM payment_variant;
 DELETE FROM delivery;
 DELETE FROM season;
-DELETE FROM area_commitment;
+DELETE FROM area_commitment_contract;
 DELETE FROM area_commitment_type;
 DELETE FROM member WHERE mgnr >= 200;
 DELETE FROM wine_cultivation;

Tests/Resources/Sql/ServiceInsert.sql

@@ -29,11 +29,17 @@ INSERT INTO member_email_address (mgnr, nr, address, comment) VALUES
 INSERT INTO area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, penalty_per_kg, penalty_amount, penalty_none) VALUES
 ('GV', 'GV', NULL, NULL, 5000,  500,    NULL, NULL);
 
-INSERT INTO area_commitment (fbnr, mgnr, vtrgid, cultid, area, kgnr, gstnr, rdnr, year_from, year_to) VALUES
-( 1, 203, 'GV', NULL, 10000, 15224, '321/9', NULL, NULL, NULL),
-( 2, 204, 'GV', NULL, 10000, 15224, '123/1', NULL, 2000, 2019),
-( 3, 204, 'GV', NULL, 10000, 15224, '123/2', NULL, 2025, 2030),
-( 4, 204, 'GV', NULL, 10000, 15224, '123/3', NULL, 2021, 2031);
+INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr) VALUES
+( 1, 15224, NULL),
+( 2, 15224, NULL),
+( 3, 15224, NULL),
+( 4, 15224, NULL);
+
+INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to) VALUES
+( 1, 1, 203, 'GV', NULL, 10000, '321/9', NULL, NULL),
+( 2, 1, 204, 'GV', NULL, 10000, '123/1', 2000, 2019),
+( 3, 1, 204, 'GV', NULL, 10000, '123/2', 2025, 2030),
+( 4, 1, 204, 'GV', NULL, 10000, '123/3', 2021, 2031);
 
 
 INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES

Tests/UnitTests/DocumentTests/CreditNoteTest.cs

@@ -1,7 +1,4 @@
 using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Dtos;
-using Microsoft.EntityFrameworkCore;
 
 namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
@@ -9,12 +6,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_01_VirtualCreditNote() {
-            using var ctx = new AppDbContext();
-            var m = await ctx.Members.FindAsync(101);
-            var p = await ctx.MemberPayments.Where(p => p.Year == 2020 && p.AvNr == 1).SingleAsync();
-            var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, 2020, 1);
-            using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false, false,
-                ctx.GetMemberUnderDelivery(2020, m!.MgNr).GetAwaiter().GetResult());
+            using var doc = await CreditNote.Initialize(2020, 1, 101);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""

Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs

@@ -11,7 +11,7 @@ namespace Tests.UnitTests.DocumentTests {
             using var ctx = new AppDbContext();
             var m = await ctx.Members.FindAsync(101);
             var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, 2020, m!);
-            using var doc = new DeliveryConfirmation(ctx, 2020, m!, data);
+            using var doc = new DeliveryConfirmation(2020, m!, data);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""

Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs

@@ -1,5 +1,4 @@
 using Elwig.Documents;
-using Elwig.Helpers;
 
 namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
@@ -7,9 +6,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_01_OneDeliveryPart() {
-            using var ctx = new AppDbContext();
-            var d = await ctx.Deliveries.FindAsync(2020, 1);
-            using var doc = new DeliveryNote(d!, ctx);
+            using var doc = await DeliveryNote.Initialize(2020, 1);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
@@ -19,7 +16,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X001"));
                 Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
                 Assert.That(text, Contains.Substring("""
@@ -34,9 +31,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_02_TwoDeliveryParts() {
-            using var ctx = new AppDbContext();
-            var d = await ctx.Deliveries.FindAsync(2020, 4);
-            using var doc = new DeliveryNote(d!, ctx);
+            using var doc = await DeliveryNote.Initialize(2020, 4);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
@@ -47,7 +42,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123471"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X004"));
                 Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
                 Assert.That(text, Contains.Substring("""
@@ -68,9 +63,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_03_DeliveryPartsWithAttribute() {
-            using var ctx = new AppDbContext();
-            var d = await ctx.Deliveries.FindAsync(2020, 3);
-            using var doc = new DeliveryNote(d!, ctx);
+            using var doc = await DeliveryNote.Initialize(2020, 3);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
@@ -80,7 +73,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X003"));
                 Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
                 Assert.That(text, Contains.Substring("""
@@ -107,9 +100,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_04_DeliveryPartsWithCultivation() {
-            using var ctx = new AppDbContext();
-            var d = await ctx.Deliveries.FindAsync(2020, 7);
-            using var doc = new DeliveryNote(d!, ctx);
+            using var doc = await DeliveryNote.Initialize(2020, 7);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
@@ -119,7 +110,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123480"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201002X001"));
                 Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
                 Assert.That(text, Contains.Substring("""
@@ -139,5 +130,37 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("Gesamt: 78 15,9 5 332"));
             });
         }
+
+        [Test]
+        public async Task Test_05_DeliveryPartsWithModifier() {
+            using var doc = await DeliveryNote.Initialize(2020, 2);
+            var text = await Utils.GeneratePdfText(doc);
+            Assert.Multiple(() => {
+                Assert.That(text, Contains.Substring("""
+                    W&B Weinbauer GesbR
+                    WEINBAUER Wernhardt
+                    Winzerstraße 2
+                    2223 Hohenruppersdorf
+                    """));
+                Assert.That(text, Contains.Substring("0123471"));  // Betriebsnummer
+                Assert.That(text, Contains.Substring("pauschaliert"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X002"));
+                Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
+                Assert.That(text, Contains.Substring("""
+                    1 Grüner Veltliner Kabinett Kabinett 86 17,5 2 987
+                    Herkunft: Österreich / Weinland / Niederösterreich
+                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
+                    Zu-/Abschläge: Geschädigte Trauben −10,00 %
+                    Waage: ?, ID: ? (gerebelt gewogen)
+                    2 Grüner Veltliner Kabinett Kabinett 87 17,7 1 873
+                    Herkunft: Österreich / Weinland / Niederösterreich
+                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
+                    Zu-/Abschläge: Keine Voranmeldung −0,1000 €/kg
+                    Waage: ?, ID: ? (gerebelt gewogen)
+                    Gesamt: 87 17,6 4 860
+                    """));
+            });
+        }
     }
 }

Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs

@@ -1,5 +1,4 @@
 using Elwig.Documents;
-using Elwig.Helpers;
 
 namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
@@ -7,9 +6,7 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_01_SimpleMember() {
-            using var ctx = new AppDbContext();
-            var m = await ctx.Members.FindAsync(104);
-            using var doc = new MemberDataSheet(m!, ctx);
+            using var doc = await MemberDataSheet.Initialize(104);
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""

Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs

@@ -1,6 +1,4 @@
 using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Dtos;
 
 namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
@@ -8,16 +6,13 @@ namespace Tests.UnitTests.DocumentTests {
 
         [Test]
         public async Task Test_01_PaymentVariant2020() {
-            using var ctx = new AppDbContext();
-            var v = (await ctx.PaymentVariants.FindAsync(2020, 1))!;
-            var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-            using var doc = new PaymentVariantSummary(v, data);
+            using var doc = await PaymentVariantSummary.Initialize(2020, 1);
             var text = await Utils.GeneratePdfText(doc, true);
             var table = Utils.ExtractTable(text);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("Auszahlungsvariante"));
-                Assert.That(text, Contains.Substring(v.Name));
-                Assert.That(table.Skip(17).ToArray(), Is.EqualTo(new string[][] {
+                Assert.That(text, Contains.Substring(doc.Variant.Name));
+                Assert.That(table.Skip(19).ToArray(), Is.EqualTo(new string[][] {
                      ["Sorte/Attr./Bewirt.", "Gradation",   "ungebunden",   "attributlos gebunden",    "gebunden",     "Gesamt" ],
                      ["Qualitätsstufe",        "[°Oe]",   "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[€]"  ],
                      ["Grüner Veltliner",                "3 219",                 "0",                 "0",           "1 609,50"],

Tests/UnitTests/DocumentTests/Utils.cs

@@ -1,4 +1,5 @@
 using Elwig.Documents;
+using Elwig.Helpers;
 using NReco.PdfRenderer;
 using System.Text.RegularExpressions;
 
@@ -8,7 +9,9 @@ namespace Tests.UnitTests.DocumentTests {
         private static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_document.pdf");
 
         public static async Task<string> GeneratePdfText(Document doc, bool preserveLayout = false) {
-            await doc.Generate();
+            using (var ctx = new AppDbContext()) {
+                await doc.Generate(ctx);
+            }
             try {
                 doc.SaveTo(FileName);
                 var conv = new PdfToTextConverter { CustomArgs = preserveLayout ? "-layout " : "-raw " };

Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs

@@ -32,7 +32,6 @@ namespace Tests.UnitTests.ServiceTests {
                 .Include(d => d.Parts)
                 .ThenInclude(p => p.PartModifiers)
                 .ThenInclude(m => m.Modifier)
-                .AsSplitQuery()
                 .FirstOrDefaultAsync();
         }
 

Tests/UnitTests/ServiceTests/MemberServiceTest.cs

@@ -12,8 +12,8 @@ namespace Tests.UnitTests.ServiceTests {
             using var ctx = new AppDbContext();
             vm.BranchSource = await ctx.Branches.ToListAsync();
             vm.DefaultKgSource = await ctx.Katastralgemeinden.ToListAsync();
-            vm.OrtSource = await ctx.PlzDestinations.Include(p => p.Ort).ToListAsync();
-            vm.BillingOrtSource = await ctx.PlzDestinations.Include(p => p.Ort).ToListAsync();
+            vm.OrtSource = await ctx.PlzDestinations.ToListAsync();
+            vm.BillingOrtSource = await ctx.PlzDestinations.ToListAsync();
         }
 
         [Test]
@@ -36,17 +36,13 @@ namespace Tests.UnitTests.ServiceTests {
 
             Assert.DoesNotThrowAsync(async () => await vm.UpdateMember(null));
 
-            Member? m;
+            Member m;
             using (var ctx = new AppDbContext()) {
                 m = await ctx.Members
                     .Where(m => m.MgNr == vm.MgNr)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstOrDefaultAsync();
+                    .SingleAsync();
             }
 
             Assert.That(m, Is.Not.Null);
@@ -124,17 +120,13 @@ namespace Tests.UnitTests.ServiceTests {
 
             Assert.DoesNotThrowAsync(async () => await vm.UpdateMember(null));
 
-            Member? m;
+            Member m;
             using (var ctx = new AppDbContext()) {
                 m = await ctx.Members
                     .Where(m => m.MgNr == vm.MgNr)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstOrDefaultAsync();
+                    .SingleAsync();
             }
 
             Assert.That(m, Is.Not.Null);
@@ -236,13 +228,9 @@ namespace Tests.UnitTests.ServiceTests {
             using (var ctx = new AppDbContext()) {
                 vm.FillInputs(await ctx.Members
                     .Where(m => m.MgNr == 202)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstAsync());
+                    .SingleAsync());
             }
 
             Assert.That(vm.IsActive, Is.True);
@@ -253,17 +241,13 @@ namespace Tests.UnitTests.ServiceTests {
 
             Assert.DoesNotThrowAsync(async () => await vm.UpdateMember(202));
 
-            Member? m;
+            Member m;
             using (var ctx = new AppDbContext()) {
                 m = await ctx.Members
                     .Where(m => m.MgNr == 202)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstOrDefaultAsync();
+                    .SingleAsync();
             }
 
             Assert.That(m, Is.Not.Null);
@@ -288,13 +272,9 @@ namespace Tests.UnitTests.ServiceTests {
             using (var ctx = new AppDbContext()) {
                 vm.FillInputs(await ctx.Members
                     .Where(m => m.MgNr == 203)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstAsync());
+                    .SingleAsync());
             }
 
             Assert.Multiple(() => {
@@ -306,17 +286,13 @@ namespace Tests.UnitTests.ServiceTests {
             vm.MgNr = 210;
             Assert.DoesNotThrowAsync(async () => await vm.UpdateMember(203));
 
-            Member? m;
+            Member m;
             using (var ctx = new AppDbContext()) {
                 m = await ctx.Members
                     .Where(m => m.MgNr == 210)
-                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
-                    .AsSplitQuery()
-                    .FirstOrDefaultAsync();
+                    .SingleAsync();
             }
 
             Assert.That(m, Is.Not.Null);

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=36" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=38" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"