Bump version to 1.0.0.3

2025-08-11 22:55:44 +02:00
26 changed files with 232 additions and 804 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,119 +2,15 @@
 Changelog
 =========

-[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)
+* Die Herkunftshierarchie wird nun auch automatisch synchronisiert (benötigt für Stamm-KG bei Mitglied, und Herkunft bei Lieferung). ([#70][i70])
 * 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


--- a/Elwig/App.xaml
+++ b/Elwig/App.xaml
@@ -35,7 +35,7 @@
        </DataTemplate>
        <DataTemplate x:Key="WineVarietyTemplateExpanded">
            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding SortIdFormat}" Foreground="{Binding Color}" MinWidth="36" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding SortId}" Foreground="{Binding Color}" MinWidth="36" Margin="0,0,10,0"/>
                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
                <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
            </StackPanel>
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -11,7 +11,6 @@ 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;
@@ -132,7 +131,6 @@ namespace Elwig {
                        await CheckForUpdates();
                    });
                }
-                NetworkChange.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
                _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
                _autoUpdateTimer.Start();
            }
@@ -164,16 +162,6 @@ 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();
@@ -230,16 +218,6 @@ namespace Elwig {
            }
        }

-        private void OnNetworkAvailabilityChanged(object? sender, NetworkAvailabilityEventArgs evt) {
-            if (!evt.IsAvailable) return;
-            if (Utils.HasInternetConnectivity()) {
-                Utils.RunBackground("Auto Updater", async () => {
-                    await Task.Delay(500);
-                    await CheckForUpdates();
-                });
-            }
-        }
-
        public static async Task CheckForUpdates(bool showAlert = false) {
            if (Config.UpdateUrl == null) return;
            var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
@@ -264,9 +242,7 @@ namespace Elwig {

        public static async Task ReplaceDatabase(string filename) {
            try {
-                await Task.Run(async () => {
-                    await Database.Import(filename);
-                });
+                await ElwigData.ImportDatabase(filename);
                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
                ForceShutdown = true;
                Current.Shutdown();
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.1.2</Version>
+    <Version>1.0.0.3</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -25,19 +25,19 @@
    <PackageReference Include="LinqKit" Version="1.3.8" />
    <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.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3405.78" />
    <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.56" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <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" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.1" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.8" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.8" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.8" />
  </ItemGroup>

 </Project>
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@@ -248,6 +248,13 @@ 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 {
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/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 = 33;
+        public static readonly int RequiredSchemaVersion = 32;

        private static int VersionOffset = 0;

--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@@ -19,6 +19,14 @@ 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;
--- a/Elwig/Helpers/Config.cs
+++ b/Elwig/Helpers/Config.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -6,8 +5,6 @@ using Microsoft.Extensions.Configuration;

 namespace Elwig.Helpers {

-    public enum WeighingMode { Gross, Net, Box }
-
    public record struct ScaleConfig {
        public string Id;
        public string? Type;
@@ -44,7 +41,6 @@ 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;
@@ -78,8 +74,6 @@ 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"];
--- a/Elwig/Helpers/Export/Database.cs
+++ b/Elwig/Helpers/Export/Database.cs
@@ -1,243 +0,0 @@
-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);
-            }
-        }
-    }
-}
--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using System.Windows;
@@ -17,6 +18,8 @@ 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);
@@ -74,117 +77,97 @@ namespace Elwig.Helpers.Export {
                    int? DeliveryNum, string? DeliveryFilters)>();

                foreach (var filename in filenames) {
-                    try {
-                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
-                            ["member"] = [],
-                            ["area_commitment"] = [],
-                            ["delivery"] = [],
-                        })));
-                        var r = data[^1];
+                    // TODO read encrypted files
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                    await zip.CheckIntegrity();

-                        // TODO read encrypted files
-                        using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
-                        await zip.CheckIntegrity();
+                    var version = zip.GetEntry("version");
+                    using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
+                        if (await reader.ReadToEndAsync() != "elwig:1")
+                            throw new FileFormatException($"Ungültige Export-Datei ({filename})");
+                    }

