Bump version to 1.0.1.5

.gitea/workflows/deploy.yaml

@@ -1,7 +1,7 @@
 name: Deploy
 on:
   push:
-    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
+    tags: ["v[0-9]+.[0-9]+.[0-9]+.[0-9]+"]
 jobs:
   deploy:
     name: Build and Deploy

CHANGELOG.md

@@ -2,6 +2,249 @@
 Changelog
 =========
 
+[v1.0.1.5][v1.0.1.5] (2025-10-29) {#v1.0.1.5}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.1.5-bugfixes}
+
+* Im Rundschreiben-Fenster (`MailWindow`) kam es zu einem Absturz, wenn man das Fenster über den "Anlieferungsbestätigung"-Knopf im Leseabschluss-Abschnitt geöffnet hat. (af98c32026)
+
+[v1.0.1.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.5
+
+
+
+
+[v1.0.1.4][v1.0.1.4] (2025-10-28) {#v1.0.1.4}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.1.4-bugfixes}
+
+* Im Rundschreiben-Fenster (`MailWindow`) kam es zu einem Absturz, wenn man die Zustelloptionen "Post zusenden an Mitglieder, die keine E-Mail erhalten würden" und "E-Mail zusenden an niemanden" kombiniert hat. (2de8af878b)
+
+### Sonstiges {#v1.0.1.4-misc}
+
+* Im Auszahlungsvariante-Fenster (`ChartWindow`) gibt es keine Fehlermeldung mehr wenn nicht für alle Sorten ein Preis definiert ist, nur noch eine Warnung. (428cd6ddc2)
+
+[v1.0.1.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.4
+
+
+
+
+[v1.0.1.3][v1.0.1.3] (2025-10-13) {#v1.0.1.3}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.1.3-features}
+
+* In der Liste des Lieferungen-Fenster (`DeliveryAdminWindow`) werden
+	* statt ausschließlich der Sorte auch Attribut und Bewirtschaftungsart angezeigt. (a0d4f19f30)
+	* Kommentare der Lieferungen (und Teillieferungen) angezeigt. (548aeb2ce9)
+
+### Sonstiges {#v1.0.1.3-misc}
+
+* Verzögerung der Überprüfung auf automatische Updates auf einige Sekunden verlängert. (67ba342c28)
+* Verbesserung der Ladezeiten im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (7edd888aa2)
+
+[v1.0.1.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.3
+
+
+
+
+[v1.0.1.2][v1.0.1.2] (2025-09-25) {#v1.0.1.2}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.1.2-bugfixes}
+
+* Beim automatischen Importieren/Synchronisieren wird bei einem Fehlerfall der Benutzer verständigt, aber der Vorgang nicht abgebrochen. (9d02f18bac)
+
+### Sonstiges {#v1.0.1.2-misc}
+
+* Beim Sichern der Datenbank werden Meta-Informationen in der ZIP-Datei gespeichert. (c8a95422af)
+
+[v1.0.1.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.2
+
+
+
+
+[v1.0.1.1][v1.0.1.1] (2025-09-21) {#v1.0.1.1}
+---------------------------------------------
+
+### Sonstiges {#v1.0.1.1-misc}
+
+* Eingabe von Sorten und Qualitätsstufen im Übernahme-Fenster (`DeliveryAdminWindows`) verbessert. (e2de7a1f1c, b27b89f599)
+
+[v1.0.1.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.1
+
+
+
+
+[v1.0.1.0][v1.0.1.0] (2025-09-18) {#v1.0.1.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.1.0-features}
+
+* Neue Weinsorten gemäß Kürzelliste der Bundeskellereiinspektion hinzugefügt. (a0dcaf7b4f)
+
+### Sonstiges {#v1.0.1.0-misc}
+
+* HTTP-Anfragen haben jetzt das Feld `User-Agent` gesetzt. (844fc5217a)
+* Auto-Update-Funktion wird auch beim Erlangen von Netzwerkverbindung ausgeführt. (8bc053053c)
+
+[v1.0.1.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.0
+
+
+
+
+[v1.0.0.6][v1.0.0.6] (2025-09-17) {#v1.0.0.6}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.0.6-bugfixes}
+
+* Die automatische Erkennung des Wiege-Modus hat im WKW nicht funktioniert. (463769b549)
+
+### Sonstiges {#v1.0.0.6-misc}
+
+* Tippfehler im Über-Fenster (`AboutWindow`) behoben. (2c383d0c55)
+* `SaveFileDialog` mit Multi-File-Extensions verbessert. (9e02b15ff1)
+
+[v1.0.0.6]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.6
+
+
+
+
+[v1.0.0.5][v1.0.0.5] (2025-09-15) {#v1.0.0.5}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.5-features}
+
+* Die Datenbank kann im Haupt-Fenster (`MainWindow`) gesichert und wiederhergestellt werden. (f02598760f)
+
+### Sonstiges {#v1.0.0.5-misc}
+
+* In der WGM ist eine Auswahl eines Zu/-Abschlags im Übernahme-Fenster (`DeliveryAdminWindow`) nun erforderlich. (a9b5317e79)
+* In der Konfigurationsdatei kann im `[general]` Block `weighing = gross`, `weighing = net`, oder `weighing = box` angegeben werden. (d7012ebfa1)
+* Über-Fenser (`AboutWindow`) hinzugefügt. (3c9b3c2db1)
+* Abhängigkeiten aktualisiert. (44dcc5e19f, 98f8907817)
+
+[v1.0.0.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.5
+
+
+
+
+[v1.0.0.4][v1.0.0.4] (2025-09-01) {#v1.0.0.4}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.0.4-bugfixes}
+
+* Absturz beim Verschicken von einzelnen E-Mails außerhalb des Rundschreiben-Fensters (`MailWindow`) behoben. (07f9a0f522)
+
+### Sonstiges {#v1.0.0.4-misc}
+
+* Ladezeit des Fehler-Protokoll-Fensters (`LogWindow`) verbessert. (4653a4f129)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) ist es nun möglich die Qualitätsstufe zu verändern. (104798d4f2)
+
+[v1.0.0.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.4
+
+
+
+
+[v1.0.0.3][v1.0.0.3] (2025-08-11) {#v1.0.0.3}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.3-features}
+
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich die gesamte Datenbank zu hochzuladen bzw. herunterzuladen. ([#69][i69])
+
+### Sonstiges {#v1.0.0.3-misc}
+
+* Die Intigrität von Elwig-Export-Dateien (`.elwig.zip`) und anderen `.zip` Dateien wir nun überprüft. (d3157e4d48)
+* Die Herkunftshierarchie wird nun auch automatisch synchronisiert (benötigt für Stamm-KG bei Mitglied, Ried/KG bei Flächenbindung, und Herkunft bei Lieferung). ([#70][i70], b6c03892b1)
+* Abhängigkeiten aktualisiert. (1f165055c1, 4e2eca295d)
+
+[v1.0.0.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.3
+[i69]: https://git.necronda.net/winzer/elwig/issues/69
+[i70]: https://git.necronda.net/winzer/elwig/issues/70
+
+
+
+
+[v1.0.0.2][v1.0.0.2] (2025-08-05) {#v1.0.0.2}
+---------------------------------------------
+
+### Sonstiges {#v1.0.0.2-misc}
+
+* Explizit native SQLite-Bibliothek hinzugefügt. (77c3f388e7)
+
+[v1.0.0.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.2
+
+
+
+
+[v1.0.0.1][v1.0.0.1] (2025-08-05) {#v1.0.0.1}
+---------------------------------------------
+
+### Sonstiges {#v1.0.0.1-misc}
+
+* Abhängigkeiten aktualisiert. (466c8a322c)
+* Angepasste Fehlermeldung, wenn Importieren fehlschlägt. (ab7c7404e2)
+
+[v1.0.0.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.1
+
+
+
+
+[v1.0.0.0][v1.0.0.0] (2025-07-30) {#v1.0.0.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.0-features}
+
+* Es wird nun gespeichert, wann Mitglieder/Flächenbindungen/Lieferungen importiert bzw. exporiert wurden. (4234c7f994)
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird der Auszahlungsbetrag für nicht-festgesetzte Varianten nun überschlagsmäßig angezeigt. (913129f155)
+* Wenn eine Variante im Auszahlungsvariante-Fenster (`ChartWindow`) gespeichert wird, wird sie nun automatisch auch berechnet. (c6c8fd9b68)
+* Überall wo Weinsorten vorkommen werden diese jetzt rot oder grün eingefärbt angezeigt. ([#61][i61])
+* Das Flächenbindungs-Fenster (`AreaComAdminWindow`) wurde überarbeitet. (53d82604a1, 267aa3d47c, [#64][i64])
+* Auf allen Dokumenten wird der Bio-Kontrollstellen-Code in der Fußzeile angeführt (sofern dieser in den Stammdaten gesetzt wurde). (fad1e28c06)
+
+### Behobene Fehler {#v1.0.0.0-bugfixes}
+
+* Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
+* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
+* Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
+* Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])
+
+### Sonstiges {#v1.0.0.0-misc}
+
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird angeführt, dass "Zu- und Abschläge bei Lieferungen" auch den Rebelzuschlag umfassen. (0dff3986b7)
+* Im gesamten Program wird an passenden Stellen statt "Gewicht" nun "Menge" verwendet. (0f3ce39f35)
+* Verbesserungen der Code-Qualität und der Leistung. ([#59][i59], b580e1bf79, 623f55f5b0, 3493ff6df1, 267797b55d, 41811925be, [#57][i57], 38d0ff969d, e6746f76b1, 7e9a27c75d)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Flächenbindungen jetzt für die momentane Saison angezeigt statt für das aktuelle Jahr. (953532cae4)
+* Abhängigkeiten aktualisiert. (4b27ebf81b, 7153bfab6f, 9b48242f0e)
+* GPLv3 Lizenz hinzugefügt. (93e920f61a)
+
+[v1.0.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.0
+[i57]: https://git.necronda.net/winzer/elwig/issues/57
+[i58]: https://git.necronda.net/winzer/elwig/issues/58
+[i59]: https://git.necronda.net/winzer/elwig/issues/59
+[i61]: https://git.necronda.net/winzer/elwig/issues/61
+[i62]: https://git.necronda.net/winzer/elwig/issues/62
+[i64]: https://git.necronda.net/winzer/elwig/issues/64
+[i65]: https://git.necronda.net/winzer/elwig/issues/65
+
+
+
+
+[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
+------------------------------------------
+
+### Sonstiges {#v0.13.9-misc}
+
+* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
+* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
+
+[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
+
+
+
 
 [v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
 ------------------------------------------

Elwig/App.xaml

@@ -30,17 +30,25 @@
 
         <DataTemplate x:Key="WineVarietyTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Key="WineVarietyTemplateExpanded">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding SortIdFormat}" Foreground="{Binding Color}" MinWidth="36" Margin="0,0,10,0"/>
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
                 <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
             </StackPanel>
         </DataTemplate>
 
+        <DataTemplate x:Key="AreaCommitmentTypeTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding WineVar.Name}" Foreground="{Binding WineVar.Color}"/>
+                <TextBlock Text="{Binding WineAttr.Name}" Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding Discriminator}" Margin="5,0,0,0"/>
+            </StackPanel>
+        </DataTemplate>
+
         <DataTemplate x:Key="ModifierTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/>

Elwig/App.xaml.cs

@@ -1,20 +1,22 @@
-using System;
-using System.Data;
-using System.Linq;
-using System.Windows;
-using System.IO;
-using Elwig.Helpers;
-using Elwig.Helpers.Weighing;
-using System.Collections.Generic;
-using System.Windows.Threading;
-using System.Reflection;
-using Elwig.Helpers.Printing;
-using Elwig.Windows;
 using Elwig.Dialogs;
-using System.Threading.Tasks;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Helpers.Printing;
+using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
+using Elwig.Windows;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Reflection;
 using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace Elwig {
     public partial class App : Application {
@@ -25,10 +27,13 @@ namespace Elwig {
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
-        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
         public static readonly string MailsPath = Path.Combine(DataPath, "mails");
         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
-        public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(InstallPath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
 
         public static Config Config { get; private set; } = new(ConfigPath);
@@ -82,7 +87,7 @@ namespace Elwig {
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0");
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0");
 
             try {
                 await AppDbUpdater.CheckDb();
@@ -123,10 +128,11 @@ namespace Elwig {
             if (Config.UpdateAuto && Config.UpdateUrl != null) {
                 if (Utils.HasInternetConnectivity()) {
                     Utils.RunBackground("Auto Updater", async () => {
-                        await Task.Delay(500);
+                        await Task.Delay(1000);
                         await CheckForUpdates();
                     });
                 }
+                NetworkChange.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
                 _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
                 _autoUpdateTimer.Start();
             }
@@ -158,6 +164,16 @@ namespace Elwig {
                 Shutdown();
             }
 
+            if (Config.WeighingMode == null) {
+                if (Client.IsMatzen || Client.IsWolkersdorf) {
+                    Config.WeighingMode = WeighingMode.Net;
+                } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
+                    Config.WeighingMode = WeighingMode.Box;
+                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
+                    Config.WeighingMode = WeighingMode.Gross;
+                }
+            }
+
             base.OnStartup(evt);
 
             var window = new MainWindow();
@@ -214,6 +230,16 @@ namespace Elwig {
             }
         }
 
+        private void OnNetworkAvailabilityChanged(object? sender, NetworkAvailabilityEventArgs evt) {
+            if (!evt.IsAvailable) return;
+            if (Utils.HasInternetConnectivity()) {
+                Utils.RunBackground("Auto Updater", async () => {
+                    await Task.Delay(2000);
+                    await CheckForUpdates();
+                });
+            }
+        }
+
         public static async Task CheckForUpdates(bool showAlert = false) {
             if (Config.UpdateUrl == null) return;
             var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
@@ -236,6 +262,19 @@ namespace Elwig {
             }
         }
 
+        public static async Task ReplaceDatabase(string filename) {
+            try {
+                await Task.Run(async () => {
+                    await Database.Import(filename);
+                });
+                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
+                ForceShutdown = true;
+                Current.Shutdown();
+            } catch (Exception exc) {
+                MessageBox.Show("Fehler beim Ersetzen:\n\n" + exc.Message, "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
         private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
             foreach (Window w in CurrentApp.Windows) {
                 if (w is T t && (selector == null || selector(t))) {

Elwig/Dialogs/AreaComModifyDialog.xaml

@@ -0,0 +1,71 @@
+<Window x:Class="Elwig.Dialogs.AreaComModifyDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Flächenbindungen bearbeiten" Height="220" Width="450">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend bearbeitet werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+        <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend gelöscht werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+
+        <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"
+               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14"
+                            Minimum="1900" Maximum="9999"
+                            HorizontalAlignment="Center" VerticalAlignment="Top"
+                            TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="RetroactiveInput" Content="Rückwirkend bearbeiten" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="RetroactiveInput_Changed" Unchecked="RetroactiveInput_Changed"
+                  IsChecked="{Binding ModifyRetroactively}"/>
+
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> unverändert,<LineBreak/>
+            und wird ab inkl. Saison <Bold><Run x:Name="NewSeason1"/></Bold> in geänderter Form übernommen.
+        </TextBlock>
+        <TextBlock x:Name="DescBlock2" Margin="0,105,0,0" TextAlignment="Center" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig.
+        </TextBlock>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -0,0 +1,62 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AreaComModifyDialog : Window {
+
+        public int? YearTo { get; set; }
+        public bool ModifyRetroactively { get; set; }
+
+        public string OrigYearFrom { get; set; }
+        public string OrigYearTo { get; set; }
+        public string Area { get; set; }
+
+        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete) {
+            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";
+            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)) {
+                RetroactiveInput.IsChecked = true;
+            } else {
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+            }
+        }
+
+        private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            YearTo = SeasonInput.Value! - 1;
+            CancelSeason1.Text = $"{YearTo}";
+            CancelSeason2.Text = $"{YearTo}";
+            NewSeason1.Text = $"{YearTo + 1}";
+        }
+
+        private void RetroactiveInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ModifyRetroactively) {
+                SeasonInput.IsEnabled = false;
+                SeasonInput.Text = "";
+                YearTo = null;
+                DescBlock1.Visibility = Visibility.Hidden;
+                DescBlock2.Visibility = Visibility.Hidden;
+            } else {
+                SeasonInput.IsEnabled = true;
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+                DescBlock1.Visibility = QuestionBlock1.Visibility;
+                DescBlock2.Visibility = QuestionBlock2.Visibility;
+            }
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComDialog"
+<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -51,7 +51,7 @@
         <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 MaintainYearTo}"/>
+                  IsChecked="{Binding MaintainYearFrom}"/>
 
         <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

@@ -3,16 +3,16 @@ using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Dialogs {
-    public partial class AreaComDialog : Window {
+    public partial class AreaComTransferDialog : Window {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
-        public bool MaintainYearTo { get; set; }
+        public bool MaintainYearFrom { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
 
-        public AreaComDialog(string name, int areaComNum, int area) {
+        public AreaComTransferDialog(string name, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -29,7 +29,7 @@ namespace Elwig.Dialogs {
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
-        public AreaComDialog(string name, string successorName, int areaComNum, int area) {
+        public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -43,13 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
-            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Documents/BusinessDocument.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">

Elwig/Documents/CreditNote.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
@@ -136,7 +136,10 @@
             }
         </tbody>
         <tbody style="break-inside: avoid;">
-            @{ decimal penalty = 0; }
+            @{
+                decimal penalty = 0;
+                string? comment = null;
+            }
 
             @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
                 <tr class="small">
@@ -158,7 +161,13 @@
                 penalty += Model.MemberAutoBusinessSharesAmount;
             }
             @if (Model.CustomPayment?.Amount != null) {
-                @Raw(FormatRow(Model.CustomPayment.Comment ?? ((Model.CustomPayment.Amount.Value) < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount.Value, add: true));
+                comment = Model.CustomPayment.Comment;
+                string text = (Model.CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
+                if (comment != null && comment!.Length <= 30) {
+                    text = comment;
+                    comment = null;
+                }
+                @Raw(FormatRow(text, Model.CustomPayment.Amount.Value, add: true));
                 penalty += Model.CustomPayment.Amount.Value;
             }
 
@@ -176,6 +185,9 @@
             }
         </tbody>
     </table>
+    @if (comment != null) {
+        <p>* @comment</p>
+    }
     <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
     <div style="margin-top: 1em;">
         @if (Model.Text != null) {

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
 @model Elwig.Documents.DeliveryAncmtList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
 <main>
     <h1>Anmeldeliste</h1>
     <h2>@Model.Filter</h2>
@@ -24,7 +24,7 @@
                 <th rowspan="2" style="text-align: left;">Ort</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th rowspan="2">Anmldg.</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[kg]</th>

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="delivery-confirmation">
@@ -30,7 +30,7 @@
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
                 <th rowspan="3" style="padding: 0;">
                     <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
                         <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"

Elwig/Documents/DeliveryDepreciationList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
 @model Elwig.Documents.DeliveryDepreciationList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryDepreciationList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
 <main>
     <h1>Abwertungsliste</h1>
     <h2>@Model.Filter</h2>
@@ -27,7 +27,7 @@
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
                 <th colspan="2">Gradation</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[°Oe]</th>

Elwig/Documents/DeliveryJournal.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryJournal>
 @model Elwig.Documents.DeliveryJournal
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
 <main>
     <h1>Lieferjournal</h1>
     <h2>@Model.Filter</h2>
@@ -29,7 +29,7 @@
                 <th rowspan="2" style="text-align: left;">Mitglied</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th colspan="2">Gradation</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[°Oe]</th>

Elwig/Documents/DeliveryNote.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery large">
@@ -24,7 +24,7 @@
             <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <th>Menge</th>
         </tr>
         <tr>
             <th class="unit">[°Oe]</th>

Elwig/Documents/Document.cs

@@ -23,7 +23,7 @@ namespace Elwig.Documents {
         public bool ShowFoldMarks = App.Config.Debug;
         public bool DoublePaged = false;
 
-        public string DataPath;
+        public string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
@@ -34,7 +34,7 @@ namespace Elwig.Documents {
 
         public Document(string title) {
             var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
@@ -44,8 +44,8 @@ namespace Elwig.Documents {
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
                 .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
                     .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
-                    .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
             Date = DateOnly.FromDateTime(Utils.Today);
         }

Elwig/Documents/Document.cshtml

@@ -7,9 +7,9 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
     @if (Model.DoublePaged) {
         <style>
             @@page :left {

Elwig/Documents/MemberDataSheet.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="member border">

Elwig/Documents/MemberList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.MemberList>
 @model Elwig.Documents.MemberList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
 <main>
     <h1>Mitgliederliste</h1>
     <h2>@Model.Filter</h2>

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
 @model Elwig.Documents.PaymentVariantSummary
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
 <main>
     <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
     <h2>@Model.Variant.Name</h2>
@@ -111,8 +111,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
                 @{
                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.Price);
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
-                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
                 }
                 <th class="lborder tborder">Preis (abgewertet):</th>
                 <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
@@ -123,8 +123,8 @@
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
                 }
                 <th class="lborder">Preis (ungeb., nicht abgew.):</th>
                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
@@ -135,8 +135,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
-                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
-                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
                     var minGeb = gebRows.Min();
                     var maxGeb = gebRows.Max();
                 }
@@ -219,19 +219,22 @@
     </table>
     <table class="payment-variant-data">
         <colgroup>
-            <col style="width: 30mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
             <col style="width: 25mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 22mm;"/>
         </colgroup>
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th>Gradation</th>
                 <th colspan="2">ungebunden</th>
+                <th colspan="2">attributlos gebunden</th>
                 <th colspan="2">gebunden</th>
                 <th>Gesamt</th>
             </tr>
@@ -241,6 +244,8 @@
                 <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[kg]</th>
                 <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[@(Model.CurrencySymbol)]</th>
             </tr>
         </thead>
@@ -258,6 +263,8 @@
                         <th colspan="2">@hdr</th>
                         <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
                         <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.LowGeb.Weight):N0}")</td>
+                        <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
                         <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
@@ -267,9 +274,11 @@
                     <td>@(row.QualityLevel)</td>
                     <td class="center">@($"{row.Oe:N0}")</td>
                     <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@($"{row.Amount:N2}")</td>
                 </tr>
                 lastHdr = hdr;

Elwig/Documents/WineQualityStatistics.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
 @model Elwig.Documents.WineQualityStatistics
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\WineQualityStatistics.css" />
 <main>
     <h1>Qualitätsstatistik</h1>
     <h2>@Model.Filter</h2>

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.13.8</Version>
+    <Version>1.0.1.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,26 +20,24 @@
     <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="LinqKit" Version="1.3.8" />
-    <PackageReference Include="MailKit" Version="4.12.0" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
-    <PackageReference Include="NJsonSchema" Version="11.3.2" />
+    <PackageReference Include="NJsonSchema" Version="11.4.0" />
     <PackageReference Include="PdfiumViewer" Version="2.13.0" />
     <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.56" />
-    <PackageReference Include="System.IO.Ports" Version="9.0.4" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.4" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -248,13 +248,6 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
-        public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
-            return await WineQualityLevels
-                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
-                .OrderBy(q => q.MinKmw)
-                .LastAsync();
-        }
-
         public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = new DeliveryPartModifier {

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 = 31;
+        public static readonly int RequiredSchemaVersion = 33;
 
         private static int VersionOffset = 0;
 
@@ -28,10 +28,10 @@ namespace Elwig.Helpers {
             await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
             var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
-            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)(userVers & 0xFFFF));
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)((userVers >> 8) & 0xFF), (int)(userVers & 0xFF));
 
             if (App.Version > v) {
-                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | App.Version.Build;
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | (App.Version.Build << 8) | App.Version.Revision;
                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 

Elwig/Helpers/Billing/BillingVariant.cs

@@ -20,13 +20,19 @@ namespace Elwig.Helpers.Billing {
             Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
         }
 
-        public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
+        public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
             await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
             await DeleteInDb(cnx);
             await SetCalcTime(cnx);
-            await CalculatePrices(cnx);
+            KeyNotFoundException? exception = null;
+            try {
+                await CalculatePrices(cnx, strictPrices);
+            } catch (KeyNotFoundException e) {
+                if (strictPrices) throw;
+                exception = e;
+            }
             if (Data.ConsiderDelieryModifiers) {
                 await CalculateDeliveryModifiers(cnx);
             }
@@ -34,6 +40,8 @@ namespace Elwig.Helpers.Billing {
                 await CalculateMemberModifiers(cnx);
             }
             await tx.CommitAsync();
+            if (exception != null)
+                throw exception;
         }
 
         public async Task Commit() {
@@ -142,7 +150,8 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        protected async Task CalculatePrices(SqliteConnection cnx) {
+        protected async Task CalculatePrices(SqliteConnection cnx, bool strict = true) {
+            var invalid = new HashSet<string>();
             var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
@@ -172,15 +181,25 @@ namespace Elwig.Helpers.Billing {
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
                 var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
                 var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
-                var price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
+                decimal price = 0;
+                try {
+                    price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
+                } catch (KeyNotFoundException e) {
+                    invalid.Add(e.Message.Split('\'')[1]);
+                }
                 var priceL = PaymentVariant.Season.DecToDb(price);
                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }
 
+            var msg = invalid.Count == 0 ? null : "Für folgende Sorten wurde noch keine Preiskurve festgelegt: " + string.Join(", ", invalid);
+            if (msg != null && strict)
+                throw new KeyNotFoundException(msg);
             await AppDbContext.ExecuteBatch(cnx, $"""
                 INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
                 VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))};
                 """);
+            if (msg != null)
+                throw new KeyNotFoundException(msg);
         }
 
         protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {

Elwig/Helpers/Billing/GraphEntry.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Media;
 
 namespace Elwig.Helpers.Billing {
     public class GraphEntry {
@@ -40,6 +41,7 @@ namespace Elwig.Helpers.Billing {
         public string VaributeStringSimple => (Abgewertet ? "Abgew.: " : "") + (Vaributes.Count != 0 ? (Vaributes.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Vaributes.Select(c => c.Listing))) : "-");
         public string VaributeString => Vaributes.Count != 0 ? string.Join("\n", Vaributes.Select(c => c.FullName)) : "-";
         public string VaributeStringChange => (Abgewertet ? "A." : "") + string.Join(",", Vaributes.Select(c => c.Listing));
+        public Brush? Color => Vaributes.Select(v => v.Variety?.Color).Distinct().SingleOrDefault();
         private readonly int Precision;
 
         public GraphEntry(int id, int precision, BillingData.CurveMode mode) {

Elwig/Helpers/ClientParameters.cs

@@ -19,14 +19,6 @@ namespace Elwig.Helpers {
         public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
         public bool IsGrInzersdorf => IsWeinland;
 
-        public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
-        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
-        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
-
-        public bool HasBoxWeighing(string? zwstId) => IsWinzerkeller && (zwstId != "W");
-        public bool HasBoxWeighing(Branch? b) => HasBoxWeighing(b?.ZwstId);
-        public bool HasBoxWeighing() => HasBoxWeighing(App.ZwstId);
-
         public string NameToken;
         public string NameShort;
         public string Name;
@@ -55,6 +47,7 @@ namespace Elwig.Helpers {
         public string? Bic;
         public string? UstIdNr;
         public string? LfbisNr;
+        public string? OrganicAuthority;
 
         public string? PhoneNr;
         public string? FaxNr;
@@ -113,6 +106,7 @@ namespace Elwig.Helpers {
                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
+                OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
 
                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
                     case "NONE": ModeDeliveryNoteStats = 0; break;
@@ -257,6 +251,7 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
+                ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics),
                 ("ORDERING_MEMBERLIST", orderingMemberList),

Elwig/Helpers/Config.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -5,6 +6,8 @@ using Microsoft.Extensions.Configuration;
 
 namespace Elwig.Helpers {
 
+    public enum WeighingMode { Gross, Net, Box }
+
     public record struct ScaleConfig {
         public string Id;
         public string? Type;
@@ -41,6 +44,7 @@ namespace Elwig.Helpers {
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
+        public WeighingMode? WeighingMode;
         public string? UpdateUrl = null;
         public bool UpdateAuto = false;
         public string? SyncUrl = null;
@@ -74,6 +78,8 @@ namespace Elwig.Helpers {
             DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null;
             Branch = config["general:branch"];
             Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
+            var weighing = config["general:weighing"];
+            WeighingMode = weighing != null && Enum.TryParse<WeighingMode>(weighing, true, out var w) ? w : null;
             UpdateUrl = config["update:url"];
             UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
             SyncUrl = config["sync:url"];

Elwig/Helpers/Export/Database.cs

@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public static class Database {
+
+        private static async Task<(long? ApplicationId, string? UserVersion, long? SchemaVersion, long FileSize)> GetMeta() {
+            long size = new FileInfo(App.Config.DatabaseFile).Length;
+            using var cnx = await AppDbContext.ConnectAsync();
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id");
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version");
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version");
+            return (applId, userVers != null ? $"{userVers >> 24}.{(userVers >> 16) & 0xFF}.{(userVers >> 8) & 0xFF}.{userVers & 0xFF}" : null, schemaVers, size);
+        }
+
+        public static async Task ExportSqlite(string filename, bool zipFile) {
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
+            } else {
+                File.Copy(App.Config.DatabaseFile, filename, true);
+            }
+        }
+
+        public static async Task ExportSql(string filename, bool zipFile) {
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var sql = zip.CreateEntry("database.sql", CompressionLevel.SmallestSize);
+                using (var writer = new StreamWriter(sql.Open(), Utils.UTF8)) {
+                    await ExportSql(writer);
+                }
+            } else {
+                using var stream = File.OpenWrite(filename);
+                using var writer = new StreamWriter(stream, Utils.UTF8);
+                await ExportSql(writer);
+            }
+        }
+
+        public static async Task ExportSql(StreamWriter writer) {
+            using var cnx = await AppDbContext.ConnectAsync();
+
+            var tables = new List<(string Name, string Sql)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT name, sql FROM sqlite_schema WHERE type = 'table'";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    tables.Add((reader.GetString(0), reader.GetString(1)));
+                }
+            }
+
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+
+            await writer.WriteLineAsync($"-- Elwig database dump, {DateTime.Now:yyyy-MM-dd, HH:mm:ss}");
+            await writer.WriteLineAsync($"-- {Environment.MachineName}, Zwst. {App.BranchName}, {App.Client.Name}");
+            await writer.WriteLineAsync("BEGIN TRANSACTION;");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=OFF;");
+            await writer.WriteLineAsync($"PRAGMA application_id=0x{applId:X8};");
+            await writer.WriteLineAsync($"PRAGMA user_version=0x{userVers:X8};");
+
+            foreach (var t in tables) {
+                await writer.WriteAsync(t.Sql);
+                await writer.WriteLineAsync(";");
+
+                var columnNames = new List<string>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"PRAGMA table_info({t.Name})";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        columnNames.Add(reader.GetString(1));
+                    }
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"SELECT {string.Join(',', columnNames)} FROM {t.Name}";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    var columns = await reader.GetColumnSchemaAsync();
+                    var values = new object[reader.FieldCount];
+                    while (await reader.ReadAsync()) {
+                        await writer.WriteAsync($"INSERT INTO {t.Name} VALUES (");
+
+                        reader.GetValues(values);
+                        for (int i = 0; i < columns.Count; i++) {
+                            var c = columns[i];
+                            var v = values[i];
+                            if (i > 0) await writer.WriteAsync(",");
+                            if (v == null || v is DBNull) {
+                                await writer.WriteAsync("NULL");
+                            } else if (c.DataTypeName == "TEXT") {
+                                await writer.WriteAsync($"'{v.ToString()?.Replace("'", "''")}'");
+                            } else {
+                                await writer.WriteAsync(v.ToString()?.Replace(',', '.'));
+                            }
+                        }
+
+                        await writer.WriteLineAsync(");");
+                    }
+                }
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT sql FROM sqlite_schema WHERE type != 'table' AND sql IS NOT NULL";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    await writer.WriteAsync(reader.GetString(0));
+                    await writer.WriteLineAsync(";");
+                }
+            }
+
+            await writer.WriteLineAsync($"PRAGMA schema_version={schemaVers};");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=ON;");
+            await writer.WriteLineAsync("COMMIT;");
+            await writer.WriteLineAsync("VACUUM;");
+        }
+
+        public static async Task Import(string filename) {
+            if (filename.EndsWith(".sql")) {
+                await ImportSql(filename, false);
+            } else if (filename.EndsWith(".sql.zip")) {
+                await ImportSql(filename, true);
+            } else if (filename.EndsWith(".sqlite3")) {
+                await ImportSqlite(filename, false);
+            } else if (filename.EndsWith(".sqlite3.zip")) {
+                await ImportSqlite(filename, true);
+            } else {
+                throw new ArgumentException($"Unknown file extension for importing: '{filename}'");
+            }
+        }
+
+        public static async Task ImportSql(string filename, bool zipFile = false) {
+            if (zipFile) {
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                await zip.CheckIntegrity();
+                foreach (var entry in zip.Entries) {
+                    if (entry.Name.EndsWith(".sql")) {
+                        using var stream = entry.Open();
+                        using var reader = new StreamReader(stream, Utils.UTF8);
+                        await ImportSql(reader);
+                        return;
+                    }
+                }
+                throw new FileFormatException("ZIP archive has to contain at least one .sql file");
+            } else {
+                using var stream = File.Open(filename, FileMode.Open);
+                using var reader = new StreamReader(stream, Utils.UTF8);
+                await ImportSql(reader);
+            }
+        }
+
+        public static async Task ImportSqlite(string filename, bool zipFile = false) {
+            if (zipFile) {
+                var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+                try {
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                    await zip.CheckIntegrity();
+                    foreach (var entry in zip.Entries) {
+                        if (entry.Name.EndsWith(".sqlite3")) {
+                            entry.ExtractToFile(newName);
+                            await ImportSqlite(newName);
+                            return;
+                        }
+                    }
+                    throw new FileFormatException("ZIP archive has to contain at least one .sqlite3 file");
+                } finally {
+                    if (File.Exists(newName)) File.Delete(newName);
+                }
+            }
+
+            var oldName = Path.ChangeExtension(App.Config.DatabaseFile, ".old.sqlite3");
+            File.Move(App.Config.DatabaseFile, oldName, true);
+            File.Move(filename, App.Config.DatabaseFile, false);
+
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, "VACUUM");
+        }
+
+        public static async Task ImportSql(StreamReader reader) {
+            var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+            File.Delete(newName);
+            try {
+                using (var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{newName}\"; Mode=ReadWriteCreate; Foreign Keys=False; Cache=Default; Pooling=False")) {
+                    await AppDbContext.ExecuteBatch(cnx, await reader.ReadToEndAsync());
+                }
+                await ImportSqlite(newName);
+            } finally {
+                if (File.Exists(newName)) File.Delete(newName);
+            }
+        }
+    }
+}

Elwig/Helpers/Export/ElwigData.cs

@@ -1,14 +1,14 @@
-using System.IO.Compression;
-using System.IO;
-using System.Threading.Tasks;
 using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System;
-using System.Text.Json.Nodes;
-using System.Linq;
-using System.Windows;
 using Microsoft.EntityFrameworkCore;
-using System.Text.Json;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
@@ -17,8 +17,6 @@ namespace Elwig.Helpers.Export {
 
         public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt");
 
-        private static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
-
         public static async Task<string[]> GetImportedFiles() {
             try {
                 return await File.ReadAllLinesAsync(ImportedTxt, Utils.UTF8);
@@ -40,6 +38,7 @@ namespace Elwig.Helpers.Export {
                 Dictionary<string, int> currentLsNrs;
                 Dictionary<int, List<WbRd>> currentWbRde;
                 Dictionary<int, AT_Kg> kgs;
+                List<WbGl> currentWbGls;
 
                 using (var ctx = new AppDbContext()) {
                     branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
@@ -51,6 +50,7 @@ namespace Elwig.Helpers.Export {
                     currentWbRde = await ctx.WbRde
                         .GroupBy(r => r.KgNr)
                         .ToDictionaryAsync(g => g.Key, g => g.ToList());
+                    currentWbGls = await ctx.WbGls.ToListAsync();
                     kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
                 }
 
@@ -61,9 +61,12 @@ namespace Elwig.Helpers.Export {
                     List<MemberEmailAddr> EmailAddresses,
                     List<AreaCom> AreaCommitments,
                     List<WbRd> Riede,
+                    List<WbKg> WbKgs,
+                    List<WbGl> WbGls,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
-                    List<DeliveryPartModifier> Modifiers)>();
+                    List<DeliveryPartModifier> Modifiers,
+                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
 
                 var metaData = new List<(string FileName, string ZwstId, string Device,
                     int? MemberNum, string? MemberFilters,
@@ -71,71 +74,117 @@ namespace Elwig.Helpers.Export {
                     int? DeliveryNum, string? DeliveryFilters)>();
 
                 foreach (var filename in filenames) {
-                    // TODO read encrypted files
+                    try {
-                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
+                            ["member"] = [],
+                            ["area_commitment"] = [],
+                            ["delivery"] = [],
+                        })));
+                        var r = data[^1];
 
-                    var version = zip.GetEntry("version");
+                        // TODO read encrypted files
-                    using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
+                        using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
-                        if (await reader.ReadToEndAsync() != "elwig:1")
+                        await zip.CheckIntegrity();
-                            throw new FileFormatException($"Ungültige Export-Datei ({filename})");
-                    }
 
-                    var metaJson = zip.GetEntry("meta.json");
+                        var version = zip.GetEntry("version");
-                    var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                        using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                    var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                            if (await reader.ReadToEndAsync() != "elwig:1")
-                    var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                                throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
-                    var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                    var areaComFilters = meta!["area_commitments"]?["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),
-                        meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
-                        memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
-                        areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
-                        deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
-
-                    data.Add(new([], [], [], [], [], [], [], new([], [])));
-                    var r = data[^1];
-
-                    var membersJson = zip.GetEntry("members.json");
-                    if (membersJson != null) {
-                        using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
-                        string? line;
-                        while ((line = await reader.ReadLineAsync()) != null) {
-                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
-                            r.Members.Add(m);
-                            if (b != null) r.BillingAddresses.Add(b);
-                            r.TelephoneNumbers.AddRange(telNrs);
-                            r.EmailAddresses.AddRange(emailAddrs);
                         }
-                    }
 
-                    var areaComsJson = zip.GetEntry("area_commitments.json");
+                        var metaJson = zip.GetEntry("meta.json");
-                    if (areaComsJson != null) {
+                        var meta = await JsonNode.ParseAsync(metaJson!.Open());
-                        using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
+                        var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
-                        string? line;
+                        var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        while ((line = await reader.ReadLineAsync()) != null) {
+                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                            var obj = JsonNode.Parse(line)!.AsObject();
+                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
+                        var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
-                            r.AreaCommitments.Add(areaCom);
+                        var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                            if (wbrd != null) {
+                        metaData.Add((Path.GetFileName(filename),
-                                currentWbRde[wbrd.KgNr].Add(wbrd);
+                            meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
-                                r.Riede.Add(wbrd);
+                            memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
+                            areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                            deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
+
+                        var wbKgsJson = zip.GetEntry("wb_kgs.json");
+                        if (wbKgsJson != null) {
+                            using var reader = new StreamReader(wbKgsJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (k, g) = obj.ToWbKg(currentWbGls);
+                                r.WbKgs.Add(k);
+                                if (g != null) {
+                                    currentWbGls[g.GlNr] = g;
+                                    r.WbGls.Add(g);
+                                }
                             }
                         }
-                    }
 
-                    var deliveriesJson = zip.GetEntry("deliveries.json");
+                        var membersJson = zip.GetEntry("members.json");
-                    if (deliveriesJson != null) {
+                        if (membersJson != null) {
-                        using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
+                            using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
-                        string? line;
+                            string? line;
-                        while ((line = await reader.ReadLineAsync()) != null) {
+                            while ((line = await reader.ReadLineAsync()) != null) {
-                            var obj = JsonNode.Parse(line)!.AsObject();
+                                var obj = JsonNode.Parse(line)!.AsObject();
-                            var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids);
+                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
-                            r.Deliveries.Add(d);
+                                r.Members.Add(m);
-                            r.DeliveryParts.AddRange(parts);
+                                if (b != null) r.BillingAddresses.Add(b);
-                            r.Modifiers.AddRange(mods);
+                                r.TelephoneNumbers.AddRange(telNrs);
+                                r.EmailAddresses.AddRange(emailAddrs);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        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);
+                                r.AreaCommitments.Add(areaCom);
+                                if (wbrd != null) {
+                                    r.Riede.Add(wbrd);
+                                }
+                                if (timestamps.HasValue)
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        var deliveriesJson = zip.GetEntry("deliveries.json");
+                        if (deliveriesJson != null) {
+                            using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                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.Modifiers.AddRange(mods);
+                                r.Riede.AddRange(rde);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+                    } catch (Exception exc) when (
+                            exc is InvalidDataException ||
+                            exc is FileFormatException ||
+                            exc is FileNotFoundException ||
+                            exc is IOException) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen.\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                        await AddImportedFiles(Path.GetFileName(filename));
+                    } catch (Exception exc) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        var r = MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No);
+                        if (r == MessageBoxResult.Yes) {
+                            await AddImportedFiles(Path.GetFileName(filename));
                         }
                     }
                 }
@@ -144,12 +193,18 @@ namespace Elwig.Helpers.Export {
                 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, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
                     using var ctx = new AppDbContext();
 
+                    var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
+                    var duplicateKgNrs = await ctx.WbKgs
+                        .Where(k => kgnrs.Contains(k.KgNr))
+                        .Select(k => k.KgNr)
+                        .ToListAsync();
+
                     var mgnrs = members.Select(m => m.MgNr).ToList();
                     var duplicateMgNrs = await ctx.Members
                         .Where(m => mgnrs.Contains(m.MgNr))
@@ -203,6 +258,12 @@ namespace Elwig.Helpers.Export {
                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
                     }
 
+                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
+                        ctx.AddRange(wbGls);
+                        ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
+                        ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
+                    }
+
                     if (importDuplicateMembers) {
                         ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                         ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
@@ -272,6 +333,26 @@ namespace Elwig.Helpers.Export {
                     }
 
                     await ctx.SaveChangesAsync();
+
+                    var primaryKeys = new Dictionary<string, string>() {
+                        ["member"] = "mgnr, 0",
+                        ["area_commitment"] = "fbnr, 0",
+                        ["delivery"] = "year, did",
+                    };
+                    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});"));
+                    using var cnx = AppDbContext.Connect();
+                    await AppDbContext.ExecuteBatch(cnx, $"""
+                        BEGIN;
+                        UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        {string.Join("\n", updateStmts)}
+                        UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        COMMIT;
+                        """);
+
                     await AddImportedFiles(Path.GetFileName(meta.FileName));
                 }
                 App.HintContextChange();
@@ -302,9 +383,9 @@ namespace Elwig.Helpers.Export {
                     "Importieren erfolgreich",
                     MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden.\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -319,26 +400,30 @@ namespace Elwig.Helpers.Export {
             ) == MessageBoxResult.Yes;
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
-                Members = (members, filters)
+                Members = (members, filters),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern"]),
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
                 AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
-                Deliveries = (deliveries, filters)
+                Deliveries = (deliveries, filters),
+                WbKgs = (wbKgs, ["von exportierten Lieferungen"]),
             }.Export(filename);
         }
 
         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<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
@@ -359,6 +444,12 @@ namespace Elwig.Helpers.Export {
                         ["zwstid"] = App.ZwstId,
                         ["device"] = Environment.MachineName,
                     };
+                    if (WbKgs != null) {
+                        obj["wb_kgs"] = new JsonObject {
+                            ["count"] = WbKgs.Value.WbKgs.Count(),
+                            ["filters"] = new JsonArray(WbKgs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    }
                     if (Members != null)
                         obj["members"] = new JsonObject {
                             ["count"] = Members.Value.Members.Count(),
@@ -375,34 +466,69 @@ namespace Elwig.Helpers.Export {
                             ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count),
                             ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
-                    await writer.WriteAsync(obj.ToJsonString(JsonOpts));
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
                 }
 
                 // TODO encrypt files
+                if (WbKgs != null) {
+                    var json = zip.CreateEntry("wb_kgs.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var k in WbKgs.Value.WbKgs) {
+                        await writer.WriteLineAsync(k.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
                 if (Members != null) {
                     var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var m in Members.Value.Members) {
-                        await writer.WriteLineAsync(m.ToJson().ToJsonString(JsonOpts));
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
                 if (AreaComs != null) {
                     var json = zip.CreateEntry("area_commitments.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(JsonOpts));
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
                 if (Deliveries != null) {
                     var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var d in Deliveries.Value.Deliveries) {
-                        await writer.WriteLineAsync(d.ToJson().ToJsonString(JsonOpts));
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
             }
         }
 
+        public static JsonObject ToJson(this WbKg k) {
+            return new JsonObject {
+                ["kgnr"] = k.KgNr,
+                ["großlage"] = k.Gl?.Name,
+            };
+        }
+
+        public static (WbKg, WbGl?) ToWbKg(this JsonNode json, List<WbGl> gls) {
+            var grosslage = json["großlage"]?.AsValue().GetValue<string>();
+            WbGl? gl = null;
+            bool newGl = false;
+            if (grosslage != null) {
+                gl = gls.FirstOrDefault(g => g.Name == grosslage);
+                if (gl == null) {
+                    newGl = true;
+                    gl = new WbGl {
+                        GlNr = (gls.Count == 0 ? 1 : gls.Max(g => g.GlNr)) + 1,
+                        Name = grosslage,
+                    };
+                    gls[gl.GlNr] = gl;
+                }
+            }
+            return (new WbKg {
+                KgNr = json["kgnr"]!.AsValue().GetValue<int>(),
+                GlNr = gl?.GlNr,
+            }, newGl ? gl : null);
+        }
+
         public static JsonObject ToJson(this Member m) {
             return new JsonObject {
                 ["mgnr"] = m.MgNr,
@@ -460,15 +586,19 @@ namespace Elwig.Helpers.Export {
                     return obj;
                 }).ToArray()),
                 ["comment"] = m.Comment,
+                ["created_at"] = $"{m.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{m.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
             var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
             var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
             if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
                 throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
             }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new Member {
                 MgNr = mgnr,
                 PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
@@ -502,6 +632,7 @@ namespace Elwig.Helpers.Export {
                 ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
                 ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
             }, json["billing_address"] is JsonObject a ? new BillingAddr {
                 MgNr = mgnr,
                 FullName = a["name"]!.AsValue().GetValue<string>(),
@@ -519,7 +650,10 @@ namespace Elwig.Helpers.Export {
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            }).ToList());
+            }).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) {
@@ -535,27 +669,32 @@ namespace Elwig.Helpers.Export {
                 ["year_from"] = c.YearFrom,
                 ["year_to"] = c.YearTo,
                 ["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?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+        public static (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;
             bool newRd = false;
             if (ried != null) {
-                var rde = riede[kgnr] ?? throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+                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 ? 0 : rde.Max(r => r.RdNr)) + 1,
+                        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 AreaCom {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
@@ -564,11 +703,15 @@ namespace Elwig.Helpers.Export {
                 Area = json["area"]!.AsValue().GetValue<int>(),
                 KgNr = kgnr,
                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
-                RdNr = rd?.RdNr,
+                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>(),
-            }, newRd ? rd : null);
+                ImportedAt = DateTime.Now,
+            }, 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 JsonObject ToJson(this Delivery d) {
@@ -591,11 +734,13 @@ namespace Elwig.Helpers.Export {
                         ["qualid"] = p.QualId,
                         ["hkid"] = p.HkId,
                         ["kgnr"] = p.KgNr,
-                        ["rdnr"] = p.RdNr,
+                        ["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;
@@ -609,10 +754,12 @@ namespace Elwig.Helpers.Export {
                     return obj;
                 }).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>) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
+        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) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -621,6 +768,9 @@ namespace Elwig.Helpers.Export {
                 did = ++currentDids[year];
             }
             currentLsNrs[lsnr] = did;
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            var wbRde = new List<WbRd>();
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -631,37 +781,61 @@ namespace Elwig.Helpers.Export {
                 LsNr = lsnr,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
-            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
+                ImportedAt = DateTime.Now,
-                Year = year,
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
-                DId = did,
+                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
-                DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
+                var ried = p["ried"]?.AsValue().GetValue<string>();
-                SortId = p["sortid"]!.AsValue().GetValue<string>(),
+                WbRd? rd = null;
-                AttrId = p["attrid"]?.AsValue().GetValue<string>(),
+                if (ried != null) {
-                CultId = p["cultid"]?.AsValue().GetValue<string>(),
+                    var rde = riede.GetValueOrDefault(kgnr, []);
-                Weight = p["weight"]!.AsValue().GetValue<int>(),
+                    rd = rde.FirstOrDefault(r => r.Name == ried);
-                Kmw = p["kmw"]!.AsValue().GetValue<double>(),
+                    if (rd == null) {
-                QualId = p["qualid"]!.AsValue().GetValue<string>(),
+                        rd = new WbRd {
-                HkId = p["hkid"]!.AsValue().GetValue<string>(),
+                            KgNr = kgnr,
-                KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
+                            RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
-                RdNr = p["rdnr"]?.AsValue().GetValue<int>(),
+                            Name = ried,
-                IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
+                        };
-                IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
+                        rde.Add(rd);
-                Comment = p["comment"]?.AsValue().GetValue<string>(),
+                        riede[rd.KgNr] = rde;
-                IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
+                        wbRde.Add(rd);
-                IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
+                    }
-                IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
+                }
-                IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                return new DeliveryPart {
-                Temperature = p["temperature"]?.AsValue().GetValue<double>(),
+                    Year = year,
-                Acid = p["acid"]?.AsValue().GetValue<double>(),
+                    DId = did,
-                ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
+                    DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
-                WeighingData = p["weighing_data"]?.AsObject().ToJsonString(JsonOpts),
+                    SortId = p["sortid"]!.AsValue().GetValue<string>(),
-                WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
+                    AttrId = p["attrid"]?.AsValue().GetValue<string>(),
+                    CultId = p["cultid"]?.AsValue().GetValue<string>(),
+                    Weight = p["weight"]!.AsValue().GetValue<int>(),
+                    Kmw = p["kmw"]!.AsValue().GetValue<double>(),
+                    QualId = p["qualid"]!.AsValue().GetValue<string>(),
+                    HkId = p["hkid"]!.AsValue().GetValue<string>(),
+                    KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
+                    RdNr = rd?.RdNr ?? p["rdnr"]?.AsValue().GetValue<int>(),
+                    IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
+                    IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
+                    Comment = p["comment"]?.AsValue().GetValue<string>(),
+                    IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
+                    IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
+                    IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
+                    IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                    Temperature = p["temperature"]?.AsValue().GetValue<double>(),
+                    Acid = p["acid"]?.AsValue().GetValue<double>(),
+                    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 {
                 Year = year,
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList());
+            })).ToList(),
+            wbRde,
+            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)));
         }
     }
 }

Elwig/Helpers/Export/Ods.cs

@@ -317,7 +317,7 @@ namespace Elwig.Helpers.Export {
                 c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
             }
 
-            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
         }
     }
 }

Elwig/Helpers/Extensions.cs

@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using System.IO.Compression;
+using System.IO.Hashing;
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -95,5 +97,16 @@ namespace Elwig.Helpers {
             await download.CopyToAsync(destination, 81920, relativeProgress, cancellationToken);
             progress.Report(100.0);
         }
+
+        public static async Task CheckIntegrity(this ZipArchive zip) {
+            var crc = new Crc32();
+            foreach (var entry in zip.Entries) {
+                crc.Reset();
+                using var stream = entry.Open();
+                await crc.AppendAsync(stream);
+                if (crc.GetCurrentHashAsUInt32() != entry.Crc32)
+                    throw new InvalidDataException($"CRC-32 mismatch in '{entry.FullName}'");
+            }
+        }
     }
 }

Elwig/Helpers/Printing/Html.cs

@@ -10,7 +10,7 @@ namespace Elwig.Helpers.Printing {
 
         public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DataPath + "resources")
+                .UseFileSystemProject(App.DocumentsPath)
                 .UseMemoryCachingProvider()
                 .Build();
 

Elwig/Helpers/Printing/Pdf.cs

@@ -14,7 +14,7 @@ using System.Drawing.Printing;
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string WinziPrint = new string[] { App.ExePath }
+        private static readonly string WinziPrint = new string[] { App.InstallPath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
             .Where(File.Exists)

Elwig/Helpers/Utils.cs

@@ -1,41 +1,42 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-using System.IO.Ports;
-using System.Net.Sockets;
 using Elwig.Dialogs;
-using System.Text;
+using Elwig.Documents;
-using System.Numerics;
-using Elwig.Models.Entities;
 using Elwig.Helpers.Billing;
-using System.Runtime.InteropServices;
+using Elwig.Models;
-using System.Net.Http;
+using Elwig.Models.Entities;
-using System.Text.Json.Nodes;
+using LinqKit;
-using System.IO;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.EntityFrameworkCore;
-using System.Reflection;
-using System.Collections;
-using Elwig.Documents;
-using MimeKit;
-using System.Windows.Input;
-using LinqKit;
-using System.Linq.Expressions;
-using Elwig.Models;
 using Microsoft.Win32;
+using MimeKit;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
+using System.IO;
+using System.IO.Ports;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Net.Http;
+using System.Net.Sockets;
+using System.Numerics;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.RegularExpressions;
 using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Markup;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
 
         public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
+        public static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
 
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
@@ -430,6 +431,8 @@ namespace Elwig.Helpers {
             var client = new HttpClient() {
                 Timeout = TimeSpan.FromSeconds(5),
             };
+            client.DefaultRequestHeaders.UserAgent.Clear();
+            client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})");
             client.DefaultRequestHeaders.Accept.Clear();
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
@@ -457,7 +460,7 @@ namespace Elwig.Helpers {
                 url = "https://sync.elwig.at/" + url[25..];
             if (!url.EndsWith('/')) url += "/";
             using var client = GetHttpClient(username, password, accept: "application/json");
-            var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
+            using var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
             content.Headers.ContentType = new("application/zip");
             using var res = await client.PutAsync(url + Path.GetFileName(zip), content);
             res.EnsureSuccessStatusCode();
@@ -498,10 +501,7 @@ namespace Elwig.Helpers {
         public static async Task<bool> SendEmail(Member member, string subject, string text, IEnumerable<Document> docs) {
             if (App.Config.Smtp == null)
                 return false;
-
+            return await Task.Run(async () => {
-            Mouse.OverrideCursor = Cursors.Wait;
-
-            var success = await Task.Run(async () => {
                 SmtpClient? client = null;
                 try {
                     client = await GetSmtpClient();
@@ -529,18 +529,15 @@ namespace Elwig.Helpers {
                 }
                 return true;
             });
-
-            Mouse.OverrideCursor = null;
-            return success;
         }
 
-        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member Member, string Subject, string Text)? emailData = null) {
             if (mode == ExportMode.Print && !App.Config.Debug) {
                 await doc.Generate();
                 await doc.Print();
             } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
                 await doc.Generate();
-                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
+                var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
                 if (success)
                     MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
                         MessageBoxButton.OK, MessageBoxImage.Information);
@@ -567,9 +564,7 @@ namespace Elwig.Helpers {
                 Log = "Application",
                 Source = ".NET Runtime",
             };
-            return log.Entries.Cast<EventLogEntry>()
+            return [.. log.Entries.OfType<EventLogEntry>().Where(e => e.InstanceId == 1026).Where(e => e.Message.StartsWith("Application: Elwig.exe"))];
-                .Where(e => e.Message.StartsWith("Application: Elwig.exe"))
-                .ToList();
         }
 
         public static int GetEntityIdetifierForPk(params object?[] primaryKey) {

Elwig/Helpers/Validator.cs

@@ -628,5 +628,55 @@ namespace Elwig.Helpers {
 
             return new(true, null);
         }
+
+        public static ValidationResult CheckOrganicAuthorityCode(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            for (int i = 0, v = 0; i < input.Text.Length; i++) {
+                char ch = char.ToUpper(input.Text[i]);
+                if (v < 2 && char.IsAsciiLetter(ch)) {
+                    v++;
+                    text += ch;
+                } else if ((v == 2 || v == 6) && ch == '-') {
+                    v++;
+                    text += ch;
+                } else if (v >= 2 && char.IsLetterOrDigit(ch)) {
+                    if (text.StartsWith("AT")) {
+                        if (v == 3 && ch == 'B' || v == 4 && ch == 'I' || v == 5 && ch == 'O') {
+                            v++;
+                            text += ch;
+                        } else if (v > 6 && char.IsAsciiDigit(ch)) {
+                            v++;
+                            text += ch;
+                        }
+                    } else {
+                        v++;
+                        text += ch;
+                    }
+                }
+
+                if (i == input.CaretIndex - 1) {
+                    pos = text.Length;
+                } else if (text.StartsWith("AT") && v >= 10) {
+                    break;
+                }
+            }
+
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0)
+                return required ? new(false, "Bio-Kontrollstellen-Code ist nicht optional") : new(true, null);
+
+            if (text.StartsWith("AT")) {
+                if (text.Length != 10) {
+                    return new(false, "Bio-Kontrollstellen-Code ist ungültig");
+                }
+            } else {
+                return new(false, "Not implemented yet");
+            }
+
+            return new(true, null);
+        }
     }
 }

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -27,14 +27,14 @@ namespace Elwig.Models.Dtos {
             MgNr = mgnr;
         }
 
-        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
-            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
+            var variant = await paymentVariants.FindAsync(year, avnr);
             BillingData? varData = null;
             try { varData = variant != 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 },
-                    (k, g) => new CreditNoteDeliveryRow(g, seasons, varData?.NetWeightModifier ?? 0.0, varData?.GrossWeightModifier ?? 0.0))
+                    (k, g) => new CreditNoteDeliveryRow(g, variant, varData))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
                     (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
@@ -86,13 +86,13 @@ namespace Elwig.Models.Dtos {
         public decimal? Amount;
         public double WeighingModifier;
 
-        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons, double netWeightModifier, double grossWeightModifier) {
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, PaymentVar paymentVariant, BillingData? varData) {
             var f = rows.First();
             Year = f.Year;
             TgNr = f.TgNr;
             AvNr = f.AvNr;
             MgNr = f.MgNr;
-            var season = seasons.Find(Year);
+            var season = paymentVariant.Season;
 
             LsNr = f.LsNr;
             DPNr = f.DPNr;
@@ -115,7 +115,7 @@ namespace Elwig.Models.Dtos {
                               b.Price != null ? season?.DecFromDb((long)b.Price) : null,
                               b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
                 .ToArray();
-            WeighingModifier = f.NetWeight ? netWeightModifier : grossWeightModifier;
+            WeighingModifier = (varData == null || !varData.ConsiderDelieryModifiers) ? 0 : f.NetWeight ? varData.NetWeightModifier : varData.GrossWeightModifier;
             Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
             var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
             var amt = netAmount * (decimal)(1.0 + WeighingModifier);

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -17,9 +17,9 @@ namespace Elwig.Models.Dtos {
             ("Name2", "Vorname", null, 40),
             ("DefaultKg", "Ort", null, 40),
             ("SortId", "Sorte", null, 10),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
-            ("CreatedTimestamp", "Angemeldet", null, 35),
+            ("CreatedAt", "Angemeldet", null, 35),
-            ("ModifiedTimestamp", "Geändert", null, 35),
+            ("ModifiedAt", "Geändert", null, 35),
             ("Status", "Status", null, 20),
         ];
 
@@ -47,8 +47,8 @@ namespace Elwig.Models.Dtos {
         public string? DefaultKg;
         public string SortId;
         public string Variety;
-        public DateTime CreatedTimestamp;
+        public DateTime CreatedAt;
-        public DateTime? ModifiedTimestamp;
+        public DateTime? ModifiedAt;
         public int Weight;
         public string? Status;
 
@@ -65,10 +65,10 @@ namespace Elwig.Models.Dtos {
             DefaultKg = m.DefaultKg?.Name;
             SortId = a.SortId;
             Variety = a.Variety.Name;
-            CreatedTimestamp = a.CreatedTimestamp;
+            CreatedAt = a.CreatedAt;
-            ModifiedTimestamp = a.ModifiedTimestamp == a.CreatedTimestamp ? null : a.ModifiedTimestamp;
+            ModifiedAt = a.ModifiedAt == a.CreatedAt ? null : a.ModifiedAt;
             Weight = a.Weight;
-            Status = s.AncmtTo == null ? null : a.CreatedTimestamp >= s.AncmtTo ? "verspät." : "ok";
+            Status = s.AncmtTo == null ? null : a.CreatedAt >= s.AncmtTo ? "verspät." : "ok";
         }
     }
 }

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -16,7 +16,7 @@ namespace Elwig.Models.Dtos {
             ("QualityLevel", "Qualitätsstufe", null, 25),
             ("Gradation", "Gradation", "°Oe|°KMW", 32),
             ("Buckets", "Flächenbindung", "|kg", 36),
-            ("Weight", "Gewicht", "kg", 16),
+            ("Weight", "Menge", "kg", 16),
         ];
 
         private readonly int MgNr;

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -24,7 +24,7 @@ namespace Elwig.Models.Dtos {
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qualität", null, 15),
             ("Gradation", "Gradation", "°Oe|°KMW", 40),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
             ("IsNetWeight", "Gerebelt", null, 20),
             ("HkId", "Herkunft", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 40),

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -18,8 +18,9 @@ namespace Elwig.Models.Dtos {
             ("Cultivation", "Bewirt.", null, 20),
             ("QualityLevel", "Qualitätsstufe", null, 30),
             ("Oe", "Gradation", "°Oe", 20),
-            ("Ungeb", "ungebunden", "kg|€/kg", 40),
+            ("Ungeb", "ungebunden", "kg|€/kg|€/kg", 60),
-            ("Geb", "gebunden", "kg|€/kg", 40),
+            ("LowGeb", "attributlos gebunden", "kg|€/kg|€/kg", 60),
+            ("Geb", "gebunden", "kg|€/kg|€/kg", 60),
             ("Amount", "Gesamt", "€", 25),
         ];
 
@@ -30,8 +31,9 @@ namespace Elwig.Models.Dtos {
             string? Cultivation,
             string QualityLevel,
             double Oe,
-            (int Weight, decimal? Price) Ungeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ungeb,
-            (int Weight, decimal? Price) Geb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowGeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Geb,
             decimal Amount
         );
 
@@ -42,8 +44,9 @@ namespace Elwig.Models.Dtos {
         public static async Task<PaymentVariantSummaryData> ForPaymentVariant(PaymentVar v, DbSet<PaymentVariantSummaryRow> table) {
             return new(v, (await FromDbSet(table, v.Year, v.AvNr))
                 .Select(r => new PaymentRow(r.Type, r.Variety, r.Attribute, r.Cultivation, r.QualityLevel, r.Oe,
-                    (r.WeightUngeb, r.PriceUngeb != null ? Utils.DecFromDb(r.PriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightUngeb, r.MinPriceUngeb != null ? Utils.DecFromDb(r.MinPriceUngeb.Value, v.Season.Precision) : null, r.MaxPriceUngeb != null ? Utils.DecFromDb(r.MaxPriceUngeb.Value, v.Season.Precision) : null),
-                    (r.WeightGeb, r.PriceGeb != null ? Utils.DecFromDb(r.PriceGeb.Value, v.Season.Precision) : null),
+                    (r.WeightLowGeb, r.MinPriceLowGeb != null ? Utils.DecFromDb(r.MinPriceLowGeb.Value, v.Season.Precision) : null, r.MaxPriceLowGeb != null ? Utils.DecFromDb(r.MaxPriceLowGeb.Value, v.Season.Precision) : null),
+                    (r.WeightGeb, r.MinPriceGeb != null ? Utils.DecFromDb(r.MinPriceGeb.Value, v.Season.Precision) : null, r.MaxPriceGeb != null ? Utils.DecFromDb(r.MaxPriceGeb.Value, v.Season.Precision) : null),
                     Utils.DecFromDb(r.Amount, v.Season.Precision)))
                 .ToArray());
         }
@@ -57,19 +60,23 @@ namespace Elwig.Models.Dtos {
                        q.name AS quality_level,
                        ROUND(kmw * (4.54 + 0.022 * kmw)) AS oe,
                        SUM(IIF(w.discr = '_', w.value, 0)) AS weight_ungeb,
-                       MAX(IIF(w.discr = '_', b.price, NULL)) AS price_ungeb,
+                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_ungeb,
-                       SUM(IIF(w.discr != '_', w.value, 0)) AS weight_geb,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_ungeb,
-                       MAX(IIF(w.discr != '_', b.price, NULL)) AS price_geb,
+                       SUM(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), w.value, 0)) AS weight_lowgeb,
+                       MIN(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS min_price_lowgeb,
+                       MAX(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS max_price_lowgeb,
+                       SUM(IIF(w.discr = COALESCE(p.attrid, ''), w.value, 0)) AS weight_geb,
+                       MIN(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS min_price_geb,
+                       MAX(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS max_price_geb,
                        SUM(b.amount) AS amount
                 FROM payment_delivery_part_bucket b
                     LEFT JOIN delivery_part_bucket w ON (w.year, w.did, w.dpnr, w.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
                     LEFT JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (b.year, b.did, b.dpnr)
-                    LEFT JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
                     LEFT JOIN wine_variety v ON v.sortid = p.sortid
                     LEFT JOIN wine_attribute a ON a.attrid = p.attrid
                     LEFT JOIN wine_cultivation c ON c.cultid = p.cultid
                     LEFT JOIN wine_quality_level q ON q.qualid = p.qualid
-                WHERE d.year = {year} AND b.avnr = {avnr}
+                WHERE p.year = {year} AND b.avnr = {avnr}
                 GROUP BY variety, attribute, cultivation, q.min_kmw, oe
                 ORDER BY variety, attribute, cultivation, q.min_kmw, oe
                 """).ToListAsync();
@@ -92,12 +99,22 @@ namespace Elwig.Models.Dtos {
         public double Oe { get; set; }
         [Column("weight_ungeb")]
         public int WeightUngeb { get; set; }
-        [Column("price_ungeb")]
+        [Column("min_price_ungeb")]
-        public long? PriceUngeb { get; set; }
+        public long? MinPriceUngeb { get; set; }
+        [Column("max_price_ungeb")]
+        public long? MaxPriceUngeb { get; set; }
+        [Column("weight_lowgeb")]
+        public int WeightLowGeb { get; set; }
+        [Column("min_price_lowgeb")]
+        public long? MinPriceLowGeb { get; set; }
+        [Column("max_price_lowgeb")]
+        public long? MaxPriceLowGeb { get; set; }
         [Column("weight_geb")]
         public int WeightGeb { get; set; }
-        [Column("price_geb")]
+        [Column("min_price_geb")]
-        public long? PriceGeb { get; set; }
+        public long? MinPriceGeb { get; set; }
+        [Column("max_price_geb")]
+        public long? MaxPriceGeb { get; set; }
         [Column("amount")]
         public long Amount { get; set; }
     }

Elwig/Models/Dtos/WeightBreakdownData.cs

@@ -14,7 +14,7 @@ namespace Elwig.Models.Dtos {
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qual.", null, 15),
             ("Geb", "gebunden", null, 20),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
         ];
 
         public WeightBreakdownData(IEnumerable<WeightBreakdownRow> rows, int year, string name) :

Elwig/Models/Dtos/WineLocalityStatisticsData.cs

@@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos {
             ("Members", "Mitgl.", "#", 15),
             ("Deliveries", "Lfrg.", "#", 15),
             ("Parts", "Teill.", "#", 15),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
             ("Gradation", "Gradation", "°Oe|°KMW", 30),
         ];
 

Elwig/Models/Entities/AreaCom.cs

@@ -41,14 +41,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("MgNr")]
         public virtual Member Member { get; private set; } = null!;

Elwig/Models/Entities/Credit.cs

@@ -84,14 +84,36 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("Year, AvNr, MgNr")]
         public virtual PaymentMember Payment { get; private set; } = null!;

Elwig/Models/Entities/Delivery.cs

@@ -1,9 +1,11 @@
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Windows.Media;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models.Entities {
@@ -61,15 +63,42 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public string[] Comments => [.. Parts.Select(p => p.Comment).Prepend(Comment).Where(c => c != null).Cast<string>()];
+        [NotMapped]
+        public string CommentsString => string.Join(" / ", Comments);
+
+        [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; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("Year")]
         public virtual Season Season { get; private set; } = null!;
@@ -85,16 +114,19 @@ namespace Elwig.Models.Entities {
         public int Weight => Parts.Select(p => p.Weight).Sum();
         public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
 
-        public IEnumerable<string> SortIds => Parts
+        public IEnumerable<RawVaribute> Vaributes => Parts
-            .GroupBy(p => p.SortId)
+            .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => g.Key);
+            .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
-        public IEnumerable<string> FilteredSortIds => FilteredParts
+        public IEnumerable<RawVaribute> FilteredVaributes => FilteredParts
-            .GroupBy(p => p.SortId)
+            .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => g.Key);
+            .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
-        public string SortIdString => string.Join(", ", SortIds);
+        public string VaributeString => string.Join(", ", Vaributes);
-        public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
+        public string FilteredVaributeString => string.Join(", ", FilteredVaributes);
+
+        public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
+        public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
 
         public IEnumerable<string> Modifiers => Parts
             .SelectMany(p => p.Modifiers)

Elwig/Models/Entities/DeliveryAncmt.cs

@@ -27,14 +27,36 @@ namespace Elwig.Models.Entities {
         public required string Type { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("Year, DsNr")]
         public virtual DeliverySchedule Schedule { get; private set; } = null!;

Elwig/Models/Entities/DeliveryPart.cs

@@ -129,14 +129,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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();
+        }
 
         [InverseProperty(nameof(DeliveryPartModifier.Part))]
         public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;

Elwig/Models/Entities/DeliverySchedule.cs

@@ -42,7 +42,9 @@ namespace Elwig.Models.Entities {
         [Column("max_weight")]
         public int? MaxWeight { get; set; }
         [NotMapped]
-        public int AnnouncedWeight => Announcements.Sum(a => a.Weight);
+        public int AnnouncedWeight => AnnouncedWeightOverride ?? Announcements.Sum(a => a.Weight);
+        [NotMapped]
+        public int? AnnouncedWeightOverride { get; set; }
         [NotMapped]
         public double? Percent => (double)AnnouncedWeight / MaxWeight * 100;
 

Elwig/Models/Entities/Member.cs

@@ -145,14 +145,36 @@ namespace Elwig.Models.Entities {
         public AT_Kg? DefaultKg => DefaultWbKg?.AtKg;
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("ZwstId")]
         public virtual Branch? Branch { get; private set; }

Elwig/Models/Entities/PaymentVar.cs

@@ -46,14 +46,36 @@ namespace Elwig.Models.Entities {
         public required string Data { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        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("Year")]
         public virtual Season Season { get; private set; } = null!;

Elwig/Models/Entities/WbGl.cs

@@ -6,10 +6,10 @@ namespace Elwig.Models.Entities {
     [Table("wb_gl"), PrimaryKey("GlNr")]
     public class WbGl {
         [Column("glnr")]
-        public int GlNr { get; private set; }
+        public int GlNr { get; set; }
 
         [Column("name")]
-        public string Name { get; private set; } = null!;
+        public string Name { get; set; } = null!;
 
         [InverseProperty(nameof(WbKg.Gl))]
         public virtual ICollection<WbKg> Kgs { get; private set; } = null!;

Elwig/Models/Entities/WbKg.cs

@@ -15,7 +15,7 @@ namespace Elwig.Models.Entities {
         public virtual AT_Kg AtKg { get; private set; } = null!;
 
         [ForeignKey("GlNr")]
-        public virtual WbGl Gl { get; private set; } = null!;
+        public virtual WbGl? Gl { get; private set; } = null!;
 
         [InverseProperty(nameof(WbRd.Kg))]
         public virtual ICollection<WbRd> Rds { get; private set; } = null!;

Elwig/Models/Entities/WineVar.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Windows.Media;
 
 namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
@@ -10,22 +11,32 @@ namespace Elwig.Models.Entities {
         [Column("type")]
         public string Type { get; private set; } = null!;
 
+        [Column("max_qualid")]
+        public string MaxQualId { get; private set; } = null!;
+
+        [ForeignKey("MaxQualId")]
+        public virtual WineQualLevel MaxQualityLevel { get; private set; } = null!;
+
         [Column("name")]
         public string Name { get; private set; } = null!;
 
         [Column("comment")]
         public string? Comment { get; private set; }
 
+        public string SortIdFormat => IsQuw ? SortId : $"({SortId})";
         public string CommentFormat => (Comment != null) ? $" ({Comment})" : "";
 
         public bool IsRed => Type == "R";
         public bool IsWhite => Type == "W";
+        public bool IsQuw => MaxQualId == "QUW";
+        public Brush? Color => IsWhite ? Brushes.DarkGreen : IsRed ? Brushes.DarkRed : null;
 
         public WineVar() { }
 
         public WineVar(string sortId, string name) {
             SortId = sortId;
             Name = name;
+            MaxQualId = "QUW";
         }
 
         public override string ToString() {

Elwig/Resources/Sql/31-32.sql

@@ -0,0 +1,33 @@
+-- schema version 31 to 32
+
+INSERT INTO client_parameter (param, value) VALUES ('ENABLE_TIME_TRIGGERS', '1');
+
+ALTER TABLE member ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE member ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE area_commitment ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE area_commitment ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_announcement ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_announcement ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_part ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_part ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE payment_variant ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE payment_variant ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE credit ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE credit ADD COLUMN itime INTEGER DEFAULT NULL;
+
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(REPLACE(sql,
+'    WHEN',
+'    WHEN (SELECT value FROM client_parameter WHERE param = ''ENABLE_TIME_TRIGGERS'') = 1 AND'),
+'FOR EACH ROW' || char(10) ||
+'BEGIN',
+'FOR EACH ROW' || char(10) ||
+'    WHEN (SELECT value FROM client_parameter WHERE param = ''ENABLE_TIME_TRIGGERS'') = 1' || char(10) ||
+'BEGIN')
+WHERE type = 'trigger' AND name LIKE '%time%';
+
+PRAGMA writable_schema = OFF;
+PRAGMA schema_version = 3101;

Elwig/Resources/Sql/32-33.sql

@@ -0,0 +1,17 @@
+-- schema version 32 to 33
+
+ALTER TABLE wine_variety ADD COLUMN max_qualid TEXT NOT NULL DEFAULT 'QUW';
+UPDATE wine_quality_level SET qualid = 'ALW' WHERE qualid = 'AUL';
+UPDATE wine_variety SET comment = 'Muscato' WHERE sortid = 'MO';
+
+INSERT INTO wine_variety (sortid, type, max_qualid, name, comment) VALUES
+('DR', 'W', 'QUW', 'Donauriesling', NULL),
+('DV', 'W', 'QUW', 'Donauveltliner', NULL),
+('BN', 'W', 'RSW', 'Bronner', NULL),
+('CB', 'W', 'RSW', 'Cabernet Blanc', NULL),
+('CJ', 'R', 'RSW', 'Cabernet Jura', NULL),
+('JO', 'W', 'RSW', 'Johanniter', NULL),
+('OR', 'W', 'RSW', 'Orangetraube', NULL),
+('PI', 'R', 'RSW', 'Pinot Nova', NULL),
+('RE', 'R', 'RSW', 'Regent', NULL),
+('SI', 'W', 'RSW', 'Solaris', NULL);

Elwig/Services/AreaComService.cs

@@ -106,13 +106,13 @@ namespace Elwig.Services {
         }
 
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            int newFbNr = (int)vm.FbNr!;
+            int newFbNr = vm.FbNr!.Value;
 
-            await Task.Run(async () => {
+            return await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
-                    MgNr = (int)vm.MgNr!,
+                    MgNr = vm.MgNr!.Value,
                     YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
                     VtrgId = vm.AreaComType!.VtrgId,
@@ -120,8 +120,8 @@ namespace Elwig.Services {
                     Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                     KgNr = vm.Kg!.KgNr,
                     RdNr = vm.Rd?.RdNr,
-                    GstNr = vm.GstNr!.Trim(),
+                    GstNr = vm.GstNr?.Trim() ?? "-",
-                    Area = (int)vm.Area!,
+                    Area = vm.Area!.Value,
                 };
 
                 if (vm.Rd?.RdNr == 0) {
@@ -141,11 +141,9 @@ namespace Elwig.Services {
                 if (newFbNr != a.FbNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
+
+                return newFbNr;
             });
-
-            App.HintContextChange();
-
-            return newFbNr;
         }
 
         private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
@@ -262,8 +260,6 @@ namespace Elwig.Services {
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
             });
-
-            App.HintContextChange();
         }
     }
 }

Elwig/Services/DeliveryAncmtService.cs

@@ -37,8 +37,8 @@ namespace Elwig.Services {
             vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
             vm.SortId = a.SortId;
             vm.Weight = a.Weight;
-            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtCreated = $"{a.CreatedAt:dd.MM.yyyy, HH:mm} ({a.Type})";
-            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
+            vm.StatusAncmtModified = a.ModifiedAt != a.CreatedAt ? $"{a.ModifiedAt:dd.MM.yyyy, HH:mm}" : "-";
         }
 
         public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
@@ -211,7 +211,8 @@ namespace Elwig.Services {
             int newMgNr = vm.MgNr!.Value;
             string newSortId = vm.SortId!;
 
-            using (var ctx = new AppDbContext()) {
+            return await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var a = new DeliveryAncmt {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? dsnr,
@@ -232,11 +233,9 @@ namespace Elwig.Services {
                 if (oldDsNr != null && (oldYear != year || oldDsNr != dsnr || oldMgNr != newMgNr || oldSortId != newSortId)) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_announcement SET year = {year}, dsnr = {dsnr}, mgnr = {newMgNr}, sortid = {newSortId} WHERE (year, dsnr, mgnr, sortid) = ({a.Year}, {a.DsNr}, {a.MgNr}, {a.SortId})");
                 }
-            }
 
-            App.HintContextChange();
+                return (year, dsnr, newMgNr, newSortId);
-
+            });
-            return (year, dsnr, newMgNr, newSortId);
         }
 
         public static async Task GenerateDeliveryAncmtList(this DeliveryAncmtAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -269,25 +268,29 @@ namespace Elwig.Services {
                     Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
-                    try {
+                    await Task.Run(async () => {
-                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                        try {
-                        using var ods = new OdsFile(d.FileName);
+                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                        await ods.AddTable(data);
+                            using var ods = new OdsFile(d.FileName);
-                    } catch (Exception exc) {
+                            await ods.AddTable(data);
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        } catch (Exception exc) {
-                    }
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
-                try {
+                await Task.Run(async () => {
-                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                    try {
-                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
+                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                    await Utils.ExportDocument(doc, mode);
+                        using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
-                } catch (Exception exc) {
+                        await Utils.ExportDocument(doc, mode);
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    } catch (Exception exc) {
-                }
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -326,7 +329,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryAncmts.SumAsync(p => p.Weight);
             text = $"{weight:N0} kg";
-            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);
 
             if (await deliveryAncmts.AnyAsync()) {
                 var attrGroups = await deliveryAncmts

Elwig/Services/DeliveryScheduleService.cs

@@ -152,7 +152,8 @@ namespace Elwig.Services {
         public static async Task UpdateDeliverySchedule(this DeliveryScheduleAdminViewModel vm, int? oldYear, int? oldDsNr) {
             int year = vm.Date!.Value.Year;
 
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var s = new DeliverySchedule {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? await ctx.NextDsNr(year),
@@ -181,9 +182,7 @@ namespace Elwig.Services {
                     .ToList(), vm.MainVarieties.Select(v => (v, 1)).Union(vm.OtherVarieties.Select(v => (v, 2))).ToList());
 
                 await ctx.SaveChangesAsync();
-            }
+            });
-
-            App.HintContextChange();
         }
     }
 }

Elwig/Services/DeliveryService.cs

@@ -430,7 +430,7 @@ namespace Elwig.Services {
         }
 
         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
-            var p = await Task.Run(async () => {
+            return await Task.Run(async () => {
                 DeliveryPart p;
 
                 using var ctx = new AppDbContext();
@@ -528,14 +528,10 @@ namespace Elwig.Services {
 
                 return p;
             });
-
-            App.HintContextChange();
-
-            return p;
         }
 
         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
-            var n = await Task.Run(async () => {
+            return await Task.Run(async () => {
                 Delivery n;
 
                 using var ctx = new AppDbContext();
@@ -584,14 +580,10 @@ namespace Elwig.Services {
 
                 return n;
             });
-
-            App.HintContextChange();
-
-            return n;
         }
 
         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
-            var n = await Task.Run(async () => {
+            return await Task.Run(async () => {
                 Delivery n;
                 using var ctx = new AppDbContext();
                 var anyLeft = false;
@@ -625,10 +617,6 @@ namespace Elwig.Services {
 
                 return n;
             });
-
-            App.HintContextChange();
-
-            return n;
         }
 
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
@@ -658,8 +646,6 @@ namespace Elwig.Services {
                 }
                 await ctx.SaveChangesAsync();
             });
-
-            App.HintContextChange();
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
@@ -735,19 +721,30 @@ namespace Elwig.Services {
                     FileName = subject == ExportSubject.Selected ? $"Lieferung_{vm.SelectedDelivery?.LsNr}.elwig.zip" : $"Lieferungen_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
                     DefaultExt = "elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig",
+                    AddExtension = false,
                 };
                 if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
                         try {
-                            await ElwigData.Export(d.FileName, await query
+                            var list = await query
                                 .Select(p => p.Delivery)
                                 .Distinct()
-                                .Include(d => d.Parts)
+                                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                                .ThenInclude(p => p.PartModifiers)
+                                .Include(d => d.Parts).ThenInclude(p => p.Rd)
+                                .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
                                 .AsSplitQuery()
-                                .ToListAsync(), filterNames);
+                                .ToListAsync();
+                            var wbKgs = list
+                                .SelectMany(d => d.Parts)
+                                .Where(p => p.Kg != null)
+                                .Select(p => p.Kg!)
+                                .DistinctBy(k => k.KgNr)
+                                .OrderBy(k => k.KgNr)
+                                .ToList();
+                            await ElwigData.Export(d.FileName, list, wbKgs, filterNames);
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
@@ -763,15 +760,23 @@ namespace Elwig.Services {
                         var list = await query
                             .Select(p => p.Delivery)
                             .Distinct()
-                            .Include(d => d.Parts)
+                            .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                            .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)
+                            .Where(p => p.Kg != null)
+                            .Select(p => p.Kg!)
+                            .DistinctBy(k => k.KgNr)
+                            .OrderBy(k => k.KgNr)
+                            .ToList();
                         if (list.Count == 0) {
                             MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
                                 MessageBoxButton.OK, MessageBoxImage.Error);
                         } else {
-                            await ElwigData.Export(path, list, filterNames);
+                            await ElwigData.Export(path, list, wbKgs, filterNames);
                             await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                             MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
                                 MessageBoxButton.OK, MessageBoxImage.Information);
@@ -973,7 +978,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryParts.SumAsync(p => p.Weight);
             wText = $"{weight:N0} kg";
-            wGrid.Add(("Gewicht", null, weight, null, weight));
+            wGrid.Add(("Menge", null, weight, null, weight));
 
             if (await deliveryParts.AnyAsync()) {
                 var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
@@ -1074,7 +1079,7 @@ namespace Elwig.Services {
             wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             int rowNum = 0;
             foreach (var row in weightData) {
-                if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++;
+                if (rowNum != 0 && row.Item2 == null) rowNum++;
                 AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
@@ -1089,7 +1094,7 @@ namespace Elwig.Services {
             AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
             rowNum = 1;
             foreach (var row in gradationData) {
-                if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
+                if (rowNum != 1 && row.Item2 == null) rowNum++;
                 AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
@@ -1102,8 +1107,6 @@ namespace Elwig.Services {
                 await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
                 await ctx.SaveChangesAsync();
             });
-
-            App.HintContextChange();
         }
     }
 }

Elwig/Services/MemberService.cs

@@ -1,20 +1,20 @@
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System;
-using Microsoft.EntityFrameworkCore;
 using Elwig.Documents;
-using System.Windows.Input;
+using Elwig.Helpers;
-using System.Windows;
 using Elwig.Helpers.Billing;
-using Elwig.Models.Dtos;
 using Elwig.Helpers.Export;
-using Microsoft.Win32;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -49,6 +49,11 @@ namespace Elwig.Services {
             vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
             vm.StatusAreaCommitmentToolTip = null;
             vm.Age = "-";
+            vm.CreatedAt = "-";
+            vm.ModifiedAt = "-";
+            vm.ModifiedAtShort = "-";
+            vm.ExportedAt = "-";
+            vm.ImportedAt = "-";
         }
 
         public static void FillInputs(this MemberAdminViewModel vm, Member m) {
@@ -137,6 +142,12 @@ namespace Elwig.Services {
             vm.ContactViaPost = m.ContactViaPost;
             vm.ContactViaEmail = m.ContactViaEmail;
 
+            vm.CreatedAt = $"{m.CreatedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAt = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAtShort = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm}";
+            vm.ExportedAt = m.ExportedAt == null ? "-" : $"{m.ExportedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ImportedAt = m.ImportedAt == null ? "-" : $"{m.ImportedAt:dd.MM.yyyy, HH:mm:ss}";
+
             vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
             vm.StatusDeliveriesLastSeason = "...";
             vm.StatusDeliveriesLastSeasonToolTip = null;
@@ -357,8 +368,8 @@ namespace Elwig.Services {
                 if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
                 if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
                 if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
-                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).Any(c => filterAreaCom.Contains(c.VtrgId)));
-                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).All(c => filterNotAreaCom.Contains(c.VtrgId)));
+                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).All(c => filterNotAreaCom.Contains(c.VtrgId)));
                 if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
                 if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
             }
@@ -406,7 +417,7 @@ namespace Elwig.Services {
                 try {
                     using var ctx = new AppDbContext();
                     var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                    var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 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);
 
@@ -485,11 +496,13 @@ namespace Elwig.Services {
             } else if (mode == ExportMode.Export) {
                 var d = new SaveFileDialog() {
                     FileName = subject == ExportSubject.Selected ? $"Mitglied_{vm.SelectedMember?.MgNr}.elwig.zip" : $"Mitglieder_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
-                    DefaultExt = ".elwig.zip",
+                    DefaultExt = "elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{MemberList.Name} speichern unter - Elwig"
+                    Title = $"{MemberList.Name} speichern unter - Elwig",
+                    AddExtension = false,
                 };
                 if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
                         try {
@@ -498,13 +511,22 @@ namespace Elwig.Services {
                                 .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)
                                 .ToListAsync();
-                            await ElwigData.Export(d.FileName, members, areaComs, filterNames);
+                            var wbKgs = members
+                                .Where(m => m.DefaultWbKg != null)
+                                .Select(m => m.DefaultWbKg!)
+                                .Union(areaComs.Select(c => c.Kg))
+                                .Distinct()
+                                .OrderBy(k => k.KgNr)
+                                .ToList();
+                            await ElwigData.Export(d.FileName, members, areaComs, wbKgs, filterNames);
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
@@ -522,17 +544,27 @@ namespace Elwig.Services {
                             .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)
                             .ToListAsync();
+                        var wbKgs = members
+                            .Where(m => m.DefaultWbKg != null)
+                            .Select(m => m.DefaultWbKg!)
+                            .Union(areaComs.Select(c => c.Kg))
+                            .Distinct()
+                            .OrderBy(k => k.KgNr)
+                            .ToList();
                         if (members.Count == 0) {
                             MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
                                 MessageBoxButton.OK, MessageBoxImage.Error);
                         } else {
-                            await ElwigData.Export(path, members, areaComs, filterNames);
+                            await ElwigData.Export(path, members, areaComs, wbKgs, filterNames);
                             await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                             MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
                                 MessageBoxButton.OK, MessageBoxImage.Information);
@@ -600,7 +632,7 @@ namespace Elwig.Services {
                 ContactViaEmail = vm.ContactViaEmail,
             };
 
-            await Task.Run(async () => {
+            return await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 if (oldMgNr != null) {
                     ctx.Update(m);
@@ -658,7 +690,7 @@ namespace Elwig.Services {
                         KgNr = c.KgNr,
                         GstNr = c.GstNr,
                         RdNr = c.RdNr,
-                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
                         YearTo = c.YearTo,
                     }));
 
@@ -684,11 +716,9 @@ namespace Elwig.Services {
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                 }
+
+                return newMgNr;
             });
-
-            App.HintContextChange();
-
-            return newMgNr;
         }
 
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
@@ -707,8 +737,6 @@ namespace Elwig.Services {
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
             });
-
-            App.HintContextChange();
         }
     }
 }

Elwig/Services/PaymentVariantService.cs

@@ -0,0 +1,387 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Services {
+    public static class PaymentVariantService {
+
+        private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
+
+        public static void ClearInputs(this PaymentVariantsViewModel vm) {
+            vm.IsPaymentVariantSelected = false;
+            vm.EditText = "Bearbeiten";
+            vm.SaveIsEnabled = false;
+            vm.DeleteIsEnabled = false;
+            vm.CalculateIsEnabled = false;
+            vm.CommitIsEnabled = false;
+            vm.CommitVisibility = Visibility.Visible;
+            vm.RevertIsEnabled = false;
+            vm.RevertVisibility = Visibility.Hidden;
+            vm.Arrow = "\xF0AF";
+            vm.ExportIsEnabled = false;
+
+            vm.IsReadOnly = true;
+            vm.DataIsReadOnly = true;
+            vm.BillingData = null;
+            vm.Name = "";
+            vm.Comment = "";
+            vm.Date = null;
+            vm.TransferDate = null;
+            vm.WeightModifier = null;
+            vm.ConsiderModifiers = false;
+            vm.ConsiderPenalties = false;
+            vm.ConsiderPenalty = false;
+            vm.ConsiderAuto = false;
+            vm.ConsiderCustom = false;
+            vm.IsEnabled = false;
+            vm.Data = "";
+
+            vm.StatusModifierSum = "-";
+            vm.StatusTotalSum = "-";
+            vm.StatusVatSum = "-";
+            vm.StatusDeductionSum = "-";
+            vm.StatusPaymentSum = "-";
+        }
+
+        public static void FillInputs(this PaymentVariantsViewModel vm, PaymentVar v) {
+            var locked = !v.TestVariant;
+            vm.IsPaymentVariantSelected = true;
+            vm.SaveIsEnabled = !locked;
+            vm.DeleteIsEnabled = !locked;
+            vm.CalculateIsEnabled = !locked;
+            vm.CommitIsEnabled = !locked && !vm.SeasonLocked;
+            vm.CommitVisibility = !locked ? Visibility.Visible : Visibility.Hidden;
+            vm.RevertIsEnabled = locked && !vm.SeasonLocked;
+            vm.RevertVisibility = locked ? Visibility.Visible : Visibility.Hidden;
+            vm.Arrow = locked ? "\xF0B0" : "\xF0AF";
+            vm.EditText = locked ? "Ansehen" : "Bearbeiten";
+            vm.ExportIsEnabled = locked;
+
+            vm.IsReadOnly = false;
+            vm.DataIsReadOnly = locked;
+            vm.Name = v.Name;
+            vm.Comment = v.Comment ?? "";
+            vm.Date = v.Date;
+            vm.TransferDate = v.TransferDate;
+            try {
+                vm.BillingData = BillingData.FromJson(v.Data);
+                vm.ConsiderModifiers = vm.BillingData.ConsiderDelieryModifiers;
+                vm.ConsiderPenalties = vm.BillingData.ConsiderContractPenalties;
+                vm.ConsiderPenalty = vm.BillingData.ConsiderTotalPenalty;
+                vm.ConsiderAuto = vm.BillingData.ConsiderAutoBusinessShares;
+                vm.ConsiderCustom = vm.BillingData.ConsiderCustomModifiers;
+                if (vm.BillingData.NetWeightModifier != 0) {
+                    vm.WeightModifier = Math.Round(vm.BillingData.NetWeightModifier * 100.0, 8);
+                } else if (vm.BillingData.GrossWeightModifier != 0) {
+                    vm.WeightModifier = Math.Round(vm.BillingData.GrossWeightModifier * 100.0, 8);
+                } else {
+                    vm.WeightModifier = null;
+                }
+                vm.Data = JsonSerializer.Serialize(vm.BillingData.Data, JsonOpt);
+            } catch {
+                vm.BillingData = null;
+                vm.ConsiderModifiers = false;
+                vm.ConsiderPenalties = false;
+                vm.ConsiderPenalty = false;
+                vm.ConsiderAuto = false;
+                vm.ConsiderCustom = false;
+                vm.WeightModifier = null;
+                vm.Data = v.Data;
+            }
+            vm.IsEnabled = !locked;
+
+            vm.StatusModifierSum = "...";
+            vm.StatusTotalSum = "...";
+            vm.StatusVatSum = "...";
+            vm.StatusDeductionSum = "...";
+            vm.StatusPaymentSum = "...";
+            Utils.RunBackground("Variantendaten laden", async () => {
+                await vm.UpdateSums(v);
+            });
+        }
+
+        private static async Task UpdateSums(this PaymentVariantsViewModel vm, PaymentVar v) {
+            if (App.MainDispatcher == null)
+                return;
+            var modText = "-";
+            var totalText = "-";
+            var vatText = "-";
+            var deductionText = "-";
+            var paymentText = "-";
+
+            using var ctx = new AppDbContext();
+            var sym = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
+
+            var modSum = await ctx.PaymentDeliveryParts
+                .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                .SumAsync(p => p.AmountValue - p.NetAmountValue);
+            modText = $"{v.Season.DecFromDb(modSum):N2} {sym}";
+
+            var totalSum = await ctx.MemberPayments
+                .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                .SumAsync(p => p.AmountValue);
+            totalText = $"{v.Season.DecFromDb(totalSum):N2} {sym}";
+
+            await App.MainDispatcher.BeginInvoke(() => {
+                if (vm.SelectedPaymentVariant != v)
+                    return;
+                vm.StatusModifierSum = modText;
+                vm.StatusTotalSum = totalText;
+            });
+
+            var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
+            if (!credits.Any()) {
+                long lastTotalSum = 0;
+                decimal vatSum = 0;
+                var currentPayments = await ctx.MemberPayments
+                        .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                        .ToDictionaryAsync(p => p.MgNr);
+                var lastV = await ctx.PaymentVariants
+                    .Where(l => l.Year == v.Year && !l.TestVariant)
+                    .OrderByDescending(l => l.TransferDateString ?? l.DateString)
+                    .ThenByDescending(l => l.AvNr)
+                    .FirstOrDefaultAsync();
+                if (lastV != null) {
+                    var lastPayments = await ctx.MemberPayments
+                        .Where(p => p.Year == v.Year && p.AvNr == lastV.AvNr)
+                        .ToDictionaryAsync(p => p.MgNr);
+                    lastTotalSum = lastPayments.Sum(e => e.Value.AmountValue);
+                    foreach (int mgnr in currentPayments.Keys) {
+                        var c = currentPayments[mgnr];
+                        var l = lastPayments[mgnr];
+                        vatSum += (c.Amount - l.Amount) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
+                    }
+                } else {
+                    vatSum = currentPayments.Sum(e => e.Value.Amount * (decimal)(e.Value.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate));
+                }
+                vatText = $"~{vatSum:N2} {sym}";
+                deductionText = $"- {sym}";
+                paymentText = $"~{v.Season.DecFromDb(totalSum - lastTotalSum) + vatSum:N2} {sym}";
+            } else {
+                // all values in the credit table are stored with precision 2!
+                totalText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.NetAmountValue), 2):N2} {sym}";
+                vatText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.VatAmountValue), 2):N2} {sym}";
+                deductionText = $"{-Utils.DecFromDb(await credits.SumAsync(c => c.ModifiersValue ?? 0), 2):N2} {sym}";
+                paymentText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.AmountValue), 2):N2} {sym}";
+            }
+
+            await App.MainDispatcher.BeginInvoke(() => {
+                if (vm.SelectedPaymentVariant != v)
+                    return;
+                vm.StatusModifierSum = modText;
+                vm.StatusTotalSum = totalText;
+                vm.StatusVatSum = vatText;
+                vm.StatusDeductionSum = deductionText;
+                vm.StatusPaymentSum = paymentText;
+            });
+        }
+
+        public static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
+            if (mode == ExportMode.SaveList) {
+                var d = new SaveFileDialog() {
+                    FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
+                    DefaultExt = "ods",
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                    Title = $"Variantendaten {v.Name} speichern unter - Elwig"
+                };
+                if (d.ShowDialog() == false)
+                    return;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
+                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            } else {
+                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);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task GenerateEbics(int year, int avnr) {
+            using var ctx = new AppDbContext();
+            var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+
+            var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
+            if (withoutIban > 0) {
+                var r = MessageBox.Show($"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert.",
+                    "Mitglieder ohne IBAN", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (r != MessageBoxResult.OK) return;
+            }
+            var withNegAmount = v.Credits.Count(c => c.Amount <= 0);
+            if (withNegAmount > 0) {
+                var r = MessageBox.Show($"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert.",
+                    "Traubengutschriften mit negativem Betrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.OK);
+                if (r != MessageBoxResult.OK) return;
+            }
+
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
+                DefaultExt = Ebics.FileExtension,
+                Filter = "EBICS-Datei (*.xml)|*.xml",
+                Title = $"Überweisungsdaten speichern unter - Elwig",
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
+                        await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task GenerateAccountingList(int year, int avnr, string name) {
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Buchungsliste-{year}-{name.Trim().Replace(' ', '-')}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Buchungsliste speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
+                        var tbl = await CreditNoteData.ForPaymentVariant(ctx, year, avnr);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(tbl);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task<PaymentVar> CreatePaymentVariant(int year) {
+            return await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var v = new PaymentVar {
+                    Year = year,
+                    AvNr = await ctx.NextAvNr(year),
+                    Name = "Neue Auszahlungsvariante",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                };
+                ctx.Add(v);
+                await ctx.SaveChangesAsync();
+                return v;
+            });
+        }
+
+        public static async Task<PaymentVar> Duplicate(this PaymentVar orig) {
+            return await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var n = new PaymentVar {
+                    Year = orig.Year,
+                    AvNr = await ctx.NextAvNr(orig.Year),
+                    Name = $"{orig.Name} (Kopie)",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = orig.Data,
+                };
+                ctx.Add(n);
+                await ctx.SaveChangesAsync();
+                return n;
+            });
+        }
+
+        public static async Task<(int, int)> UpdatePaymentVariant(this PaymentVariantsViewModel vm, int? oldYear, int? oldAvNr) {
+            var year = oldYear ?? Utils.CurrentYear;
+            int avnr = 0;
+            await Task.Run(async () => {
+                var d = App.Config.Debug ? BillingData.FromJson(vm.Data ?? "{}") : vm.BillingData!;
+                d.ConsiderDelieryModifiers = vm.ConsiderModifiers;
+                d.ConsiderContractPenalties = vm.ConsiderPenalties;
+                d.ConsiderTotalPenalty = vm.ConsiderPenalty;
+                d.ConsiderAutoBusinessShares = vm.ConsiderAuto;
+                d.ConsiderCustomModifiers = vm.ConsiderCustom;
+                var modVal = vm.WeightModifier ?? 0;
+                d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
+                d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
+
+                using var ctx = new AppDbContext();
+                var v = new PaymentVar {
+                    Year = year,
+                    AvNr = oldAvNr ?? await ctx.NextAvNr(year),
+                    Name = vm.Name!,
+                    DateString = $"{vm.Date!.Value:yyyy-MM-dd}",
+                    TransferDate = vm.TransferDate,
+                    TestVariant = vm.SelectedPaymentVariant?.TestVariant ?? true,
+                    CalcTimeUnix = vm.SelectedPaymentVariant?.CalcTimeUnix,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    Data = JsonSerializer.Serialize(d.Data),
+                };
+                avnr = v.AvNr;
+                ctx.Update(v);
+                await ctx.SaveChangesAsync();
+            });
+            vm.WeightModifierChanged = false;
+            return (year, avnr);
+        }
+
+        public static async Task DeletePaymentVariant(int year, int avnr) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+                ctx.Remove(v);
+                await ctx.SaveChangesAsync();
+            });
+        }
+
+        public static async Task Calculate(int year, int avnr) {
+            await Task.Run(async () => {
+                var b = new BillingVariant(year, avnr);
+                await b.Calculate();
+            });
+        }
+
+        public static async Task Commit(int year, int avnr) {
+            await Task.Run(async () => {
+                var b = new BillingVariant(year, avnr);
+                await b.Commit();
+            });
+        }
+
+        public static async Task Revert(int year, int avnr) {
+            await Task.Run(async () => {
+                var b = new BillingVariant(year, avnr);
+                await b.Revert();
+            });
+        }
+    }
+}

Elwig/ViewModels/AreaComAdminViewModel.cs

@@ -15,7 +15,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _searchQuery = "";
         public List<string> TextFilter {
-            get => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+            get => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
             set => SearchQuery = string.Join(' ', value.Where(e => e.Length > 0));
         }
 

Elwig/ViewModels/DeliveryAdminViewModel.cs

@@ -18,7 +18,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private string? _lastScaleError;

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

@@ -10,7 +10,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _filterOnlyUpcoming;

Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs

@@ -11,7 +11,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _filterOnlyUpcoming;

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -11,14 +11,14 @@ namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
-        public bool MaintainAreaComYearTo = false;
+        public bool MaintainAreaComYearFrom = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _showOnlyActiveMembers;
@@ -153,6 +153,17 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _contactViaEmail;
 
+        [ObservableProperty]
+        private string _createdAt = "-";
+        [ObservableProperty]
+        private string _modifiedAt = "-";
+        [ObservableProperty]
+        private string _modifiedAtShort = "-";
+        [ObservableProperty]
+        private string _exportedAt = "-";
+        [ObservableProperty]
+        private string _importedAt = "-";
+
         public ObservableCollection<string?> EmailAddresses { get; private set; } = [null, null, null, null, null, null, null, null, null];
 
         public partial class PhoneNr(int? type = null, string? number = null, string? comment = null) : ObservableObject {

Elwig/ViewModels/PaymentVariantsViewModel.cs

@@ -0,0 +1,95 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Elwig.ViewModels {
+    public partial class PaymentVariantsViewModel : ObservableObject {
+
+        [ObservableProperty]
+        private PaymentVar? _selectedPaymentVariant;
+        [ObservableProperty]
+        private IEnumerable<PaymentVar> _paymentVariants = [];
+
+        public BillingData? BillingData;
+        public bool SeasonLocked;
+        public bool WeightModifierChanged;
+
+        [ObservableProperty]
+        private string _name = "";
+        [ObservableProperty]
+        private string _comment = "";
+        [ObservableProperty]
+        private string _dateString = "";
+        public DateOnly? Date {
+            get => DateOnly.TryParseExact(DateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => DateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _transferDateString = "";
+        public DateOnly? TransferDate {
+            get => DateOnly.TryParseExact(TransferDateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => TransferDateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _weightModifierString = "";
+        public double? WeightModifier {
+            get => double.TryParse(WeightModifierString, out var d) ? d : null;
+            set => WeightModifierString = $"{value}";
+        }
+        [ObservableProperty]
+        private string _data = "";
+        [ObservableProperty]
+        private bool _considerModifiers;
+        [ObservableProperty]
+        private bool _considerPenalties;
+        [ObservableProperty]
+        private bool _considerPenalty;
+        [ObservableProperty]
+        private bool _considerAuto;
+        [ObservableProperty]
+        private bool _considerCustom;
+
+        [ObservableProperty]
+        private bool _isPaymentVariantSelected;
+        [ObservableProperty]
+        private bool _isReadOnly = true;
+        [ObservableProperty]
+        private bool _dataIsReadOnly = true;
+        [ObservableProperty]
+        private bool _isEnabled = false;
+        [ObservableProperty]
+        private bool _saveIsEnabled = false;
+        [ObservableProperty]
+        private bool _deleteIsEnabled = false;
+        [ObservableProperty]
+        private bool _calculateIsEnabled = false;
+        [ObservableProperty]
+        private bool _exportIsEnabled = false;
+        [ObservableProperty]
+        private bool _commitIsEnabled = false;
+        [ObservableProperty]
+        private Visibility _commitVisibility = Visibility.Visible;
+        [ObservableProperty]
+        private bool _revertIsEnabled = false;
+        [ObservableProperty]
+        private Visibility _revertVisibility = Visibility.Hidden;
+        [ObservableProperty]
+        private string _arrow = "\xF0AF";
+        [ObservableProperty]
+        private string _editText = "Bearbeiten";
+
+        [ObservableProperty]
+        private string _statusModifierSum = "-";
+        [ObservableProperty]
+        private string _statusTotalSum = "-";
+        [ObservableProperty]
+        private string _statusVatSum = "-";
+        [ObservableProperty]
+        private string _statusDeductionSum = "-";
+        [ObservableProperty]
+        private string _statusPaymentSum = "-";
+    }
+}

Elwig/Windows/AboutWindow.xaml

@@ -0,0 +1,32 @@
+<Window x:Class="Elwig.Windows.AboutWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        Title="Über - Elwig" Height="340" Width="460" ResizeMode="NoResize">
+    <Grid>
+        <TextBlock Margin="20,10" FontSize="12">
+            <Bold>Produkt:</Bold> Elwig<LineBreak/>
+            <Bold>Beschreibung:</Bold> Elektronische Winzergenossenschaftsverwaltung<LineBreak/>
+            <Bold>Typ:</Bold> Warenwirtschaftssystem (ERP-System)<LineBreak/>
+            <Bold>Version:</Bold> <Run x:Name="Version">0.0.0.0</Run> (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungsprotokoll</Hyperlink>)<LineBreak/>
+            <Bold>Lizenz:</Bold> <Hyperlink NavigateUri="https://www.gnu.org/licenses/gpl-3.0.html" RequestNavigate="Hyperlink_RequestNavigate">GNU General Public License 3.0 (GPLv3)</Hyperlink><LineBreak/>
+            <Bold>Website:</Bold> <Hyperlink NavigateUri="https://elwig.at/" RequestNavigate="Hyperlink_RequestNavigate">https://elwig.at/</Hyperlink><LineBreak/>
+            <Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
+            <Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
+            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
+            <Bold>Entwicklungszeitraum:</Bold> 2022–2025<LineBreak/>
+            <LineBreak/>
+            <Bold>Verwendete Technologien:</Bold><LineBreak/>
+            Programmiersprache: C#<LineBreak/>
+            Framework: Windows Presentation Framework (WPF)<LineBreak/>
+            Datenbank: <Hyperlink NavigateUri="https://sqlite.org/" RequestNavigate="Hyperlink_RequestNavigate">SQLite</Hyperlink><LineBreak/>
+            PDF-Erstellung: <Hyperlink NavigateUri="https://weasyprint.org/" RequestNavigate="Hyperlink_RequestNavigate">WeasyPrint</Hyperlink>, <Hyperlink NavigateUri="https://github.com/toddams/RazorLight" RequestNavigate="Hyperlink_RequestNavigate">RazorLight</Hyperlink>, <Hyperlink NavigateUri="https://github.com/pvginkel/PdfiumViewer" RequestNavigate="Hyperlink_RequestNavigate">PdfiumViewer</Hyperlink><LineBreak/>
+            Paketierung: <Hyperlink NavigateUri="https://www.firegiant.com/wixtoolset/" RequestNavigate="Hyperlink_RequestNavigate">WiX Toolset</Hyperlink>
+        </TextBlock>
+
+        <Image Source="\Resources\Images\Elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Height="64"
+               HorizontalAlignment="Right" Margin="10" VerticalAlignment="Top"/>
+    </Grid>
+</Window>

Elwig/Windows/AboutWindow.xaml.cs

@@ -0,0 +1,17 @@
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Navigation;
+
+namespace Elwig.Windows {
+    public partial class AboutWindow : Window {
+
+        public AboutWindow() {
+            InitializeComponent();
+            Version.Text = App.Version.ToString();
+        }
+
+        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
+            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
+        }
+    }
+}

Elwig/Windows/AdministrationWindow.cs

@@ -13,8 +13,8 @@ using System.Windows.Input;
 namespace Elwig.Windows {
     public abstract class AdministrationWindow : ContextWindow {
 
-        protected Control[] ExemptInputs { private get; set; }
+        protected Control[] ExemptInputs { get; set; }
-        protected Control[] RequiredInputs { private get; set; }
+        protected Control[] RequiredInputs { get; set; }
 
         private bool _isEditing;
         private bool _isCreating;
@@ -166,8 +166,10 @@ namespace Elwig.Windows {
                     Valid[input] = false;
                 } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
+                    Valid[input] = false;
                 } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
+                    Valid[input] = false;
                 } else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
@@ -570,6 +572,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
 
+        protected void OrganicAuthorityCodeInput_TextChanged(object sender, TextChangedEventArgs? evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckOrganicAuthorityCode);
+        }
+
+        protected void OrganicAuthorityCodeInput_LostFocus(object sender, RoutedEventArgs? evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckOrganicAuthorityCode);
+        }
+
         protected void UpperCaseInput_TextChanged(object sender, TextChangedEventArgs? evt) {
             InputTextChanged((TextBox)sender, Validator.CheckUpperCase);
         }

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="550" MinHeight="450" Width="920" MinWidth="860"
+        Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
@@ -57,7 +57,7 @@
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" MinWidth="555"/>
+            <ColumnDefinition Width="3*" MinWidth="500"/>
             <ColumnDefinition Width="5"/>
             <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
@@ -102,25 +102,35 @@
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
                       Margin="5,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/>
+                    <DataGridTextColumn Header="FbNr." Binding="{Binding FbNr, StringFormat='{}{0} '}" Width="50">
-                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/>
-                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70">
+                    <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/>
+                    <DataGridTextColumn Header="Fläche" Binding="{Binding 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="Von"                Binding="{Binding YearFrom}"      Width="48"/>
+                    <DataGridTextColumn Header="Bis"                Binding="{Binding YearTo}"        Width="48"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -143,19 +153,19 @@
                 </Button.ToolTip>
             </Button>
 
-            <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="SaveButton" Content="Speichern" Click="SaveButton_Click" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Strg+S</TextBlock>
                 </Button.ToolTip>
             </Button>
-            <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="ResetButton" Content="Zurücksetzen" Click="ResetButton_Click" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
                 </Button.ToolTip>
             </Button>
-            <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
+            <Button x:Name="CancelButton" Content="Abbrechen" Click="CancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Esc</TextBlock>
@@ -175,33 +185,32 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="48"/>
-                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <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"/>
                     <TextBox x:Name="FbNrInput" Text="{Binding FbNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
+                             Margin="0,10,10,0" Width="56" HorizontalAlignment="Left" Grid.Column="3" TextAlignment="Right"
                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                    <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False"
-                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
-
-                    <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
                     <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
+                             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"/>
-                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
                     <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
+                             Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="3" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <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}"
-                              DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
+                              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"

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -1,13 +1,14 @@
-using Microsoft.EntityFrameworkCore;
+using Elwig.Dialogs;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
 using Elwig.Helpers;
 using Elwig.Models.Entities;
-using System;
-using System.Threading.Tasks;
-using Elwig.ViewModels;
 using Elwig.Services;
+using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -25,8 +26,8 @@ namespace Elwig.Windows {
             ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ExemptInputs = [
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
-                EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
+                EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
-                AreaCommitmentResetButton, AreaCommitmentCancelButton, SearchInput, ActiveAreaCommitmentInput
+                ResetButton, CancelButton, SearchInput, ActiveAreaCommitmentInput
             ];
             RequiredInputs = [
                 FbNrInput, YearFromInput, KgInput, RdInput,
@@ -163,8 +164,8 @@ namespace Elwig.Windows {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
-            HideAreaCommitmentNewEditDeleteButtons();
+            HideNewEditDeleteButtons();
-            ShowAreaCommitmentSaveResetCancelButtons();
+            ShowSaveResetCancelButtons();
             UnlockInputs();
             await InitInputs();
             LockSearchInputs();
@@ -184,8 +185,8 @@ namespace Elwig.Windows {
             IsEditing = true;
             AreaCommitmentList.IsEnabled = false;
 
-            HideAreaCommitmentNewEditDeleteButtons();
+            HideNewEditDeleteButtons();
-            ShowAreaCommitmentSaveResetCancelButtons();
+            ShowSaveResetCancelButtons();
             UnlockInputs();
             LockSearchInputs();
         }
@@ -199,40 +200,81 @@ namespace Elwig.Windows {
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             if (AreaCommitmentList.SelectedItem is not AreaCom a)
                 return;
-            var r = MessageBox.Show(
+
-                $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
+            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true);
-                "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (d.ShowDialog() != true)
-            if (r == MessageBoxResult.OK) {
+                return;
-                Mouse.OverrideCursor = Cursors.Wait;
+
-                try {
+            Mouse.OverrideCursor = Cursors.Wait;
+            try {
+                if (d.YearTo is int yearTo) {
+                    ViewModel.YearTo = yearTo;
+                    await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
+                } else {
                     await AreaComService.DeleteAreaCom(a.FbNr);
-                } catch (Exception exc) {
-                    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, "Flächenbindung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-                Mouse.OverrideCursor = null;
+                App.HintContextChange();
+            } catch (Exception exc) {
+                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, "Flächenbindung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            Mouse.OverrideCursor = null;
         }
 
         protected override void ShortcutSave() {
-            if (!AreaCommitmentSaveButton.IsEnabled || AreaCommitmentSaveButton.Visibility != Visibility.Visible)
+            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
                 return;
-            AreaCommitmentSaveButton_Click(null, null);
+            SaveButton_Click(null, null);
         }
 
-        private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            AreaCommitmentSaveButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+
+            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)
+                    return;
+                yearTo = d.YearTo;
+            }
 
             int fbnr;
+            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);
+                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);
+                }
+                App.HintContextChange();
             } catch (Exception exc) {
                 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, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
-                AreaCommitmentSaveButton.IsEnabled = true;
+                SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
             }
@@ -240,8 +282,8 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideAreaCommitmentSaveResetCancelButtons();
+            HideSaveResetCancelButtons();
-            ShowAreaCommitmentNewEditDeleteButtons();
+            ShowNewEditDeleteButtons();
             LockInputs();
             UnlockSearchInputs();
             FinishInputFilling();
@@ -253,12 +295,12 @@ namespace Elwig.Windows {
         }
 
         protected override void ShortcutReset() {
-            if (!AreaCommitmentResetButton.IsEnabled || AreaCommitmentResetButton.Visibility != Visibility.Visible)
+            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
                 return;
-            AreaCommitmentResetButton_Click(null, null);
+            ResetButton_Click(null, null);
         }
 
-        private async void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
                 RefreshInputs();
             } else if (IsCreating) {
@@ -267,12 +309,12 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private void AreaCommitmentCancelButton_Click(object sender, RoutedEventArgs evt) {
+        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideAreaCommitmentSaveResetCancelButtons();
+            HideSaveResetCancelButtons();
-            ShowAreaCommitmentNewEditDeleteButtons();
+            ShowNewEditDeleteButtons();
             RefreshInputs();
             ClearInputStates();
             LockInputs();
@@ -282,49 +324,49 @@ namespace Elwig.Windows {
         override protected void UpdateButtons() {
             if (!IsEditing && !IsCreating) return;
             bool ch = HasChanged, v = IsValid;
-            AreaCommitmentResetButton.IsEnabled = (ch);
+            ResetButton.IsEnabled = (ch);
-            AreaCommitmentSaveButton.IsEnabled = (ch && v);
+            SaveButton.IsEnabled = (ch && v);
         }
 
-        private void DisableAreaCommitmentNewEditDeleteButtons() {
+        private void DisableNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = false;
             EditAreaCommitmentButton.IsEnabled = false;
             DeleteAreaCommitmentButton.IsEnabled = false;
         }
 
-        private void EnableAreaCommitmentNewEditDeleteButtons() {
+        private void EnableNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = true;
             EditAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
             DeleteAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
         }
 
-        private void ShowAreaCommitmentSaveResetCancelButtons() {
+        private void ShowSaveResetCancelButtons() {
-            AreaCommitmentSaveButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
-            AreaCommitmentResetButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
-            AreaCommitmentCancelButton.IsEnabled = true;
+            CancelButton.IsEnabled = true;
-            AreaCommitmentSaveButton.Visibility = Visibility.Visible;
+            SaveButton.Visibility = Visibility.Visible;
-            AreaCommitmentResetButton.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Visible;
-            AreaCommitmentCancelButton.Visibility = Visibility.Visible;
+            CancelButton.Visibility = Visibility.Visible;
         }
 
-        private void HideAreaCommitmentSaveResetCancelButtons() {
+        private void HideSaveResetCancelButtons() {
-            AreaCommitmentSaveButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
-            AreaCommitmentResetButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
-            AreaCommitmentCancelButton.IsEnabled = false;
+            CancelButton.IsEnabled = false;
-            AreaCommitmentSaveButton.Visibility = Visibility.Hidden;
+            SaveButton.Visibility = Visibility.Hidden;
-            AreaCommitmentResetButton.Visibility = Visibility.Hidden;
+            ResetButton.Visibility = Visibility.Hidden;
-            AreaCommitmentCancelButton.Visibility = Visibility.Hidden;
+            CancelButton.Visibility = Visibility.Hidden;
         }
 
-        private void ShowAreaCommitmentNewEditDeleteButtons() {
+        private void ShowNewEditDeleteButtons() {
-            EnableAreaCommitmentNewEditDeleteButtons();
+            EnableNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Visible;
             EditAreaCommitmentButton.Visibility = Visibility.Visible;
             DeleteAreaCommitmentButton.Visibility = Visibility.Visible;
         }
 
-        private void HideAreaCommitmentNewEditDeleteButtons() {
+        private void HideNewEditDeleteButtons() {
-            DisableAreaCommitmentNewEditDeleteButtons();
+            DisableNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Hidden;
             EditAreaCommitmentButton.Visibility = Visibility.Hidden;
             DeleteAreaCommitmentButton.Visibility = Visibility.Hidden;
@@ -341,6 +383,8 @@ namespace Elwig.Windows {
         }
 
         private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            if (AreaCommitmentList.SelectedItem != null)
+                AreaCommitmentList.ScrollIntoView(AreaCommitmentList.SelectedItem);
             RefreshInputs();
         }
 

Elwig/Windows/BaseDataWindow.xaml

@@ -122,6 +122,12 @@
                              VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,130,10,10" Width="64"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
+                    <Label Content="Bio-Kontrollstelle:"
+                           VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,110,10"/>
+                    <TextBox x:Name="ClientOrganicAuthorityInput"
+                             VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,10,10" Width="90"
+                             TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
+
                     <Label Content="Telefon-Nr.:"
                            VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,160,0,10"/>
                     <TextBox x:Name="ClientPhoneNrInput" Margin="0,160,10,10" Grid.Column="3"
@@ -330,7 +336,7 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30" Foreground="{Binding WineVar.Color}"/>
                                     <TextBlock Text="{Binding WineAttr.Name}" Width="70"/>
                                     <TextBlock Text="{Binding Discriminator}"/>
                                 </StackPanel>

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -366,6 +366,7 @@ namespace Elwig.Windows {
             ClientBicInput.Text = p.Bic;
             ClientUstIdNrInput.Text = p.UstIdNr;
             ClientLfbisNrInput.Text = p.LfbisNr;
+            ClientOrganicAuthorityInput.Text = p.OrganicAuthority;
             ClientPhoneNrInput.Text = p.PhoneNr;
             ClientFaxNrInput.Text = p.FaxNr;
             ClientEmailAddressInput.Text = p.EmailAddress;
@@ -392,26 +393,27 @@ namespace Elwig.Windows {
 
         private async Task UpdateClientParameters(ClientParameters p) {
             p.Name = ClientNameInput.Text;
-            p.NameSuffix = ClientNameSuffixInput.Text.Length > 0 ? ClientNameSuffixInput.Text : null;
+            p.NameSuffix = string.IsNullOrEmpty(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
             p.NameType = ClientNameTypeInput.Text;
             p.NameToken = ClientNameTokenInput.Text;
             p.NameShort = ClientNameShortInput.Text;
             p.Address = ClientAddressInput.Text;
             p.Plz = int.Parse(ClientPlzInput.Text);
             p.Ort = ClientOrtInput.Text;
-            p.Iban = ClientIbanInput.Text.Length > 0 ? ClientIbanInput.Text : null;
+            p.Iban = string.IsNullOrEmpty(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
-            p.Bic = ClientBicInput.Text.Length > 0 ? ClientBicInput.Text : null;
+            p.Bic = string.IsNullOrEmpty(ClientBicInput.Text) ? null : ClientBicInput.Text;
-            p.UstIdNr = ClientUstIdNrInput.Text.Length > 0 ? ClientUstIdNrInput.Text : null;
+            p.UstIdNr = string.IsNullOrEmpty(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
-            p.LfbisNr = ClientLfbisNrInput.Text.Length > 0 ? ClientLfbisNrInput.Text : null;
+            p.LfbisNr = string.IsNullOrEmpty(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
-            p.PhoneNr = ClientPhoneNrInput.Text.Length > 0 ? ClientPhoneNrInput.Text : null;
+            p.OrganicAuthority = string.IsNullOrEmpty(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
-            p.FaxNr = ClientFaxNrInput.Text.Length > 0 ? ClientFaxNrInput.Text : null;
+            p.PhoneNr = string.IsNullOrEmpty(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
-            p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
+            p.FaxNr = string.IsNullOrEmpty(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
-            p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.Text : null;
+            p.EmailAddress = string.IsNullOrEmpty(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
+            p.Website = string.IsNullOrEmpty(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
 
-            p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
+            p.TextDeliveryNote = string.IsNullOrEmpty(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
             p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
-            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+            p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
-            p.TextCreditNote = TextElementCreditNote.Text.Length > 0 ? TextElementCreditNote.Text : null;
+            p.TextCreditNote = string.IsNullOrEmpty(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
 
             p.ExportEbicsVersion = ParameterExportEbicsVersion.SelectedIndex + 3;
             p.ExportEbicsAddress = ParameterExportEbicsAddress.SelectedIndex;

Elwig/Windows/ChartWindow.xaml

@@ -75,8 +75,8 @@
                 <ctrl:CheckComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding Variety.Name}" Width="150"/>
+                            <TextBlock Text="{Binding Variety.Name}" Foreground="{Binding Variety.Color}" Width="150"/>
-                            <TextBlock Text="{Binding Variety.Type}" Width="30"/>
+                            <TextBlock Text="{Binding Variety.Type}" Foreground="{Binding Variety.Color}" Width="30"/>
                             <TextBlock Text="{Binding Attribute.Name}" Width="80"/>
                             <TextBlock Text="{Binding Cultivation.Name}" Width="80"/>
                             <TextBlock Text="{Binding AssignedGraphId}" Width="30"/>
@@ -94,14 +94,14 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="{Binding Id}" Width="30"/>
+                        <TextBlock Text="{Binding Id}" Foreground="{Binding Color}" Width="30"/>
-                        <TextBlock Text="{Binding VaributeStringSimple}" ToolTip="{Binding VaributeString}"/>
+                        <TextBlock Text="{Binding VaributeStringSimple}" Foreground="{Binding Color}"  ToolTip="{Binding VaributeString}"/>
                     </StackPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+        <Button x:Name="SaveButton" Content="Speichern &amp; Berechnen" IsEnabled="False"
             HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,10" Grid.Column="0" Grid.Row="2"
             Click="SaveButton_Click"/>
 

Elwig/Windows/ChartWindow.xaml.cs

@@ -639,10 +639,11 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
 
             try {
-                using (var ctx = new AppDbContext()) {
+                await Task.Run(async () => {
+                    using var ctx = new AppDbContext();
                     var origData = BillingData.FromJson(PaymentVar.Data);
                     var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
                         AllVaributesAssigned, AllVaributesAssignedAbgew);
@@ -650,21 +651,33 @@ namespace Elwig.Windows {
                     PaymentVar.Data = data.ToJsonString();
                     ctx.Update(PaymentVar);
                     await ctx.SaveChangesAsync();
-                }
+                });
-                LockContext = false;
-                App.HintContextChange();
             } catch (Exception exc) {
+                Mouse.OverrideCursor = null;
                 var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante speichern", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 return;
-            } finally {
-                Mouse.OverrideCursor = null;
             }
 
+            try {
+                await Task.Run(async () => {
+                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
+                    await b.Calculate(false);
+                });
+            } catch (KeyNotFoundException exc) {
+                MessageBox.Show(exc.Message, "Noch nicht alle Preise festgelegt", MessageBoxButton.OK, MessageBoxImage.Information);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            LockContext = false;
+            App.HintContextChange();
             LockContext = true;
             SetHasChanged(false);
+
+            Mouse.OverrideCursor = null;
         }
 
         private void EnableTextBox(TextBox u) {

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -217,7 +217,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Menge der gesamten Lieferung)<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                         <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                         <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@@ -265,14 +265,20 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredSortIdString}" Width="50">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredVaributeString}" Width="60">
                         <DataGridTextColumn.CellStyle>
                             <Style>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding FilteredColor}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
+                        <DataGridTextColumn.ElementStyle>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -289,6 +295,7 @@
                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
                     <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                     <DataGridTextColumn Header="Zu-/Abschläge" Binding="{Binding FilteredModifiersString}" Width="150"/>
+                    <DataGridTextColumn Header="Kommentar" Binding="{Binding CommentsString}" Width="150"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -438,7 +445,7 @@
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{Binding DPNr}" Width="13" TextAlignment="Right" Margin="0,0,7,0"/>
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Foreground="{Binding Variety.Color}" TextAlignment="Center" Width="30"/>
                                     <TextBlock Text="{Binding Kmw, StringFormat='{}{0:N1}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
                                     <TextBlock Text="{Binding QualId}" Width="30"/>
                                     <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
@@ -460,7 +467,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVar.Color}"
                              Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
                              TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
                     <ComboBox x:Name="WineVarietyInput" SelectedItem="{Binding WineVar, Mode=TwoWay}" ItemsSource="{Binding WineVarSource, Mode=TwoWay}"
@@ -516,7 +523,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="70"/>
@@ -669,7 +676,7 @@
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -8,6 +8,7 @@ using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Win32;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -34,6 +35,8 @@ namespace Elwig.Windows {
 
         private readonly Button[] WeighingButtons;
 
+        private List<WineQualLevel> WineQualityLevels = [];
+
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
@@ -89,6 +92,9 @@ namespace Elwig.Windows {
                 foreach (var s in App.EventScales) {
                     s.WeighingEvent += Scale_Weighing;
                 }
+                if (App.Client.IsMatzen) {
+                    RequiredInputs = [.. RequiredInputs, ModifiersInput];
+                }
             } else {
                 WeighingManualButton.Visibility = Visibility.Hidden;
                 WeighingAButton.Visibility = Visibility.Hidden;
@@ -278,6 +284,7 @@ namespace Elwig.Windows {
                 DateInput.IsReadOnly = false;
                 TimeInput.IsReadOnly = false;
                 BranchInput.IsEnabled = true;
+                GerebeltGewogenInput.IsEnabled = true;
                 if (IsCreating) ViewModel.Time = "";
                 OnSecondPassed(null, null);
             }
@@ -287,6 +294,7 @@ namespace Elwig.Windows {
             DateInput.IsReadOnly = true;
             TimeInput.IsReadOnly = true;
             BranchInput.IsEnabled = false;
+            GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode != WeighingMode.Net;
             OnSecondPassed(null, null);
         }
 
@@ -301,7 +309,7 @@ namespace Elwig.Windows {
         }
 
         private void InitialDefaultInputs() {
-            if (App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (App.Config.WeighingMode == WeighingMode.Net) {
                 GerebeltGewogenInput.IsEnabled = false;
                 SetDefaultValue(GerebeltGewogenInput, true);
             } else {
@@ -310,7 +318,7 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
 
-            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
+            if (App.Config.WeighingMode == WeighingMode.Box) {
                 LesewagenInput.IsEnabled = false;
                 SetDefaultValue(LesewagenInput, false);
             } else {
@@ -318,7 +326,7 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(LesewagenInput);
             }
 
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (App.Config.WeighingMode != WeighingMode.Net) {
                 HandPickedInput.IsThreeState = false;
                 UnsetDefaultValue(HandPickedInput);
             } else {
@@ -344,13 +352,13 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
 
-            ViewModel.IsNetWeight = App.Client.HasNetWeighing(ViewModel.Branch);
+            ViewModel.IsNetWeight = App.Config.WeighingMode == WeighingMode.Net;
             ViewModel.IsLesewagen = false;
-            ViewModel.IsHandPicked = !App.Client.HasNetWeighing(ViewModel.Branch) ? true : null;
+            ViewModel.IsHandPicked = App.Config.WeighingMode != WeighingMode.Net ? true : null;
             ViewModel.IsGebunden = null;
             InitialDefaultInputs();
 
-            WineQualityLevelInput.IsEnabled = false;
+            //WineQualityLevelInput.IsEnabled = false;  // disable wine quality level input in Übernahme
             ValidateRequiredInputs();
         }
 
@@ -478,7 +486,8 @@ namespace Elwig.Windows {
             var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(WineQualityLevelInput, await ctx.WineQualityLevels.ToListAsync());
+            WineQualityLevels = await ctx.WineQualityLevels.ToListAsync();
+            ControlUtils.RenewItemsSource(WineQualityLevelInput, WineQualityLevels);
             ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                 .Where(m => m.Year == y && (!IsCreating || m.IsActive))
                 .OrderBy(m => m.Ordering)
@@ -732,6 +741,7 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;
@@ -770,6 +780,7 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;
@@ -905,6 +916,7 @@ namespace Elwig.Windows {
                     var n = await DeliveryService.SplitDeliveryToLsNr(d.Year, d.DId, weights, id);
                     ControlUtils.SelectItemWithPk(DeliveryList, n.Year, n.DId);
                 }
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;
@@ -962,6 +974,7 @@ namespace Elwig.Windows {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await DeliveryService.DeleteDelivery(d.LsNr);
+                    App.HintContextChange();
                 } catch (Exception exc) {
                     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;
@@ -991,6 +1004,7 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;
@@ -1134,6 +1148,7 @@ namespace Elwig.Windows {
             DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
             TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
             BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
+            GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode == WeighingMode.Net || Menu_Settings_EnableFreeEditing.IsChecked;
         }
 
         private void DisableWeighingButtons() {
@@ -1196,6 +1211,7 @@ namespace Elwig.Windows {
                 AttributeInput.SelectedIndex = 0;
                 CultivationInput.SelectedIndex = 0;
             }
+            UpdateWineQualityLevels();
         }
 
         private void SortIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -1209,19 +1225,39 @@ namespace Elwig.Windows {
         private void WineVarietyInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (WineVarietyInput.SelectedItem is WineVar s)
                 ViewModel.SortId = s.SortId;
+            UpdateWineQualityLevels();
+            if (!ViewModel.WineVar?.IsQuw ?? false) {
+                App.MainDispatcher.BeginInvoke(() => {
+                    MessageBox.Show("Die eingegebene Sorte darf nicht als Qualitätswein\nübernommen werden!", "Kein Qualitätswein",
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
+                });
+            }
+        }
+
+        private WineQualLevel GetWineQualityLevel(double kmw, string? maxQualId = null) {
+            return WineQualityLevels
+                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
+                .Where(q => maxQualId == null || q.QualId == "WEI" || q.QualId == maxQualId)
+                .OrderBy(q => q.MinKmw)
+                .Last();
         }
 
         private void UpdateWineQualityLevels() {
-            using var ctx = new AppDbContext();
             if (!GetInputValid(GradationKmwInput)) {
                 UnsetDefaultValue(WineQualityLevelInput);
                 ComboBox_SelectionChanged(WineQualityLevelInput, null);
-                WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.QualId == "WEI").ToList();
+                WineQualityLevelInput.ItemsSource = WineQualityLevels;
+                WineQualityLevelInput.SelectedItem = null;
                 return;
             }
             var kmw = (double)ViewModel.GradationKmw!;
-            WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.MinKmw == null || q.MinKmw <= kmw).ToList();
+            var max = ViewModel.WineVar?.MaxQualId;
-            var qual = ctx.GetWineQualityLevel(kmw).GetAwaiter().GetResult();
+            var quw = ViewModel.WineVar?.IsQuw ?? true;
+            WineQualityLevelInput.ItemsSource = WineQualityLevels
+                .Where(q => q.MinKmw == null || q.MinKmw <= kmw)
+                .Where(q => quw || q.QualId == "WEI" || q.QualId == max)
+                .ToList();
+            var qual = GetWineQualityLevel(kmw, !quw ? max : null);
             SetDefaultValue(WineQualityLevelInput, qual);
             if (WineQualityLevelInput.SelectedItem == null || (WineQualityLevelInput.SelectedItem is WineQualLevel selected && !selected.IsPredicate)) {
                 ControlUtils.SelectItem(WineQualityLevelInput, qual);
@@ -1361,8 +1397,7 @@ namespace Elwig.Windows {
                 AbgewertetInput.IsChecked = false;
                 return;
             }
-            using var ctx = new AppDbContext();
+            var defQual = GetWineQualityLevel(ViewModel.GradationKmw!.Value, !(ViewModel.WineVar?.IsQuw ?? true) ? ViewModel.WineVar?.MaxQualId : null);
-            var defQual = ctx.GetWineQualityLevel(double.Parse(GradationKmwInput.Text)).GetAwaiter().GetResult();
             AbgewertetInput.IsChecked = !qual.IsPredicate && defQual != qual;
         }
 
@@ -1384,17 +1419,17 @@ namespace Elwig.Windows {
         }
 
         private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
                 HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
             }
-            if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (!ViewModel.IsReceipt || App.Config.WeighingMode == WeighingMode.Net) {
                 GerebeltGewogenInput.IsChecked ??= false;
             }
             CheckBox_Changed(sender, evt);
         }
 
         private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
                 GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
             }
             CheckBox_Changed(sender, evt);

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -125,7 +125,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Menge</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                     </TextBlock>
                 </TextBox.ToolTip>
@@ -187,18 +187,19 @@
                     <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding Variety.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedTimestamp, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
+                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedAt, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
@@ -316,7 +317,7 @@
                     </ComboBox>
 
                     <Label Content="Sorte:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVariety.Color}"
                              Width="36" Grid.Row="1" Grid.Column="1" Margin="0,40,0,0" HorizontalAlignment="Left"
                              TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
                     <ComboBox x:Name="WineVarietyInput" SelectedItem="{Binding WineVariety, Mode=TwoWay}" ItemsSource="{Binding WineVarietySource, Mode=TwoWay}"
@@ -328,7 +329,7 @@
                         </ComboBox.ItemTemplateSelector>
                     </ComboBox>
 
-                    <Label Content="Gewicht:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Menge:" Margin="10,70,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" Text="{Binding WeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Grid.Column="1" Margin="0,70,10,10" Width="61" HorizontalAlignment="Left"
                                       TextChanged="WeightInput_TextChanged" KeyUp="Input_KeyUp"/>
@@ -364,7 +365,7 @@
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="3"/>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -83,14 +83,19 @@ namespace Elwig.Windows {
 
         private async Task RefreshDeliveryScheduleList() {
             using var ctx = new AppDbContext();
-            var deliverySchedules = await ctx.DeliverySchedules
+            var list = await ctx.DeliverySchedules
                 .Where(s => s.Year == ViewModel.FilterSeason)
                 .Include(s => s.Branch)
-                .Include(s => s.Announcements)
                 .OrderBy(s => s.DateString)
                 .ThenBy(s => s.Branch.Name)
                 .ThenBy(s => s.Description)
+                .Select(s => new {
+                    Schedule = s,
+                    AnnouncedWeight = s.Announcements.Sum(a => a.Weight)
+                })
                 .ToListAsync();
+            list.ForEach(v => v.Schedule.AnnouncedWeightOverride = v.AnnouncedWeight);
+            var deliverySchedules = list.Select(v => v.Schedule).ToList();
             ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
                 .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
                 .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
@@ -103,6 +108,7 @@ namespace Elwig.Windows {
             var deliveryAncmts = await deliveryAncmtQuery
                 .Include(a => a.Member.BillingAddress)
                 .Include(a => a.Schedule)
+                .Include(a => a.Variety)
                 .AsSplitQuery()
                 .ToListAsync();
 
@@ -317,12 +323,13 @@ namespace Elwig.Windows {
                 $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
                 "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    using (var ctx = new AppDbContext()) {
+                    await Task.Run(async () => {
+                        using var ctx = new AppDbContext();
                         ctx.Remove(a);
                         await ctx.SaveChangesAsync();
-                    }
+                    });
                     App.HintContextChange();
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -340,7 +347,7 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             SaveButton.IsEnabled = false;
 
             int year = -1, dsnr = -1, mgnr = -1;
@@ -348,6 +355,7 @@ namespace Elwig.Windows {
             try {
                 var s = ViewModel.SelectedDeliveryAncmt;
                 (year, dsnr, mgnr, sortid) = await ViewModel.UpdateDeliveryAncmt(s?.Year, s?.DsNr, s?.MgNr, s?.SortId, s?.Type);
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;

Elwig/Windows/DeliveryScheduleAdminWindow.xaml

@@ -127,7 +127,7 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Beschreibung" Binding="{Binding Description}" Width="200"/>
-                    <DataGridTextColumn Header="Max. Gew." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                    <DataGridTextColumn Header="Max. Mg." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -211,7 +211,7 @@
                              Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="TextBox_TextChanged"/>
 
-                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
+                    <Label Content="Max. Menge:" Margin="10,70,0,10"/>
                     <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
                                       TextChanged="MaxWeightInput_TextChanged"/>

Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs

@@ -177,12 +177,13 @@ namespace Elwig.Windows {
                 $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?",
                 "Leseplan löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    using (var ctx = new AppDbContext()) {
+                    await Task.Run(async () => {
+                        using var ctx = new AppDbContext();
                         ctx.Remove(s);
                         await ctx.SaveChangesAsync();
-                    }
+                    });
                     App.HintContextChange();
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -200,11 +201,12 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             SaveButton.IsEnabled = false;
 
             try {
                 await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr);
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;

Elwig/Windows/LogWindow.xaml.cs

@@ -1,7 +1,9 @@
 using Elwig.Helpers;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public partial class LogWindow : Window {
@@ -11,28 +13,34 @@ namespace Elwig.Windows {
             WindowState = WindowState.Maximized;
         }
 
-        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
-            var log = Utils.GetLogEntries();
+            Mouse.OverrideCursor = Cursors.Wait;
-            EventList.ItemsSource = log
+            await Task.Run(async () => {
-                .Select(e => new {
+                var list = Utils.GetLogEntries()
-                    Event = e,
+                  .Select(e => new {
-                    Lines = e.Message.Split('\n').ToArray(),
+                      Event = e,
-                })
+                      Lines = e.Message.Split('\n').ToArray(),
-                .Select(e => new {
+                  })
-                    e.Event,
+                  .Select(e => new {
-                    Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
+                      e.Event,
-                    Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
+                      Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
-                })
+                      Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
-                .Select(e => new {
+                  })
-                    e.Event,
+                  .Select(e => new {
-                    e.Exception,
+                      e.Event,
-                    ExceptionName = e.Exception?[0].Trim(),
+                      e.Exception,
-                    ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
+                      ExceptionName = e.Exception?[0].Trim(),
-                    e.Location,
+                      ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
-                })
+                      e.Location,
-                .OrderByDescending(e => e.Event.TimeGenerated)
+                  })
-                .ToList();
+                  .OrderByDescending(e => e.Event.TimeGenerated)
-            EventList.SelectedIndex = 0;
+                  .ToList();
+                await App.MainDispatcher.BeginInvoke(() => {
+                    EventList.ItemsSource = list;
+                    EventList.SelectedIndex = 0;
+                });
+            });
+            Mouse.OverrideCursor = null;
         }
 
         private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {

Elwig/Windows/MailLogWindow.xaml

@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:local="clr-namespace:Elwig.Windows"
-        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000">
+        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000"
+        Loaded="Window_Loaded">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="3*"/>

Elwig/Windows/MailLogWindow.xaml.cs

@@ -2,6 +2,7 @@ using Elwig.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -18,8 +19,16 @@ namespace Elwig.Windows {
             FilterInput.TextChanged -= FilterInput_TextChanged;
         }
 
+        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
+            await Load();
+        }
+
         private async void TimeSpanInput_SelectionChanged(object sender, RoutedEventArgs evt) {
             if (!IsLoaded) return;
+            await Load();
+        }
+
+        private async Task Load() {
             DateTime? fromDate = DateTime.Now;
             if (TimeSpanInput.SelectedIndex == 0) {
                 fromDate = fromDate.Value.AddDays(-7);

Elwig/Windows/MailWindow.xaml.cs

@@ -602,7 +602,7 @@ namespace Elwig.Windows {
             PreviewButton.IsEnabled = false;
             PrintButton.IsEnabled = false;
             EmailButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             GenerateButton.IsEnabled = false;
 
             DisposeDocs();
@@ -671,7 +671,7 @@ namespace Elwig.Windows {
                     var avnr = details.Item2;
                     try {
                         cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr),
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
                             await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
                             BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                         );
@@ -738,7 +738,7 @@ namespace Elwig.Windows {
                 PostalNoEmailInput.IsChecked == true ? 1 : 0;
             var emailMode = EmailAllInput.IsChecked == true ? 2 : EmailWishInput.IsChecked == true ? 1 : 0;
 
-            double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 2 ? PostalNoEmailCount : 0;
+            double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 1 ? PostalNoEmailCount : 0;
             double emailNum = emailMode == 2 ? EmailAllCount : emailMode == 1 ? EmailWishCount : 0;
             double totalNum = printNum + emailNum;
 
@@ -828,25 +828,27 @@ namespace Elwig.Windows {
             EmailButton.IsEnabled = EmailDocuments != null && App.Config.Smtp != null;
         }
 
-        private void PreviewButton_Click(object sender, RoutedEventArgs evt) {
+        private async void PreviewButton_Click(object sender, RoutedEventArgs evt) {
             var d = new OpenFolderDialog() {
                 Title = "Ordner auswählen - Elwig",
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
-                PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
+                await Task.Run(() => {
-                if (EmailDocuments != null) {
+                    PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
-                    foreach (var (m, docs) in EmailDocuments) {
+                    if (EmailDocuments != null) {
-                        var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
+                        foreach (var (m, docs) in EmailDocuments) {
-                        Directory.CreateDirectory(folder);
+                            var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
-                        foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
+                            Directory.CreateDirectory(folder);
-                            var doc = item.Doc;
+                            foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
-                            var name = Utils.NormalizeFileName(doc.Title);
+                                var doc = item.Doc;
-                            doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
+                                var name = Utils.NormalizeFileName(doc.Title);
-                        }
+                                doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
+                            }
 
+                        }
                     }
-                }
+                });
                 Mouse.OverrideCursor = null;
                 Process.Start("explorer.exe", d.FolderName);
             }
@@ -862,20 +864,22 @@ namespace Elwig.Windows {
             var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?",
                 "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
             if (res == MessageBoxResult.Yes) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
-                if (App.Config.Debug) {
+                await Task.Run(async () => {
-                    PrintDocument.Show();
+                    if (App.Config.Debug) {
-                } else {
+                        PrintDocument.Show();
-                    await PrintDocument.Print();
+                    } else {
-                    await Utils.AddSentMails(
+                        await PrintDocument.Print();
-                        PrintMemberDocuments.Select(d => (
+                        await Utils.AddSentMails(
-                            "postal", d.Key.MgNr, d.Key.AdministrativeName,
+                            PrintMemberDocuments.Select(d => (
-                            new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
+                                "postal", d.Key.MgNr, d.Key.AdministrativeName,
-                            d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
+                                new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
-                            d.Value.Select(d => d.Title).ToArray()
+                                d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
-                        ))
+                                d.Value.Select(d => d.Title).ToArray()
-                    );
+                            ))
-                }
+                        );
+                    }
+                });
                 Mouse.OverrideCursor = null;
             }
 
@@ -893,8 +897,8 @@ namespace Elwig.Windows {
 
             SmtpClient? client = null;
             try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
-                client = await Utils.GetSmtpClient();
+                client = await Task.Run(Utils.GetSmtpClient);
                 Mouse.OverrideCursor = null;
 
                 var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
@@ -903,31 +907,33 @@ namespace Elwig.Windows {
                     return;
                 }
 
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 var subject = EmailSubjectInput.Text;
                 var text = EmailBodyInput.Text;
-                await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
+                await Task.Run(async () => {
-                foreach (var (m, docs) in EmailDocuments) {
+                    await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
-                    using var msg = new MimeMessage();
+                    foreach (var (m, docs) in EmailDocuments) {
-                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                        using var msg = new MimeMessage();
-                    msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
+                        msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                    msg.Subject = subject;
+                        msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
-                    var body = new Multipart("mixed") {
+                        msg.Subject = subject;
-                        new TextPart("plain") { Text = text }
+                        var body = new Multipart("mixed") {
-                    };
+                            new TextPart("plain") { Text = text }
-                    foreach (var doc in docs) {
+                        };
-                        var name = Utils.NormalizeFileName(doc.Title);
+                        foreach (var doc in docs) {
-                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                            var name = Utils.NormalizeFileName(doc.Title);
+                            body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                        }
+                        msg.Body = body;
+                        await client!.SendAsync(msg);
+                        await Utils.AddSentMails([(
+                            "email", m.MgNr, m.AdministrativeName,
+                            m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
+                            subject,
+                            docs.Select(d => d.Title).ToArray()
+                        )]);
                     }
-                    msg.Body = body;
+                });
-                    await client!.SendAsync(msg);
-                    await Utils.AddSentMails([(
-                        "email", m.MgNr, m.AdministrativeName,
-                        m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
-                        subject,
-                        docs.Select(d => d.Title).ToArray()
-                    )]);
-                }
 
                 MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
@@ -948,7 +954,7 @@ namespace Elwig.Windows {
             AvaiableDocumentsList.SelectedIndex = 1;
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation))
                 return;
-            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
+            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, Year));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
             RecipientsDeliveryMembersInput.IsChecked = true;
         }

Elwig/Windows/MainWindow.xaml

@@ -31,6 +31,17 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator/>
+                <MenuItem Header="Datenbank sichern..." Click="Menu_Database_Backup_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA35;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Datenbank wiederherstellen..." Click="Menu_Database_Restore_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE777;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator/>
                 <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE756;"/>
@@ -41,6 +52,17 @@
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xED25;"/>
                     </MenuItem.Icon>
                 </MenuItem>
+                <Separator/>
+                <MenuItem x:Name="Menu_Database_Upload" Header="Datenbank hochladen..." Click="Menu_Database_Upload_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE898;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Database_Download" Header="Datenbank herunterladen..." Click="Menu_Database_Download_Click" IsEnabled="False">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE896;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Waage">
                 <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click">
@@ -50,7 +72,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem x:Name="HelpMenu" Header="Hilfe">
-                <MenuItem Header="Über">
+                <MenuItem Header="Über" Click="Menu_Help_About_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE946;"/>
                     </MenuItem.Icon>
@@ -207,7 +229,7 @@
                 <Button x:Name="BreakdownButton"
                         Click="BreakdownButton_Click"
                         Margin="195,90,0,10" Width="190" Padding="3,5,5,5"
-                        ToolTip="Aufschlüsselung des Gewichts nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
+                        ToolTip="Aufschlüsselung der Menge nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
                     <Grid>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
                                    TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>
@@ -252,7 +274,7 @@
                     </Grid.RowDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="1" TextAlignment="Right"><Bold>Mitglieder</Bold></TextBlock>
-                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Gewicht</Bold></TextBlock>
+                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Menge</Bold></TextBlock>
                     <TextBlock Grid.Row="0" Grid.Column="3" TextAlignment="Right"><Bold>Fläche</Bold></TextBlock>
 
                     <TextBlock Grid.Row="1" Grid.Column="0">Gesamt:</TextBlock>

Elwig/Windows/MainWindow.xaml.cs

@@ -25,12 +25,14 @@ namespace Elwig.Windows {
         public MainWindow() {
             InitializeComponent();
             var v = Assembly.GetExecutingAssembly().GetName().Version;
-            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}";
+            VersionField.Text = $"Version: {v?.ToString() ?? "?"} – {App.BranchName}";
             if (App.Client.Client == null) VersionField.Text += " (Unbekannt)";
             Menu_Help_Update.IsEnabled = App.Config.UpdateUrl != null;
             Menu_Help_Smtp.IsEnabled = App.Config.Smtp != null;
             DownloadButton.Visibility = App.Config.SyncUrl != null ? Visibility.Visible : Visibility.Hidden;
             UploadButton.Visibility = App.Config.SyncUrl != null ? Visibility.Visible : Visibility.Hidden;
+            Menu_Database_Upload.IsEnabled = App.Config.SyncUrl != null;
+            Menu_Database_Download.IsEnabled = App.Config.SyncUrl != null;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
@@ -57,6 +59,11 @@ namespace Elwig.Windows {
             }
         }
 
+        private void Menu_Help_About_Click(object sender, RoutedEventArgs evt) {
+            var w = new AboutWindow();
+            w.Show();
+        }
+
         private async void Menu_Help_Update_Click(object sender, RoutedEventArgs evt) {
             await App.CheckForUpdates(true);
         }
@@ -144,6 +151,50 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
+        private async void Menu_Database_Backup_Click(object sender, RoutedEventArgs evt) {
+            try {
+                var d = new SaveFileDialog() {
+                    Title = "Datenbank sichern - Elwig",
+                    FileName = $"database_{Utils.Today:yyyy-MM-dd}.sql.zip",
+                    DefaultExt = "sql.zip",
+                    Filter = "Komprimierte SQL-Datei (*.sql.zip)|*.sql.zip",
+                    AddExtension = false,
+                };
+                if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".sql.zip")) d.FileName += ".sql.zip";
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        await Database.ExportSql(d.FileName, true);
+                    });
+                }
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void Menu_Database_Restore_Click(object sender, RoutedEventArgs evt) {
+            try {
+                var d = new OpenFileDialog() {
+                    Title = "Datenbank wiederherstellen - Elwig",
+                    DefaultExt = "sql.zip",
+                    Filter = "SQLite-Datenbank (*.sqlite3, *.sqlite3.zip, *.sql, *.sql.zip)|*.sqlite3;*.sqlite3.zip;*.sql;*.sql.zip",
+                };
+                if (d.ShowDialog() == true) {
+                    var res = MessageBox.Show("Soll die Datenbank wirklich unwiederruflich durch die wiederhergestellte Version ersetzt werden?", "Datenbank wiederherstellen",
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                    if (res != MessageBoxResult.OK)
+                        return;
+
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await App.ReplaceDatabase(d.FileName);
+                }
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
         private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
@@ -156,7 +207,7 @@ namespace Elwig.Windows {
                             Name = f!["name"]!.AsValue().GetValue<string>(),
                             Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
                             ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
-                            Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
+                            Device = f!["meta"]?["device"]?.AsValue().GetValue<string>(),
                             Url = f!["url"]!.AsValue().GetValue<string>(),
                             Size = f!["size"]!.AsValue().GetValue<long>(),
                         })
@@ -178,11 +229,11 @@ namespace Elwig.Windows {
                     }
                     await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
                 } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show(exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -200,16 +251,25 @@ namespace Elwig.Windows {
                         .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
                         .Include(d => d.Parts)
                         .ThenInclude(p => p.PartModifiers)
+                        .Include(d => d.Parts)
+                        .ThenInclude(p => p.Kg)
+                        .ThenInclude(k => k!.Gl)
                         .OrderBy(d => d.DateString)
                         .ThenBy(d => d.TimeString)
                         .ThenBy(d => d.LsNr)
                         .AsSplitQuery()
                         .ToListAsync();
+                    var wbKgs = deliveries
+                        .SelectMany(d => d.Parts)
+                        .Where(p => p.Kg != null)
+                        .Select(p => p.Kg!)
+                        .DistinctBy(k => k.KgNr)
+                        .ToList();
                     if (deliveries.Count == 0) {
                         MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
                             MessageBoxButton.OK, MessageBoxImage.Error);
                     } else {
-                        await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
+                        await ElwigData.Export(path, deliveries, wbKgs, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
                         await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                         MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
                             MessageBoxButton.OK, MessageBoxImage.Information);
@@ -217,7 +277,7 @@ namespace Elwig.Windows {
                 } catch (HttpRequestException exc) {
                     MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
@@ -225,6 +285,89 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
+        private async void Menu_Database_Download_Click(object sender, RoutedEventArgs evt) {
+            if (App.Config.SyncUrl == null)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    var files = data
+                        .Select(f => new {
+                            Name = f!["name"]!.AsValue().GetValue<string>(),
+                            Timestamp = f!["modified"] != null && DateTime.TryParseExact(f!["modified"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
+                            Url = f!["url"]!.AsValue().GetValue<string>(),
+                            Size = f!["size"]!.AsValue().GetValue<long>(),
+                        })
+                        .Where(f => f.Name.StartsWith("database.") && f.Name.EndsWith(".zip"))
+                        .OrderBy(f => f.Size)
+                        .ToList();
+
+                    if (files.Count == 0) {
+                        MessageBox.Show("Die Datenbank wurde noch nicht vom Hauptgerät hochgeladen!", "Datenbank herunterladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                        return;
+                    }
+                    var file = files[0];
+
+                    var res = MessageBox.Show($"Es wurde eine komprimierte Datenbank (ca. {file.Size / 1024 / 1024} MB) vom {file.Timestamp:dd.MM.yyyy, HH:mm} gefunden.\n\nWollen Sie wirklich die aktuelle Datenbank unwiederruflich\nlöschen und durch die gefundene ersetzen?\n\nDas kann zu Datenverlust führen!", "Datenbank herunterladen",
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                    if (res != MessageBoxResult.OK)
+                        return;
+
+                    var filename = Path.Combine(App.TempPath, file.Name);
+                    using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
+                        using var stream = new FileStream(filename, FileMode.Create);
+                        await client.DownloadAsync(file.Url, stream);
+                    }
+
+                    res = MessageBox.Show("Die Datenbank wurde erfolgreich heruntergeladen!\n\nSoll die Datenbank wirklich unwiederruflich ersetzt werden?\n\nWenn Sie unsicher sind sprechen Sie sich mit dem Benutzer des Hauptgerätes ab!", "Datenbank herunterladen",
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                    if (res != MessageBoxResult.OK)
+                        return;
+
+                    await App.MainDispatcher.BeginInvoke(async () => {
+                        await App.ReplaceDatabase(filename);
+                    });
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            });
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void Menu_Database_Upload_Click(object sender, RoutedEventArgs evt) {
+            if (App.Config.SyncUrl == null)
+                return;
+
+            var res = MessageBox.Show("Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!", "Datenbank hochladen",
+                MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (res != MessageBoxResult.OK)
+                return;
+
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    var path = Path.Combine(App.TempPath, "database.sql.zip");
+                    await Database.ExportSql(path, true);
+                    await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    MessageBox.Show($"Hochladen der gesamten Datenbank erfolgreich!", "Datenbank hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            });
+            Mouse.OverrideCursor = null;
+        }
+
         private void MemberAdminButton_Click(object sender, RoutedEventArgs evt) {
             var w = new MemberAdminWindow();
             w.Show();

Elwig/Windows/MemberAdminWindow.xaml

@@ -653,13 +653,40 @@
                              TextChanged="TextBox_TextChanged"
                              VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
-                    <Label Content="Kontaktart:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
+                    <Label Content="Kontaktart:" Margin="10,10,0,40" Grid.Column="0" VerticalAlignment="Bottom"/>
                     <CheckBox x:Name="ContactPostalInput" Content="Post" IsChecked="{Binding ContactViaPost, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="0,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="0,0,0,45" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
                     <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsChecked="{Binding ContactViaEmail, Mode=TwoWay}" IsEnabled="False"
                               Checked="ContactEmailInput_Changed" Unchecked="ContactEmailInput_Changed"
-                              HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="60,0,0,45" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+                    <Label Content="Zuletzt geändert:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
+                    <TextBlock x:Name="LastModified" Text="{Binding ModifiedAtShort}"
+                               Margin="0,10,0,15" Grid.Column="1" TextWrapping="NoWrap" VerticalAlignment="Bottom">
+                        <TextBlock.ToolTip>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="110"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Erstellt:"/>
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CreatedAt}"/>
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Zuletzt geändert:"/>
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding ModifiedAt}"/>
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Zuletzt von diesem Gerät exportiert:"/>
+                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding ExportedAt}"/>
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="Zuletzt auf dieses Gerät importiert:"/>
+                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding ImportedAt}"/>
+                            </Grid>
+                        </TextBlock.ToolTip>
+                    </TextBlock>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" IsEnabled="{Binding IsMemberSelected}"
                             Click="DeliveryButton_Click"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -392,6 +392,7 @@ namespace Elwig.Windows {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
+                    App.HintContextChange();
                 } catch (Exception exc) {
                     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;
@@ -414,6 +415,7 @@ namespace Elwig.Windows {
             int mgnr;
             try {
                 mgnr = await ViewModel.UpdateMember(ViewModel.SelectedMember?.MgNr);
+                App.HintContextChange();
             } catch (Exception exc) {
                 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;
@@ -782,11 +784,11 @@ namespace Elwig.Windows {
                     $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
                     $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
                     $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}";
-                var d = new AreaComDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
+                var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
-                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
+                ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();
@@ -845,7 +847,7 @@ namespace Elwig.Windows {
                     .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
                     .ToListAsync();
                 if (areaComs.Count > 0) {
-                    var d = new AreaComDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                    var d = new AreaComTransferDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
                     if (d.ShowDialog() == true) {
                         ViewModel.CancelAreaComs = d.CancelSeason;
                     }

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -156,7 +156,7 @@ namespace Elwig.Windows {
         }
 
         private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
                 double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
@@ -169,10 +169,12 @@ namespace Elwig.Windows {
                 App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
                 App.Client.AutoAdjustBs.AllowancePercent = percent;
                 App.Client.AutoAdjustBs.MinBs = minBs;
-                await App.Client.UpdateValues();
 
-                var b = new Billing(Year);
+                await Task.Run(async () => {
-                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                    await App.Client.UpdateValues();
+                    var b = new Billing(Year);
+                    await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                });
                 App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -183,10 +185,12 @@ namespace Elwig.Windows {
         }
 
         private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                var b = new Billing(Year);
+                await Task.Run(async () => {
-                await b.UnAdjustBusinessShares();
+                    var b = new Billing(Year);
+                    await b.UnAdjustBusinessShares();
+                });
                 App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -281,35 +285,37 @@ namespace Elwig.Windows {
 
         private async void CustomButton_Click(object sender, RoutedEventArgs evt) {
             if (MemberInput.SelectedItem is not Member m) return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                using var ctx = new AppDbContext();
+                var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
-                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
-                    ctx.Remove(p);
+                var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
-                }
+                var modText = CustomModCommentInput.Text.Trim();
-                if (sender == SaveCustomButton) {
+                var text = CustomCommentInput.Text.Trim();
-                    var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
+                await Task.Run(async () => {
-                    var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
+                    using var ctx = new AppDbContext();
-                    var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
+                    if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
-                    var modText = CustomModCommentInput.Text.Trim();
+                        ctx.Remove(p);
-                    var text = CustomCommentInput.Text.Trim();
+                    }
-                    ctx.Add(new PaymentCustom {
+                    if (sender == SaveCustomButton) {
-                        MgNr = m.MgNr,
+                        ctx.Add(new PaymentCustom {
-                        Year = Year,
+                            MgNr = m.MgNr,
-                        ModAbs = modAbs,
+                            Year = Year,
-                        ModRel = modRel,
+                            ModAbs = modAbs,
-                        ModComment = modText == "" ? null : modText,
+                            ModRel = modRel,
-                        Amount = amount,
+                            ModComment = modText == "" ? null : modText,
-                        Comment = text == "" ? null : text,
+                            Amount = amount,
-                    });
+                            Comment = text == "" ? null : text,
-                }
+                        });
-                await ctx.SaveChangesAsync();
+                    }
+                    await ctx.SaveChangesAsync();
+                });
+                App.HintContextChange();
             } catch (Exception exc) {
                 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, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            App.HintContextChange();
             Mouse.OverrideCursor = null;
         }
     }

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -5,8 +5,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="850">
+    <Window.DataContext>
+        <vm:PaymentVariantsViewModel/>
+    </Window.DataContext>
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -55,25 +59,25 @@
 
         <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Variantendaten">
-                <MenuItem x:Name="Menu_SummaryShow" Header="...anzeigen (PDF)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryShow" Header="...anzeigen (PDF)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryShow_Click" InputGestureText="Strg+P">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8FF;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummarySave" Header="...speichern... (PDF)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummarySave" Header="...speichern... (PDF)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummarySave_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA90;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummaryExport" Header="...speichern... (Excel)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryExport" Header="...speichern... (Excel)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryExport_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummaryPrint" Header="...drucken" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryPrint" Header="...drucken" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryPrint_Click" InputGestureText="Strg+Shift+P">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE749;"/>
@@ -81,7 +85,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Buchungsliste">
-                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="False"
+                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="{Binding ExportIsEnabled}"
                           Click="Menu_ExportSave_Click" InputGestureText="Strg+L">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
@@ -89,7 +93,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Überweisungsdaten">
-                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="False"
+                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="{Binding ExportIsEnabled}"
                           Click="Menu_EbicsSave_Click" InputGestureText="Strg+Ü">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE792;"/>
@@ -99,7 +103,9 @@
         </Menu>
 
         <Grid Grid.Row="1">
-            <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2" SelectionChanged="PaymentVariantList_SelectionChanged">
+            <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2"
+                     SelectionChanged="PaymentVariantList_SelectionChanged"
+                     ItemsSource="{Binding PaymentVariants, Mode=TwoWay}" SelectedItem="{Binding SelectedPaymentVariant, Mode=TwoWay}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -109,17 +115,21 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+            <Button x:Name="AddButton"
+                    Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"
                     Click="AddButton_Click"/>
-            <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+            <Button x:Name="CopyButton" IsEnabled="{Binding IsPaymentVariantSelected}"
+                    Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"
                     Click="CopyButton_Click"/>
-            <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+            <Button x:Name="DeleteButton" IsEnabled="{Binding DeleteIsEnabled}"
+                    Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Ausgewählte Auszahlungsvariante löschen"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"
                     Click="DeleteButton_Click"/>
 
-            <TextBox x:Name="DataInput" Margin="10,200,35,10"
+            <TextBox x:Name="DataInput" Text="{Binding Data, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding DataIsReadOnly}"
+                     Margin="10,200,35,10"
                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
                      AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
                      FontFamily="Cascadia Code Light" FontSize="13"
@@ -133,23 +143,28 @@
             </Grid.ColumnDefinitions>
 
             <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-            <TextBox x:Name="NameInput" Width="200" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+            <TextBox x:Name="NameInput" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Width="200" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
                      TextChanged="NameInput_TextChanged"/>
 
             <Label Content="Beschreibung:" Margin="10,40,0,0" Grid.Column="0"/>
-            <TextBox x:Name="CommentInput" Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,40,10,0"
+            <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,40,10,0"
                      TextChanged="CommentInput_TextChanged"/>
 
             <Label Content="Datum:" Margin="10,70,0,0" Grid.Column="0"/>
-            <TextBox x:Name="DateInput" Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"
+            <TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"
                      TextChanged="DateInput_TextChanged"/>
 
             <Label Content="Überwiesen am:" Margin="10,100,0,0" Grid.Column="0"/>
-            <TextBox x:Name="TransferDateInput" Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
+            <TextBox x:Name="TransferDateInput" Text="{Binding TransferDateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
                      TextChanged="TransferDateInput_TextChanged"/>
 
             <Label Content="Rebelzuschlag:" Margin="10,130,0,0" Grid.Column="0"/>
-            <ctrl:UnitTextBox x:Name="WeightModifierInput" Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
+            <ctrl:UnitTextBox x:Name="WeightModifierInput" Text="{Binding WeightModifierString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                              Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
                               HorizontalAlignment="Left" VerticalAlignment="Top"
                               TextChanged="WeightModifierInput_TextChanged" LostFocus="WeightModifierInput_LostFocus"/>
 
@@ -160,19 +175,24 @@
             </TextBlock>
 
             <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="1"/>
-            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
+            <CheckBox x:Name="ConsiderModifiersInput" IsChecked="{Binding ConsiderModifiers, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Zu-/Abschläge bei Lieferungen (inkl. Rebelzuschl.)"
                       Margin="110,95,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
-            <CheckBox x:Name="ConsiderPenaltiesInput" Content="Pönalen bei Unterlieferungen (FB)"
+            <CheckBox x:Name="ConsiderPenaltiesInput" IsChecked="{Binding ConsiderPenalties, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Pönalen bei Unterlieferungen (FB)"
                       Margin="110,115,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltiesInput_Changed" Unchecked="ConsiderPenaltiesInput_Changed"/>
-            <CheckBox x:Name="ConsiderPenaltyInput" Content="Strafen bei Unterlieferungen (GA)"
+            <CheckBox x:Name="ConsiderPenaltyInput" IsChecked="{Binding ConsiderPenalty, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Strafen bei Unterlieferungen (GA)"
                       Margin="110,135,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
-            <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
+            <CheckBox x:Name="ConsiderAutoInput" IsChecked="{Binding ConsiderAuto, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
-            <CheckBox x:Name="ConsiderCustomInput" Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
+            <CheckBox x:Name="ConsiderCustomInput" IsChecked="{Binding ConsiderCustom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
                       Margin="110,175,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderCustomInput_Changed" Unchecked="ConsiderCustomInput_Changed"/>
             <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,195,10,10"/>
@@ -206,7 +226,8 @@
                     </Style>
                 </Grid.Resources>
 
-                <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
+                <Button x:Name="EditButton" IsEnabled="{Binding IsPaymentVariantSelected}"
+                        Content="{Binding EditText}" Grid.Column="0" Grid.Row="2"
                         Click="EditButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
                 <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
@@ -219,12 +240,13 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
+                <Button x:Name="CalculateButton" IsEnabled="{Binding CalculateIsEnabled}"
+                        Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
-                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
+                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3"/>
                 <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
                         Click="PaymentAdjustmentButton_Click"/>
-                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" x:Name="Arrow4" RenderTransformOrigin="0.5,0.5" >
+                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" RenderTransformOrigin="0.5,0.5" >
                     <Label.RenderTransform>
                         <TransformGroup>
                             <RotateTransform Angle="-45"/>
@@ -232,16 +254,19 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="CommitButton" IsEnabled="{Binding CommitIsEnabled}" Visibility="{Binding CommitVisibility}"
+                        Content="Festsetzen" Grid.Column="4" Grid.Row="2"
                         Click="CommitButton_Click"/>
-                <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="RevertButton" IsEnabled="{Binding RevertIsEnabled}" Visibility="{Binding RevertVisibility}"
+                        Content="Freigeben" Grid.Column="4" Grid.Row="2"
                         Click="RevertButton_Click"/>
-                <Button x:Name="SaveButton" Content="Speichern" Grid.Column="4" Grid.Row="0"
+                <Button x:Name="SaveButton" IsEnabled="{Binding SaveIsEnabled}"
+                        Content="Speichern" Grid.Column="4" Grid.Row="0"
                         Click="SaveButton_Click"/>
             </Grid>
 
-            <Button x:Name="MailButton"
+            <Button x:Name="MailButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30" IsEnabled="False"
+                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30"
                     Click="MailButton_Click"
                     VerticalAlignment="Bottom" HorizontalAlignment="Right" HorizontalContentAlignment="Stretch" Grid.Column="1">
                 <Grid>
@@ -273,35 +298,35 @@
             <StatusBarItem Grid.Column="0" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Zu-/Abschl.:"/>
-                    <TextBlock x:Name="ModifierSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusModifierSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Gesamt:"/>
-                    <TextBlock x:Name="TotalSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusTotalSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="MwSt.:"/>
-                    <TextBlock x:Name="VatSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusVatSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Abzüge:"/>
-                    <TextBlock x:Name="DeductionSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusDeductionSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="7"/>
             <StatusBarItem Grid.Column="8" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Auszahl.:"/>
-                    <TextBlock x:Name="PaymentSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusPaymentSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
         </StatusBar>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -1,29 +1,27 @@
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using Elwig.Services;
+using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
 using System;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Elwig.Helpers.Billing;
-using Elwig.Helpers.Export;
-using Microsoft.Win32;
-using System.Text.Json;
-using Elwig.Documents;
 
 namespace Elwig.Windows {
     public partial class PaymentVariantsWindow : ContextWindow {
 
-        public readonly int Year;
+        public PaymentVariantsViewModel ViewModel => (PaymentVariantsViewModel)DataContext;
-        public readonly bool SeasonLocked;
-        private bool DataValid, DataChanged, NameChanged, CommentChanged, DateValid, DateChanged, TransferDateValid, TransferDateChanged;
-        private BillingData? BillingData;
-        private bool WeightModifierChanged = false;
 
-        private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
+        public readonly int Year;
+        private bool DataValid, DataChanged, NameChanged, CommentChanged, DateValid, DateChanged, TransferDateValid, TransferDateChanged;
 
         private readonly RoutedCommand CtrlL = new("CtrlL", typeof(MemberAdminWindow), [new KeyGesture(Key.L, ModifierKeys.Control)]);
         private readonly RoutedCommand CtrlP = new("CtrlP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]);
@@ -38,7 +36,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_SummaryPrint_Click));
             Year = year;
             using (var ctx = new AppDbContext()) {
-                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+                ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
             }
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
@@ -57,257 +55,95 @@ namespace Elwig.Windows {
                 .OrderBy(v => v.AvNr)
                 .Include(v => v.Season.Currency)
                 .ToListAsync());
-            await Update();
+            Update();
         }
 
-        private async Task Update() {
+        private void Update() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
-                var locked = !v.TestVariant;
+                ViewModel.FillInputs(v);
-                DeleteButton.IsEnabled = !locked;
-                CalculateButton.IsEnabled = !locked;
-                CommitButton.IsEnabled = !locked && !SeasonLocked;
-                CommitButton.Visibility = !locked ? Visibility.Visible : Visibility.Hidden;
-                RevertButton.IsEnabled = locked && !SeasonLocked;
-                RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
-                Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
-                Arrow4.Content = locked ? "\xF0B0" : "\xF0AF";
-                CopyButton.IsEnabled = true;
-                EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
-                EditButton.IsEnabled = true;
-                SaveButton.IsEnabled = !locked;
-                MailButton.IsEnabled = true;
-                Menu_ExportSave.IsEnabled = locked;
-                Menu_EbicsSave.IsEnabled = locked;
-                Menu_SummaryExport.IsEnabled = true;
-                Menu_SummaryShow.IsEnabled = true;
-                Menu_SummarySave.IsEnabled = true;
-                Menu_SummaryPrint.IsEnabled = true;
-
-                NameInput.Text = v.Name;
-                NameInput.IsReadOnly = false;
-                CommentInput.Text = v.Comment;
-                CommentInput.IsReadOnly = false;
-                DateInput.Text = $"{v.Date:dd.MM.yyyy}";
-                DateInput.IsReadOnly = false;
-                TransferDateInput.Text = $"{v.TransferDate:dd.MM.yyyy}";
-                TransferDateInput.IsReadOnly = false;
-                try {
-                    BillingData = BillingData.FromJson(v.Data);
-                    ConsiderModifiersInput.IsChecked = BillingData.ConsiderDelieryModifiers;
-                    ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
-                    ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
-                    ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
-                    ConsiderCustomInput.IsChecked = BillingData.ConsiderCustomModifiers;
-                    if (BillingData.NetWeightModifier != 0) {
-                        WeightModifierInput.Text = $"{Math.Round(BillingData.NetWeightModifier * 100.0, 8)}";
-                    } else if (BillingData.GrossWeightModifier != 0) {
-                        WeightModifierInput.Text = $"{Math.Round(BillingData.GrossWeightModifier * 100.0, 8)}";
-                    } else {
-                        WeightModifierInput.Text = "";
-                    }
-                    DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
-                } catch {
-                    BillingData = null;
-                    ConsiderModifiersInput.IsChecked = false;
-                    ConsiderPenaltiesInput.IsChecked = false;
-                    ConsiderPenaltyInput.IsChecked = false;
-                    ConsiderAutoInput.IsChecked = false;
-                    ConsiderCustomInput.IsChecked = false;
-                    WeightModifierInput.Text = "";
-                    DataInput.Text = v.Data;
-                }
-                WeightModifierInput.IsReadOnly = false;
-                ConsiderModifiersInput.IsEnabled = !locked;
-                ConsiderPenaltiesInput.IsEnabled = !locked;
-                ConsiderPenaltyInput.IsEnabled = !locked;
-                ConsiderAutoInput.IsEnabled = !locked;
-                ConsiderCustomInput.IsEnabled = !locked;
-                DataInput.IsReadOnly = locked;
             } else {
-                EditButton.Content = "Bearbeiten";
+                ViewModel.ClearInputs();
-                EditButton.IsEnabled = false;
-                SaveButton.IsEnabled = false;
-                CopyButton.IsEnabled = false;
-                CalculateButton.IsEnabled = false;
-                CommitButton.IsEnabled = false;
-                CommitButton.Visibility = Visibility.Visible;
-                RevertButton.IsEnabled = false;
-                RevertButton.Visibility = Visibility.Hidden;
-                Arrow3.Content = "\xF0AF";
-                Arrow4.Content = "\xF0AF";
-                DeleteButton.IsEnabled = false;
-                MailButton.IsEnabled = false;
-                Menu_ExportSave.IsEnabled = false;
-                Menu_EbicsSave.IsEnabled = false;
-                Menu_SummaryExport.IsEnabled = false;
-                Menu_SummaryShow.IsEnabled = false;
-                Menu_SummarySave.IsEnabled = false;
-                Menu_SummaryPrint.IsEnabled = false;
-
-                BillingData = null;
-                NameInput.Text = "";
-                NameInput.IsReadOnly = true;
-                CommentInput.Text = "";
-                CommentInput.IsReadOnly = true;
-                DateInput.Text = "";
-                DateInput.IsReadOnly = true;
-                TransferDateInput.Text = "";
-                TransferDateInput.IsReadOnly = true;
-                WeightModifierInput.Text = "";
-                WeightModifierInput.IsReadOnly = true;
-                ConsiderModifiersInput.IsChecked = false;
-                ConsiderModifiersInput.IsEnabled = false;
-                ConsiderPenaltiesInput.IsChecked = false;
-                ConsiderPenaltiesInput.IsEnabled = false;
-                ConsiderPenaltyInput.IsChecked = false;
-                ConsiderPenaltyInput.IsEnabled = false;
-                ConsiderAutoInput.IsChecked = false;
-                ConsiderAutoInput.IsEnabled = false;
-                ConsiderCustomInput.IsChecked = false;
-                ConsiderCustomInput.IsEnabled = false;
-                DataInput.Text = "";
-                DataInput.IsReadOnly = true;
             }
-            await UpdateSums();
+            UpdateButtons();
-            UpdateSaveButton();
         }
 
-        private void UpdateSaveButton() {
+        private void UpdateButtons() {
-            SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
+            ViewModel.SaveIsEnabled = PaymentVariantList.SelectedItem != null &&
                 ((DataChanged && DataValid) || NameChanged || CommentChanged ||
                 (DateChanged && DateValid) ||
                 (TransferDateChanged && TransferDateValid) ||
-                (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
+                (ViewModel.ConsiderModifiers != ViewModel.BillingData?.ConsiderDelieryModifiers) ||
-                (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
+                (ViewModel.ConsiderPenalties != ViewModel.BillingData?.ConsiderContractPenalties) ||
-                (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
+                (ViewModel.ConsiderPenalty != ViewModel.BillingData?.ConsiderTotalPenalty) ||
-                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                (ViewModel.ConsiderAuto != ViewModel.BillingData?.ConsiderAutoBusinessShares) ||
-                (ConsiderCustomInput.IsChecked != BillingData?.ConsiderCustomModifiers) ||
+                (ViewModel.ConsiderCustom != ViewModel.BillingData?.ConsiderCustomModifiers) ||
-                WeightModifierChanged);
+                ViewModel.WeightModifierChanged);
-            CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
+            ViewModel.CalculateIsEnabled = !ViewModel.SaveIsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
-            CommitButton.IsEnabled = CalculateButton.IsEnabled;
+            ViewModel.CommitIsEnabled = ViewModel.CalculateIsEnabled;
         }
 
-        private async Task UpdateSums() {
+        private void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is PaymentVar v) {
+            Update();
-                using var ctx = new AppDbContext();
-                var sym = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
-                var modSum = await ctx.PaymentDeliveryParts
-                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
-                    .SumAsync(p => p.AmountValue - p.NetAmountValue);
-                ModifierSum.Text = $"{v.Season.DecFromDb(modSum):N2} {sym}";
-                var totalSum = await ctx.MemberPayments
-                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
-                    .SumAsync(p => p.AmountValue);
-                TotalSum.Text = $"{v.Season.DecFromDb(totalSum):N2} {sym}";
-                var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
-                if (!credits.Any()) {
-                    VatSum.Text = $"- {sym}";
-                    DeductionSum.Text = $"- {sym}";
-                    PaymentSum.Text = $"- {sym}";
-                } else {
-                    // all values in the credit table are stored with precision 2!
-                    TotalSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.NetAmountValue), 2):N2} {sym}";
-                    VatSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.VatAmountValue), 2):N2} {sym}";
-                    DeductionSum.Text = $"{-Utils.DecFromDb(await credits.SumAsync(c => c.ModifiersValue ?? 0), 2):N2} {sym}";
-                    PaymentSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.AmountValue), 2):N2} {sym}";
-                }
-            } else {
-                ModifierSum.Text = "-";
-                TotalSum.Text = "-";
-                VatSum.Text = "-";
-                DeductionSum.Text = "-";
-                PaymentSum.Text = "-";
-            }
-        }
-
-        private async void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            await Update();
         }
 
         private async void AddButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                PaymentVar? v;
+                var v = await PaymentVariantService.CreatePaymentVariant(Year);
-                using (var ctx = new AppDbContext()) {
-                    v = new PaymentVar {
-                        Year = Year,
-                        AvNr = await ctx.NextAvNr(Year),
-                        Name = "Neue Auszahlungsvariante",
-                        TestVariant = true,
-                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                        Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
-                    };
-
-                    ctx.Add(v);
-                    await ctx.SaveChangesAsync();
-                }
-
                 App.HintContextChange();
-
                 ControlUtils.SelectItem(PaymentVariantList, v);
             } catch (Exception exc) {
                 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 erstellen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            Mouse.OverrideCursor = null;
         }
 
         private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar orig)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                PaymentVar? n;
+                PaymentVar n = await orig.Duplicate();
-                using (var ctx = new AppDbContext()) {
-                    n = new PaymentVar {
-                        Year = orig.Year,
-                        AvNr = await ctx.NextAvNr(Year),
-                        Name = $"{orig.Name} (Kopie)",
-                        TestVariant = true,
-                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                        Data = orig.Data,
-                    };
-
-                    ctx.Add(n);
-                    await ctx.SaveChangesAsync();
-                }
-
                 App.HintContextChange();
-
                 ControlUtils.SelectItem(PaymentVariantList, n);
             } catch (Exception exc) {
                 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 kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            Mouse.OverrideCursor = null;
         }
 
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                using (var ctx = new AppDbContext()) {
+                await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);
-                    ctx.Remove(v);
-                    await ctx.SaveChangesAsync();
-                }
                 App.HintContextChange();
             } catch (Exception exc) {
                 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 löschen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            Mouse.OverrideCursor = null;
         }
 
         private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            CalculateButton.IsEnabled = false;
+            ViewModel.CalculateIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                var b = new BillingVariant(v.Year, v.AvNr);
+                await PaymentVariantService.Calculate(v.Year, v.AvNr);
-                await b.Calculate();
+                App.HintContextChange();
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            App.HintContextChange();
             Mouse.OverrideCursor = null;
-            CalculateButton.IsEnabled = true;
+            ViewModel.CalculateIsEnabled = true;
         }
 
         private void EditButton_Click(object sender, RoutedEventArgs evt) {
@@ -336,71 +172,40 @@ namespace Elwig.Windows {
         private async void Menu_SummaryExport_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            var d = new SaveFileDialog() {
+            await PaymentVariantService.GenerateSummary(v, ExportMode.SaveList);
-                FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
-                DefaultExt = "ods",
-                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                Title = $"Variantendaten {v.Name} speichern unter - Elwig"
-            };
-            if (d.ShowDialog() == false)
-                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                using var ctx = new AppDbContext();
-                var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                using var ods = new OdsFile(d.FileName);
-                await ods.AddTable(data);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            Mouse.OverrideCursor = null;
         }
 
         private async void Menu_SummaryShow_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.Show);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.Show);
         }
 
         private async void Menu_SummarySave_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.SavePdf);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.SavePdf);
         }
 
         private async void Menu_SummaryPrint_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.Print);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.Print);
-        }
-
-        private static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            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);
-                await Utils.ExportDocument(doc, mode);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            Mouse.OverrideCursor = null;
         }
 
         private async void CommitButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            CommitButton.IsEnabled = false;
+            ViewModel.CommitIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                var b = new BillingVariant(v.Year, v.AvNr);
+                await PaymentVariantService.Commit(v.Year, v.AvNr);
-                await b.Commit();
+                App.HintContextChange();
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
-            RevertButton.IsEnabled = true;
+            ViewModel.RevertIsEnabled = true;
-            App.HintContextChange();
         }
 
         private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
@@ -412,13 +217,16 @@ namespace Elwig.Windows {
                 "Traubengutschriften löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (res != MessageBoxResult.Yes)
                 return;
-            RevertButton.IsEnabled = false;
+            ViewModel.RevertIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
-            var b = new BillingVariant(v.Year, v.AvNr);
+            try {
-            await b.Revert();
+                await PaymentVariantService.Revert(v.Year, v.AvNr);
-            App.HintContextChange();
+                App.HintContextChange();
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
-            CommitButton.IsEnabled = true;
+            ViewModel.CommitIsEnabled = true;
         }
 
         private async void Menu_EbicsSave_Click(object sender, RoutedEventArgs evt) {
@@ -428,107 +236,39 @@ namespace Elwig.Windows {
                 MessageBox.Show("Überweisungsdatum muss gesetzt sein!", "Exportieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
-
+            await PaymentVariantService.GenerateEbics(v.Year, v.AvNr);
-            using var ctx = new AppDbContext();
-            v = (await ctx.PaymentVariants.FindAsync(v.Year, v.AvNr))!;
-
-            var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
-            if (withoutIban > 0) {
-                var r = MessageBox.Show($"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert.",
-                    "Mitglieder ohne IBAN", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                if (r != MessageBoxResult.OK) return;
-            }
-            var withNegAmount = v.Credits.Count(c => c.Amount <= 0);
-            if (withNegAmount > 0) {
-                var r = MessageBox.Show($"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert.",
-                    "Traubengutschriften mit negativem Betrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.OK);
-                if (r != MessageBoxResult.OK) return;
-            }
-
-            var d = new SaveFileDialog() {
-                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
-                DefaultExt = Ebics.FileExtension,
-                Filter = "EBICS-Datei (*.xml)|*.xml",
-                Title = $"Überweisungsdaten speichern unter - Elwig",
-            };
-            if (d.ShowDialog() == true) {
-                Menu_EbicsSave.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                try {
-                    using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
-                    await e.ExportAsync(Transaction.FromPaymentVariant(v));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                Mouse.OverrideCursor = null;
-                Menu_EbicsSave.IsEnabled = true;
-            }
         }
 
         private async void Menu_ExportSave_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            }
+            await PaymentVariantService.GenerateAccountingList(v.Year, v.AvNr, v.Name);
-            var d = new SaveFileDialog() {
-                FileName = $"{App.Client.NameToken}-Buchungsliste-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.ods",
-                DefaultExt = "ods",
-                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                Title = $"Buchungsliste speichern unter - Elwig"
-            };
-            if (d.ShowDialog() == true) {
-                Menu_ExportSave.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                try {
-                    using var ctx = new AppDbContext();
-                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, v.Year, v.AvNr);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                Mouse.OverrideCursor = null;
-                Menu_ExportSave.IsEnabled = true;
-            }
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || BillingData == null) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                v.Name = NameInput.Text;
+                await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
-                v.Comment = (CommentInput.Text != "") ? CommentInput.Text : null;
-                v.DateString = string.Join("-", DateInput.Text.Split(".").Reverse());
-                v.TransferDateString = (TransferDateInput.Text != "") ? string.Join("-", TransferDateInput.Text.Split(".").Reverse()) : null;
-                var d = App.Config.Debug ? BillingData.FromJson(DataInput.Text) : BillingData;
-                d.ConsiderDelieryModifiers = ConsiderModifiersInput.IsChecked ?? false;
-                d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
-                d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
-                d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
-                d.ConsiderCustomModifiers = ConsiderCustomInput.IsChecked ?? false;
-                var modVal = WeightModifierInput.Text.Length > 0 ? double.Parse(WeightModifierInput.Text) : 0;
-                d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
-                d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
-                WeightModifierChanged = false;
-                v.Data = JsonSerializer.Serialize(d.Data);
-
-                using (var ctx = new AppDbContext()) {
-                    ctx.Update(v);
-                    await ctx.SaveChangesAsync();
-                }
-
                 App.HintContextChange();
-                CommentInput_TextChanged(null, null);
-                ConsiderModifiersInput_Changed(null, null);
-                ConsiderPenaltiesInput_Changed(null, null);
-                ConsiderPenaltyInput_Changed(null, null);
-                ConsiderAutoInput_Changed(null, null);
-                ConsiderCustomInput_Changed(null, null);
-                WeightModifierInput_TextChanged(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
                 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();
+            CommentInput_TextChanged(null, null);
+            DateInput_TextChanged(null, null);
+            TransferDateInput_TextChanged(null, null);
+            ConsiderModifiersInput_Changed(null, null);
+            ConsiderPenaltiesInput_Changed(null, null);
+            ConsiderPenaltyInput_Changed(null, null);
+            ConsiderAutoInput_Changed(null, null);
+            ConsiderCustomInput_Changed(null, null);
+            WeightModifierInput_TextChanged(null, null);
         }
 
         private void ModifierButton_Click(object sender, RoutedEventArgs evt) {
@@ -547,7 +287,7 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(NameInput);
                 NameChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void CommentInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
@@ -562,10 +302,10 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(CommentInput);
                 CommentChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
-        private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void DateInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(DateInput);
                 return;
@@ -583,10 +323,10 @@ namespace Elwig.Windows {
                 DateValid = true;
                 DateChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
-        private void TransferDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void TransferDateInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(TransferDateInput);
                 return;
@@ -604,7 +344,7 @@ namespace Elwig.Windows {
                 TransferDateValid = true;
                 TransferDateChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void DataInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -630,89 +370,89 @@ namespace Elwig.Windows {
                 ControlUtils.SetInputInvalid(DataInput);
                 DataValid = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderModifiersInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
                 return;
             }
-            if (BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderModifiersInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderPenaltiesInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
                 return;
             }
-            if (BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltiesInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderPenaltyInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
                 return;
             }
-            if (BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltyInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderAutoInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
                 return;
             }
-            if (BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderAutoInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderCustomInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
                 return;
             }
-            if (BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderCustomInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             var res = Validator.CheckDecimal(WeightModifierInput, false, 3, 2, true);
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(WeightModifierInput);
                 return;
             }
             var val = WeightModifierInput.Text.Length > 0 && res.IsValid ? double.Parse(WeightModifierInput.Text) : 0;
-            WeightModifierChanged = (val != Math.Round(BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(BillingData.GrossWeightModifier * 100.0, 8)) ||
+            ViewModel.WeightModifierChanged = (val != Math.Round(ViewModel.BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(ViewModel.BillingData.GrossWeightModifier * 100.0, 8)) ||
-                (val == 0 && (BillingData.NetWeightModifier != 0 || BillingData.GrossWeightModifier != 0));
+                (val == 0 && (ViewModel.BillingData.NetWeightModifier != 0 || ViewModel.BillingData.GrossWeightModifier != 0));
-            if (WeightModifierChanged) {
+            if (ViewModel.WeightModifierChanged) {
                 ControlUtils.SetInputChanged(WeightModifierInput);
             } else {
                 ControlUtils.ClearInputState(WeightModifierInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void WeightModifierInput_LostFocus(object sender, RoutedEventArgs evt) {

Elwig/Windows/QueryWindow.xaml.cs

@@ -38,7 +38,7 @@ namespace Elwig.Windows {
             IList<DbColumn> header;
 
             using (var cnx = await AppDbContext.ConnectAsync()) {
-                var cmd = cnx.CreateCommand();
+                using var cmd = cnx.CreateCommand();
                 cmd.CommandText = sqlQuery;
                 using var reader = await cmd.ExecuteReaderAsync();
                 header = await reader.GetColumnSchemaAsync();

Elwig/fetch-resources.bat

@@ -1,5 +0,0 @@
-::mkdir "C:\Program Files\Elwig"
-mkdir "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
-::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"

Installer/Folders.wxs

@@ -1,23 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-	<!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
+    <!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-		<Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="InstallFolderResources" Name="resources">
+          <Directory Id="InstallFolderDocuments" Name="Documents" />
+        </Directory>
+      </Directory>
     </StandardDirectory>
-	
+
-	<!-- C:\ProgramData\Elwig -->
+    <!-- C:\ProgramData\Elwig -->
-	<StandardDirectory Id="CommonAppDataFolder">
+    <StandardDirectory Id="CommonAppDataFolder">
-		<Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)">
+      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
-			<Directory Id="ConfigFolderResources" Name="resources" />
+    </StandardDirectory>
-		</Directory>
+
-	</StandardDirectory>
+    <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
-	  
+    <StandardDirectory Id="ProgramMenuFolder">
-	<!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
+      <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
-	<StandardDirectory Id="ProgramMenuFolder">
+    </StandardDirectory>
-		<Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
+
-	</StandardDirectory>
+    <!-- C:\Users\{USERNAME}\Desktop -->
-	  
+    <StandardDirectory Id="DesktopFolder" />
-	<!-- C:\Users{USERNAME}\Desktop -->
-	<StandardDirectory Id="DesktopFolder" />
   </Fragment>
 </Wix>

Installer/HeatComponents.wxs

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-	  <ComponentGroup Id="HeatComponents">
+    <ComponentGroup Id="HeatComponents">
-		  <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
+      <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
-			  <Exclude Files="..\Elwig\bin\Publish\**.exe" />
+        <Exclude Files="..\Elwig\bin\Publish\**.exe" />
-			  <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
+        <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
-		  </Files>
+      </Files>
-		  <Files Directory="ConfigFolderResources" Include="..\Elwig\Documents\**">
+      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
-			  <Exclude Files="..\Elwig\Documents\**.cs" />
+        <Exclude Files="..\Elwig\Documents\**.cs" />
-		  </Files>
+      </Files>
-	  </ComponentGroup>
+    </ComponentGroup>
   </Fragment>
 </Wix>

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -5,3 +5,43 @@ Elwig
 **El**ektronische **Wi**nzer**g**enossenschaftsverwaltung (Electronic Management for Vintners' Cooperatives).
 
 Further information may be found on [the website](https://elwig.at).
+
+
+About
+=====
+
+**Product:** Elwig  
+**Description:** Electronic Management for Vintners' Cooperatives  
+**Type:** ERP system  
+**Version:** 1.0.1.5 ([Changelog](./CHANGELOG.md))  
+**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
+**Website:** https://elwig.at/  
+**Source code:** https://git.necronda.net/winzer/elwig  
+**Developement period:** 2022–2025
+
+**Technology Stack:**  
+Language: C#  
+Framework: Windows Presentation Framework (WPF)  
+Database: [SQLite](https://sqlite.org/)  
+PDF creation: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
+Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
+
+
+Über
+====
+
+**Produkt:** Elwig  
+**Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
+**Typ:** Warenwirtschaftssystem (ERP-System)  
+**Version:** 1.0.1.5 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
+**Website:** https://elwig.at/  
+**Quellcode:** https://git.necronda.net/winzer/elwig  
+**Entwicklungszeitraum:** 2022–2025
+
+**Verwendete Technologien:**  
+Programmiersprache: C#  
+Framework: Windows Presentation Framework (WPF)  
+Datenbank: [SQLite](https://sqlite.org/)  
+PDF-Erstellung: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
+Paketierung: [WiX Toolset](https://www.firegiant.com/wixtoolset/)