-                        var version = zip.GetEntry("version");
-                        using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                            if (await reader.ReadToEndAsync() != "elwig:1")
-                                throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
-                        }
+                    var metaJson = zip.GetEntry("meta.json");
+                    var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                    var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                    var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
+                    var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var 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));

-                        var metaJson = zip.GetEntry("meta.json");
-                        var meta = await JsonNode.ParseAsync(metaJson!.Open());
-                        var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
-                        var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var 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([], [], [], [], new() {
+                        ["member"] = [],
+                        ["area_commitment"] = [],
+                        ["delivery"] = [],
+                    })));
+                    var r = data[^1];

-                        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 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 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, timestamps) = obj.ToMember(kgs);
-                                r.Members.Add(m);
-                                if (b != null) r.BillingAddresses.Add(b);
-                                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 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, timestamps) = obj.ToMember(kgs);
+                            r.Members.Add(m);
+                            if (b != null) r.BillingAddresses.Add(b);
+                            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 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));
+                    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));
                        }
                    }
                }
@@ -422,6 +405,29 @@ namespace Elwig.Helpers.Export {
            }.Export(filename);
        }

+        public static async Task ImportDatabase(string filename) {
+            var oldName = Path.ChangeExtension(App.Config.DatabaseFile, ".old.sqlite3");
+            var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+            try {
+                using (var zip = ZipFile.Open(filename, ZipArchiveMode.Read)) {
+                    await zip.CheckIntegrity();
+                    var db = zip.GetEntry("database.sqlite3")!;
+                    db.ExtractToFile(newName, true);
+                }
+                File.Move(App.Config.DatabaseFile, oldName, true);
+                File.Move(newName, App.Config.DatabaseFile, false);
+            } finally {
+                if (File.Exists(newName))
+                    File.Delete(newName);
+            }
+        }
+
+        public static void ExportDatabase(string filename) {
+            File.Delete(filename);
+            using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+            var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
+        }
+
        public class ElwigExport {
            public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
            public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
@@ -466,7 +472,7 @@ 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(Utils.JsonOpts));
+                    await writer.WriteAsync(obj.ToJsonString(JsonOpts));
                }

                // TODO encrypt files
@@ -474,28 +480,28 @@ namespace Elwig.Helpers.Export {
                    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));
+                        await writer.WriteLineAsync(k.ToJson().ToJsonString(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(Utils.JsonOpts));
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(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(Utils.JsonOpts));
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(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(Utils.JsonOpts));
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(JsonOpts));
                    }
                }
            }
@@ -823,7 +829,7 @@ namespace Elwig.Helpers.Export {
                    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),
+                    WeighingData = p["weighing_data"]?.AsObject().ToJsonString(JsonOpts),
                    WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
                };
            }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@@ -1,42 +1,41 @@
+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 Elwig.Documents;
-using Elwig.Helpers.Billing;
-using Elwig.Models;
+using System.Text;
+using System.Numerics;
 using Elwig.Models.Entities;
-using LinqKit;
+using Elwig.Helpers.Billing;
+using System.Runtime.InteropServices;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.IO;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.EntityFrameworkCore;
-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.Collections;
+using Elwig.Documents;
+using MimeKit;
+using System.Windows.Input;
+using LinqKit;
+using System.Linq.Expressions;
+using Elwig.Models;
+using Microsoft.Win32;
+using System.Globalization;
 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);
@@ -431,8 +430,6 @@ 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));
@@ -501,7 +498,10 @@ 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,15 +529,18 @@ namespace Elwig.Helpers {
                }
                return true;
            });
+
+            Mouse.OverrideCursor = null;
+            return success;
        }

-        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member Member, string Subject, string Text)? emailData = null) {
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? 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.Member, e.Subject, e.Text, [doc]);
+                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
                if (success)
                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
                        MessageBoxButton.OK, MessageBoxImage.Information);
@@ -564,7 +567,9 @@ namespace Elwig.Helpers {
                Log = "Application",
                Source = ".NET Runtime",
            };
-            return [.. log.Entries.OfType<EventLogEntry>().Where(e => e.InstanceId == 1026).Where(e => e.Message.StartsWith("Application: Elwig.exe"))];
+            return log.Entries.Cast<EventLogEntry>()
+                .Where(e => e.Message.StartsWith("Application: Elwig.exe"))
+                .ToList();
        }

        public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
--- a/Elwig/Models/Entities/WineVar.cs
+++ b/Elwig/Models/Entities/WineVar.cs
@@ -11,24 +11,16 @@ 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() { }
@@ -36,7 +28,6 @@ namespace Elwig.Models.Entities {
        public WineVar(string sortId, string name) {
            SortId = sortId;
            Name = name;
-            MaxQualId = "QUW";
        }

        public override string ToString() {
--- a/Elwig/Resources/Sql/32-33.sql
+++ b/Elwig/Resources/Sql/32-33.sql
@@ -1,17 +0,0 @@
-- 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);
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@@ -721,11 +721,9 @@ 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",
-                    AddExtension = false,
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                    Mouse.OverrideCursor = Cursors.Wait;
                    await Task.Run(async () => {
                        try {
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@@ -496,13 +496,11 @@ 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",
-                    AddExtension = false,
+                    Title = $"{MemberList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
                    Mouse.OverrideCursor = Cursors.Wait;
                    await Task.Run(async () => {
                        try {
--- a/Elwig/Windows/AboutWindow.xaml
+++ b/Elwig/Windows/AboutWindow.xaml
@@ -1,32 +0,0 @@
-<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>
--- a/Elwig/Windows/AboutWindow.xaml.cs
+++ b/Elwig/Windows/AboutWindow.xaml.cs
@@ -1,17 +0,0 @@
-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 });
-        }
-    }
-}
--- a/Elwig/Windows/AdministrationWindow.cs
+++ b/Elwig/Windows/AdministrationWindow.cs
@@ -13,8 +13,8 @@ using System.Windows.Input;
 namespace Elwig.Windows {
    public abstract class AdministrationWindow : ContextWindow {

-        protected Control[] ExemptInputs { get; set; }
-        protected Control[] RequiredInputs { get; set; }
+        protected Control[] ExemptInputs { private get; set; }
+        protected Control[] RequiredInputs { private get; set; }

        private bool _isEditing;
        private bool _isCreating;
@@ -166,10 +166,8 @@ 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;
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -8,7 +8,6 @@ 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;
@@ -35,8 +34,6 @@ namespace Elwig.Windows {

        private readonly Button[] WeighingButtons;

-        private List<WineQualLevel> WineQualityLevels = [];
-
        public DeliveryAdminWindow(bool receipt = false) {
            InitializeComponent();
            CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
@@ -92,9 +89,6 @@ 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;
@@ -284,7 +278,6 @@ namespace Elwig.Windows {
                DateInput.IsReadOnly = false;
                TimeInput.IsReadOnly = false;
                BranchInput.IsEnabled = true;
-                GerebeltGewogenInput.IsEnabled = true;
                if (IsCreating) ViewModel.Time = "";
                OnSecondPassed(null, null);
            }
@@ -294,7 +287,6 @@ namespace Elwig.Windows {
            DateInput.IsReadOnly = true;
            TimeInput.IsReadOnly = true;
            BranchInput.IsEnabled = false;
-            GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode != WeighingMode.Net;
            OnSecondPassed(null, null);
        }

@@ -309,7 +301,7 @@ namespace Elwig.Windows {
        }

        private void InitialDefaultInputs() {
-            if (App.Config.WeighingMode == WeighingMode.Net) {
+            if (App.Client.HasNetWeighing(ViewModel.Branch)) {
                GerebeltGewogenInput.IsEnabled = false;
                SetDefaultValue(GerebeltGewogenInput, true);
            } else {
@@ -318,7 +310,7 @@ namespace Elwig.Windows {
                UnsetDefaultValue(GerebeltGewogenInput);
            }

-            if (App.Config.WeighingMode == WeighingMode.Box) {
+            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
                LesewagenInput.IsEnabled = false;
                SetDefaultValue(LesewagenInput, false);
            } else {
@@ -326,7 +318,7 @@ namespace Elwig.Windows {
                UnsetDefaultValue(LesewagenInput);
            }

-            if (App.Config.WeighingMode != WeighingMode.Net) {
+            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
                HandPickedInput.IsThreeState = false;
                UnsetDefaultValue(HandPickedInput);
            } else {
@@ -352,13 +344,13 @@ namespace Elwig.Windows {
            ClearOriginalValues();
            ClearDefaultValues();

-            ViewModel.IsNetWeight = App.Config.WeighingMode == WeighingMode.Net;
+            ViewModel.IsNetWeight = App.Client.HasNetWeighing(ViewModel.Branch);
            ViewModel.IsLesewagen = false;
-            ViewModel.IsHandPicked = App.Config.WeighingMode != WeighingMode.Net ? true : null;
+            ViewModel.IsHandPicked = !App.Client.HasNetWeighing(ViewModel.Branch) ? true : null;
            ViewModel.IsGebunden = null;
            InitialDefaultInputs();

-            //WineQualityLevelInput.IsEnabled = false;  // disable wine quality level input in Übernahme
+            WineQualityLevelInput.IsEnabled = false;
            ValidateRequiredInputs();
        }

@@ -486,8 +478,7 @@ 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);
-            WineQualityLevels = await ctx.WineQualityLevels.ToListAsync();
-            ControlUtils.RenewItemsSource(WineQualityLevelInput, WineQualityLevels);
+            ControlUtils.RenewItemsSource(WineQualityLevelInput, await ctx.WineQualityLevels.ToListAsync());
            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                .Where(m => m.Year == y && (!IsCreating || m.IsActive))
                .OrderBy(m => m.Ordering)
@@ -1148,7 +1139,6 @@ 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() {
@@ -1211,7 +1201,6 @@ namespace Elwig.Windows {
                AttributeInput.SelectedIndex = 0;
                CultivationInput.SelectedIndex = 0;
            }
-            UpdateWineQualityLevels();
        }

        private void SortIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -1225,39 +1214,19 @@ 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 = WineQualityLevels;
-                WineQualityLevelInput.SelectedItem = null;
+                WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.QualId == "WEI").ToList();
                return;
            }
            var kmw = (double)ViewModel.GradationKmw!;
-            var max = ViewModel.WineVar?.MaxQualId;
-            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);
+            WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.MinKmw == null || q.MinKmw <= kmw).ToList();
+            var qual = ctx.GetWineQualityLevel(kmw).GetAwaiter().GetResult();
            SetDefaultValue(WineQualityLevelInput, qual);
            if (WineQualityLevelInput.SelectedItem == null || (WineQualityLevelInput.SelectedItem is WineQualLevel selected && !selected.IsPredicate)) {
                ControlUtils.SelectItem(WineQualityLevelInput, qual);
@@ -1397,7 +1366,8 @@ namespace Elwig.Windows {
                AbgewertetInput.IsChecked = false;
                return;
            }
-            var defQual = GetWineQualityLevel(ViewModel.GradationKmw!.Value, !(ViewModel.WineVar?.IsQuw ?? true) ? ViewModel.WineVar?.MaxQualId : null);
+            using var ctx = new AppDbContext();
+            var defQual = ctx.GetWineQualityLevel(double.Parse(GradationKmwInput.Text)).GetAwaiter().GetResult();
            AbgewertetInput.IsChecked = !qual.IsPredicate && defQual != qual;
        }

@@ -1419,17 +1389,17 @@ namespace Elwig.Windows {
        }

        private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
            }
-            if (!ViewModel.IsReceipt || App.Config.WeighingMode == WeighingMode.Net) {
+            if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
                GerebeltGewogenInput.IsChecked ??= false;
            }
            CheckBox_Changed(sender, evt);
        }

        private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
            }
            CheckBox_Changed(sender, evt);
--- a/Elwig/Windows/LogWindow.xaml.cs
+++ b/Elwig/Windows/LogWindow.xaml.cs
@@ -1,9 +1,7 @@
 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 {
@@ -13,34 +11,28 @@ namespace Elwig.Windows {
            WindowState = WindowState.Maximized;
        }

-        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                var list = Utils.GetLogEntries()
-                  .Select(e => new {
-                      Event = e,
-                      Lines = e.Message.Split('\n').ToArray(),
-                  })
-                  .Select(e => new {
-                      e.Event,
-                      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,
-                      e.Exception,
-                      ExceptionName = e.Exception?[0].Trim(),
-                      ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
-                      e.Location,
-                  })
-                  .OrderByDescending(e => e.Event.TimeGenerated)
-                  .ToList();
-                await App.MainDispatcher.BeginInvoke(() => {
-                    EventList.ItemsSource = list;
-                    EventList.SelectedIndex = 0;
-                });
-            });
-            Mouse.OverrideCursor = null;
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            var log = Utils.GetLogEntries();
+            EventList.ItemsSource = log
+                .Select(e => new {
+                    Event = e,
+                    Lines = e.Message.Split('\n').ToArray(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    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,
+                    e.Exception,
+                    ExceptionName = e.Exception?[0].Trim(),
+                    ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
+                    e.Location,
+                })
+                .OrderByDescending(e => e.Event.TimeGenerated)
+                .ToList();
+            EventList.SelectedIndex = 0;
        }

        private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@@ -31,17 +31,6 @@
                    </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;"/>
@@ -72,7 +61,7 @@
                </MenuItem>
            </MenuItem>
            <MenuItem x:Name="HelpMenu" Header="Hilfe">
-                <MenuItem Header="Über" Click="Menu_Help_About_Click">
+                <MenuItem Header="Über">
                    <MenuItem.Icon>
                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE946;"/>
                    </MenuItem.Icon>
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -59,11 +59,6 @@ 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);
        }
@@ -151,50 +146,6 @@ 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;
@@ -292,23 +243,21 @@ namespace Elwig.Windows {
            await Task.Run(async () => {
                try {
                    var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    var files = data
+                    var file = 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();
+                        .Where(f => f.Name == "database.sqlite3.zip")
+                        .FirstOrDefault();

-                    if (files.Count == 0) {
+                    if (file == null) {
                        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);
@@ -352,8 +301,8 @@ namespace Elwig.Windows {
            Mouse.OverrideCursor = Cursors.Wait;
            await Task.Run(async () => {
                try {
-                    var path = Path.Combine(App.TempPath, "database.sql.zip");
-                    await Database.ExportSql(path, true);
+                    var path = Path.Combine(App.TempPath, "database.sqlite3.zip");
+                    ElwigData.ExportDatabase(path);
                    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);
--- a/Elwig/Windows/QueryWindow.xaml.cs
+++ b/Elwig/Windows/QueryWindow.xaml.cs
@@ -38,7 +38,7 @@ namespace Elwig.Windows {
            IList<DbColumn> header;

            using (var cnx = await AppDbContext.ConnectAsync()) {
-                using var cmd = cnx.CreateCommand();
+                var cmd = cnx.CreateCommand();
                cmd.CommandText = sqlQuery;
                using var reader = await cmd.ExecuteReaderAsync();
                header = await reader.GetColumnSchemaAsync();
--- a/README.md
+++ b/README.md
@@ -5,43 +5,3 @@ 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.2 ([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.2 ([Ä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/)
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -13,7 +13,7 @@
  </Target>
  <ItemGroup>
    <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.1" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.1" />
  </ItemGroup>
 </Project>
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=33" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=32" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"