Tests: Update dependencies

Elwig: Update dependencies
[#20 ] MemberAdminWindow: Add MemberBusinessSharesAdminWindow to manage member shares
2026-07-09 00:05:58 +02:00 · 2026-07-09 00:05:58 +02:00 · 2026-07-09 00:05:47 +02:00
55 changed files with 432 additions and 854 deletions
@@ -2,7 +2,7 @@ name: Test
 on:
  push:
    branches: ["**"]
-    paths: ["Elwig/**", "Tests/**", ".gitea/workflows/test.yaml"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"]
 jobs:
  test:
    name: Run tests
@@ -2,100 +2,6 @@
 Changelog
 =========

-[v1.1.1.0][v1.1.1.0] (2026-08-19) {#v1.1.1.0}
---------------------------------------------
-
-### Sonstiges {#v1.1.1.0-misc}
-
-* Bei der BKI-Traubentransportscheinliste werden Volllieferanten/Vollablieferer nun auch als solche markiert. (20b6e11b7f)
-
-[v1.1.1.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.1.0
-
-
-
-
-[v1.1.0.3][v1.1.0.3] (2026-08-17) {#v1.1.0.3}
---------------------------------------------
-
-### Sonstiges {#v1.1.0.3-misc}
-
-* Beim Drucken mehrerer Kopien einer PDF-Datei wird nun nur mehr ein einzelner Druck-Auftrag verwendet. (fc5ad82686)
-* Beim Synchronisieren können Geräte als Hauptgerät festgelegt werden. (eaddf0c3cb)
-* Abhängigkeiten aktualisiert. (e6e140dc08, 58bfb4f56d)
-
-[v1.1.0.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.3
-
-
-
-
-[v1.1.0.2][v1.1.0.2] (2026-08-11) {#v1.1.0.2}
---------------------------------------------
-
-### Neue Funktionen {#v1.1.0.2-features}
-
-* Es ist nun möglich zwischen dem Senden von E-Mail einige Sekunden zu warten (Konfigurationsdatei -> `[smtp]` -> `wait = 0.5`). (76ea3513ac)
-
-### Behobene Fehler {#v1.1.0.2-bugfixes}
-
-* Beim Drucken von Dokumenten waren die Seitenränder nicht korrekt. (f13a836ebd, 20b19775b1, 470c6e09e5, 07b197958d)
-
-[v1.1.0.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.2
-
-
-
-
-[v1.1.0.1][v1.1.0.1] (2026-08-05) {#v1.1.0.1}
---------------------------------------------
-
-### Neue Funktionen {#v1.1.0.1-features}
-
-* Auf Lieferscheinen sind nun Waage und Terminal angegeben. (309f118739)
-* Beim Starten von Elwig wird Datum/Uhrzeit auf allen angeschlossenen Waagen gesetzt. (2a3999f300)
-
-### Behobene Fehler {#v1.1.0.1-bugfixes}
-
-* Im Stammdaten-Fenster (`BaseDataWindow`) war es nach einem Fehler beim Bearbeiten bis zum Schließen des Fensters nicht mehr möglich zu speichern. ([#82][i82])
-
-### Sonstiges {#v1.1.0.1-misc}
-
-* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`)...
-  * wurde auf 3 Knöpfen das Symbol "in neuem Fenster öffnen" hinzugefügt. (88616b2c0b)
-  * wird beim "Speichern" die Variante automatisch auch berechnet um Fehler/Missverständnisse zu vermeiden. ([#83][i83])
-* Abhängigkeiten aktualisiert. (b445928c4d, 668030fbff, a8cc3c9cb9)
-
-[v1.1.0.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.1
-[i82]: https://git.necronda.net/winzer/elwig/issues/82
-[i83]: https://git.necronda.net/winzer/elwig/issues/83
-
-
-
-
-[v1.1.0.0][v1.1.0.0] (2026-07-09) {#v1.1.0.0}
---------------------------------------------
-
-### Neue Funktionen {#v1.1.0.0-features}
-
-* Per Opt-In Einstellung in den Stammdaten ist es nun möglich Mitgliederbewegungen und Verläufe von Geschäftsanteilen mit Elwig zu erfassen. ([#20][i20])
-* Es wird nun unterstützt verschiedene Typen von Geschäftsanteilen pro Mitglied zu erfassen (normal, rot, weiß, ruhend). ([#80][i80])
-
-### Behobene Fehler {#v1.1.0.0-bugfixes}
-
-* Falls die Datenbank für die momentan verwndete Elwig-Version zu neu war kam es beim Überprüfen auf ein Update zu einem Fehler. (4ebe07f579)
-* Im Stammdatenblatt (`MemberDataSheet`) wurde die Stamm-Zweigstelle nicht angeführt. (a71c41af5c)
-
-### Sonstiges {#v1.1.0.0-misc}
-
-* In der Buchungsliste (`CreditNoteData`) wird nun auch das Buchhaltungskonto der Mitglieder angeführt. (000117dc67)
-* Viele kleine Verbesserungen der Code-Qualität. (u.a. fcd0555e4d, 69efca1cc3,  beacba6bd9, 1169ba5101)
-* Abhängigkeiten aktualisiert. (e8789aff37, 2350b55cea)
-
-[v1.1.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.0
-[i20]: https://git.necronda.net/winzer/elwig/issues/20
-[i80]: https://git.necronda.net/winzer/elwig/issues/80
-
-
-
-
 [v1.0.5.6][v1.0.5.6] (2026-06-25) {#v1.0.5.6}
 ---------------------------------------------

@@ -358,7 +264,7 @@ Changelog

 [v1.0.3.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.0
 [i50]: https://git.necronda.net/winzer/elwig/issues/50
-[i66]: https://git.necronda.net/winzer/elwig/issues/66
+[i66]: https://git.necronda.net/winzer/elwig/issues/60
 [i71]: https://git.necronda.net/winzer/elwig/issues/71
 [i73]: https://git.necronda.net/winzer/elwig/issues/73

@@ -145,13 +145,7 @@ namespace Elwig {
            var list = new List<IScale>();
            foreach (var s in Config.Scales) {
                try {
-                    var scale = Scale.FromConfig(s);
-                    if (scale is ICommandScale cmd) {
-                        try {
-                            await cmd.SetDateAndTime(DateTime.Now);
-                        } catch { }
-                    }
-                    list.Add(scale);
+                    list.Add(Scale.FromConfig(s));
                } catch (Exception exc) {
                    list.Add(new InvalidScale(s.Id));
                    if (s.Required)
@@ -181,8 +181,8 @@ namespace Elwig.Documents {
                    }
                } else {
                    var info = part.WeighingInfo;
-                    weighing.Add(Italic("Waage/Terminal:"))
-                        .Add(Normal(" " + (info.ScaleId ?? "?") + "/" + (part.ScaleTerminalId ?? "?") + ", "))
+                    weighing.Add(Italic("Waage:"))
+                        .Add(Normal(" " + (part.ScaleId ?? "?") + ", "))
                        .Add(Italic("ID:"))
                        .Add(Normal(" " + (info.Id ?? "?")));
                    if (info.Date != null || info.Time != null)
@@ -9,10 +9,10 @@
    <UseWindowsForms>true</UseWindowsForms>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.1.1.0</Version>
+    <Version>1.0.5.6</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ApplicationManifest>App.manifest</ApplicationManifest>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>

  <ItemGroup>
@@ -23,21 +23,21 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="153.0.8009" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="152.0.7934" />
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
    <PackageReference Include="itext" Version="9.7.0" />
    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
    <PackageReference Include="LinqKit" Version="1.3.11" />
    <PackageReference Include="MailKit" Version="4.17.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4078.44" />
    <PackageReference Include="NJsonSchema" Version="11.6.1" />
    <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.11" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.11" />
-    <PackageReference Include="System.Management" Version="10.0.11" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.9" />
+    <PackageReference Include="System.Management" Version="10.0.9" />
  </ItemGroup>

 </Project>
@@ -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 = 41;
+        public static readonly int RequiredSchemaVersion = 40;

        private static int VersionOffset = 0;

@@ -50,7 +50,6 @@ namespace Elwig.Helpers {
        public string? SyncUrl = null;
        public string SyncUsername = "";
        public string SyncPassword = "";
-        public bool SyncMain = false;

        public string? SmtpHost = null;
        public int? SmtpPort = null;
@@ -58,10 +57,9 @@ namespace Elwig.Helpers {
        public string? SmtpUsername = null;
        public string? SmtpPassword = null;
        public string? SmtpFrom = null;
-        public double SmtpWait = 0;
-        public (string Host, int Port, string Mode, string Username, string Password, string From, double Wait)? Smtp =>
+        public (string Host, int Port, string Mode, string Username, string Password, string From)? Smtp =>
            SmtpHost == null || SmtpPort == null || SmtpMode == null || SmtpUsername == null || SmtpPassword == null || SmtpFrom == null ?
-            null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom, SmtpWait);
+            null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom);

        public IList<ScaleConfig> Scales;
        private readonly List<ScaleConfig> ScaleList = [];
@@ -87,7 +85,6 @@ namespace Elwig.Helpers {
            SyncUrl = config["sync:url"];
            SyncUsername = config["sync:username"] ?? "";
            SyncPassword = config["sync:password"] ?? "";
-            SyncMain = TrueValues.Contains(config["sync:main"]?.ToLower());

            SmtpHost = config["smtp:host"];
            SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null;
@@ -95,7 +92,6 @@ namespace Elwig.Helpers {
            SmtpUsername = config["smtp:username"];
            SmtpPassword = config["smtp:password"];
            SmtpFrom = config["smtp:from"];
-            SmtpWait = double.TryParse(config["smtp:wait"], out var res) ? res : 0;

            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order();
            ScaleList.Clear();
@@ -6,7 +6,7 @@ using System;

 namespace Elwig.Helpers.Export {

-    using Row = Tuple<(string?, string?, string?, string?, string, int, string, bool, int), (string, int, string, string, string, int, string, double, double)>;
+    using Row = Tuple<(string?, string?, string?, string?, string, int, string, int), (string, int, string, string, string, int, string, double, double)>;

    public class Bki : Csv<Row> {

@@ -29,7 +29,7 @@ namespace Elwig.Helpers.Export {
            using var cnx = await AppDbContext.ConnectAsync();
            using var cmd = cnx.CreateCommand();
            cmd.CommandText = $"""
-                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, vollablieferer, area,
+                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area,
                       date, weight, type, sortid, qualid, year, hkid, kmw, oe
                FROM v_bki_delivery
                WHERE year = {year}
@@ -38,8 +38,8 @@ namespace Elwig.Helpers.Export {
            List<Row> rows = [];
            while (await r.ReadAsync()) {
                rows.Add(new(
-                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetBoolean(7), r.GetInt32(8)),
-                    (r.GetString(9), r.GetInt32(10), r.GetString(11), r.GetString(12), r.GetString(13), r.GetInt32(14), r.GetString(15), r.GetDouble(16), r.GetDouble(17))
+                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
+                    (r.GetString(8), r.GetInt32(9), r.GetString(10), r.GetString(11), r.GetString(12), r.GetInt32(13), r.GetString(14), r.GetDouble(15), r.GetDouble(16))
                ));
            }

@@ -52,14 +52,14 @@ namespace Elwig.Helpers.Export {

        public override string FormatRow(Row row) {
            var (member, delivery) = row;
-            var (lfBisNr, familyName, name, billingName, address, plz, ort, vollablieferer, area) = member;
+            var (lfBisNr, familyName, name, billingName, address, plz, ort, area) = member;
            var (date, weight, type, sortid, qualid, year, hkid, kmw, oe) = delivery;

            var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
            var (a1, a2) = Utils.SplitAddress(address);
            var memberData = $"{lfBisNr};{n1};{n2};{a1};\t{a2};{plz};{ort}";
            var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
-            var vollData = $"{(vollablieferer ? "J" : "N")};{(vollablieferer ? area / 10_000.0 : null):N4};{(vollablieferer ? area / 10_000.0 : null):N4};{area / 10_000.0:N4}";
+            var vollData = $"N;;;{area / 10_000.0}";

            return $"{_clientData};{memberData};{deliveryData};{vollData}";
        }
@@ -951,7 +951,7 @@ namespace Elwig.Helpers.Export {
            if (p.Unloading != null) obj["unloading"] = p.Unloading;
            if (p.Temperature != null) obj["temperature"] = p.Temperature;
            if (p.Acid != null) obj["acid"] = p.Acid;
-            if (p.ScaleTerminalId != null) obj["scale_terminal"] = p.ScaleTerminalId;
+            if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
            if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
            if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
            return obj;
@@ -1022,7 +1022,7 @@ namespace Elwig.Helpers.Export {
                    Unloading = p["unloading"]?.AsValue().GetValue<string>() ?? ((p["lesewagen"]?.AsValue().GetValue<bool>() ?? false) ? DeliveryPart.Pumped : null),
                    Temperature = p["temperature"]?.AsValue().GetValue<double>(),
                    Acid = p["acid"]?.AsValue().GetValue<double>(),
-                    ScaleTerminalId = p["scale_terminal"]?.AsValue().GetValue<string>() ?? p["scale_id"]?.AsValue().GetValue<string>(),
+                    ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
                    WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
                    WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
                }, createdAt == null || modifiedAt == null ? null :
@@ -1,6 +1,7 @@
 using Elwig.Services;
 using Elwig.Windows;
 using System;
+using System.Drawing.Printing;
 using System.Threading.Tasks;

 namespace Elwig.Helpers.Printing {
@@ -31,10 +32,20 @@ namespace Elwig.Helpers.Printing {
            });
        }

-        public static Task Print(string path, int copies = 1, bool doublePaged = false) {
+        public static async Task Print(string path, int copies = 1, bool doublePaged = false) {
+            await Print(path, new() {
+                Copies = (short)copies,
+                Collate = true,
+                Duplex = doublePaged ? Duplex.Vertical : Duplex.Simplex,
+            });
+        }
+
+        public static Task Print(string path, PrinterSettings settings) {
            try {
-                var printer = new PdfPrinter();
-                printer.Print(path, copies, doublePaged);
+                using var printDoc = new PdfPrintDocument(path) {
+                    PrinterSettings = settings,
+                };
+                printDoc.Print();
            } catch (Exception exc) {
                InteractionService.ShowException("Fehler beim Drucken", "Beim Drucken ist ein Fehler aufgetreten", exc);
            }
@@ -0,0 +1,102 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Printing;
+using System.Runtime.InteropServices;
+
+namespace Elwig.Helpers.Printing {
+    public class PdfPrintDocument : PrintDocument {
+
+        private readonly IntPtr _handle;
+        private readonly int _pageCount;
+        private readonly double _dpi;
+
+        private int _currentPage;
+
+        public PdfPrintDocument(string path, string? password = null, double dpi = 300.0) :
+            base() {
+            _handle = PdfiumNative.FPDF_LoadDocument(path, password);
+            _pageCount = PdfiumNative.FPDF_GetPageCount(_handle);
+            _dpi = dpi;
+        }
+
+        protected override void Dispose(bool disposing) {
+            PdfiumNative.FPDF_CloseDocument(_handle);
+            base.Dispose(disposing);
+        }
+
+        protected override void OnBeginPrint(PrintEventArgs evt) {
+            _currentPage = (PrinterSettings.FromPage != 0) ? (PrinterSettings.FromPage - 1) : 0;
+            base.OnBeginPrint(evt);
+        }
+
+        protected override void OnPrintPage(PrintPageEventArgs evt) {
+            if (_currentPage < _pageCount) {
+                IntPtr page = PdfiumNative.FPDF_LoadPage(_handle, _currentPage);
+                double width = PdfiumNative.FPDF_GetPageWidth(page);
+                double height = PdfiumNative.FPDF_GetPageHeight(page);
+                int pixelWidth = (int)(width / 72.0 * _dpi);
+                int pixelHeight = (int)(height / 72.0 * _dpi);
+
+                IntPtr bitmap = PdfiumNative.FPDFBitmap_Create(pixelWidth, pixelHeight, 1);
+                PdfiumNative.FPDF_RenderPageBitmap(bitmap, page, 0, 0, pixelWidth, pixelHeight, 0, 0);
+
+                IntPtr buffer = PdfiumNative.FPDFBitmap_GetBuffer(bitmap);
+                int stride = PdfiumNative.FPDFBitmap_GetStride(bitmap);
+                using (var bmp = new Bitmap(pixelWidth, pixelHeight, stride, PixelFormat.Format32bppArgb, buffer)) {
+                    evt.Graphics?.DrawImage(bmp, evt.PageBounds);
+                }
+                _currentPage++;
+
+                PdfiumNative.FPDFBitmap_Destroy(bitmap);
+                PdfiumNative.FPDF_ClosePage(page);
+            }
+            evt.HasMorePages = _currentPage < ((PrinterSettings.ToPage == 0) ? _pageCount : Math.Min(PrinterSettings.ToPage, _pageCount));
+            base.OnPrintPage(evt);
+        }
+    }
+
+    internal partial class PdfiumNative {
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_InitLibrary();
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_DestroyLibrary();
+
+        [LibraryImport("pdfium.dll", StringMarshalling = StringMarshalling.Utf8)]
+        public static partial IntPtr FPDF_LoadDocument(string filePath, string? password);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_CloseDocument(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDF_GetPageCount(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDF_LoadPage(IntPtr document, int pageIndex);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_ClosePage(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageWidth(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageHeight(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_Create(int width, int height, int alpha);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDFBitmap_Destroy(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_GetBuffer(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDFBitmap_GetStride(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_RenderPageBitmap(IntPtr bitmap, IntPtr page, int start_x, int start_y, int size_x, int size_y, int rotate, int flags);
+    }
+}
@@ -1,83 +0,0 @@
-using System;
-using System.IO;
-using System.Printing;
-
-namespace Elwig.Helpers.Printing {
-    public class PdfPrinter {
-
-        public string PrinterName { get; init; }
-
-        public PdfPrinter(string? printerName = null) {
-            PrinterName = printerName ?? GetDefaultPrinterName() ?? throw new InvalidOperationException("No default Windows printer is configured.");
-        }
-
-        public void Print(string pdfPath, int copies = 1, bool doublePaged = false) {
-            if (!File.Exists(pdfPath)) throw new FileNotFoundException("PDF file not found.", pdfPath);
-
-            IntPtr document = PdfiumNative.FPDF_LoadDocument(pdfPath, null);
-            if (document == IntPtr.Zero) throw new InvalidOperationException("PDFium could not open the PDF.");
-
-            try {
-                int pageCount = PdfiumNative.FPDF_GetPageCount(document);
-                if (pageCount <= 0)
-                    return;
-
-                using var printer = new Win32Printer.Printer(PrinterName);
-                printer.TrySetDuplex(doublePaged ? Duplexing.TwoSidedLongEdge : Duplexing.OneSided);
-                printer.StartDocument(Path.GetFileName(pdfPath));
-                bool documentStarted = true;
-                try {
-                    for (int i = 0; i < copies; i++) {
-                        for (int j = 0; j < pageCount; j++) {
-                            PrintPage(document, printer, j);
-                        }
-                    }
-                    printer.EndDocument();
-                    documentStarted = false;
-                } finally {
-                    if (documentStarted) printer.AbortDocument();
-                }
-            } finally {
-                PdfiumNative.FPDF_CloseDocument(document);
-            }
-        }
-
-        private static void PrintPage(IntPtr document, Win32Printer.Printer printer, int pageIndex) {
-            if (!PdfiumNative.FPDF_GetPageSizeByIndex(document, pageIndex, out double pageWidthPt, out double pageHeightPt)) {
-                throw new InvalidOperationException($"Unable to obtain PDF page {pageIndex} size.");
-            }
-
-            IntPtr page = PdfiumNative.FPDF_LoadPage(document, pageIndex);
-            if (page == IntPtr.Zero)
-                throw new InvalidOperationException($"Unable to load PDF page {pageIndex}.");
-
-            try {
-                int renderWidth = (int)Math.Round(pageWidthPt / 72.0 * printer.DpiX);
-                int renderHeight = (int)Math.Round(pageHeightPt / 72.0 * printer.DpiY);
-                int offsetX = (printer.PrintableWidth - renderWidth) / 2;
-                int offsetY = (printer.PrintableHeight - renderHeight) / 2;
-
-                printer.StartPage();
-                try {
-                    PdfiumNative.FPDF_RenderPage(printer.Hdc, page, offsetX, offsetY, renderWidth, renderHeight, 0, PdfiumNative.FPDF_PRINTING | PdfiumNative.FPDF_ANNOT);
-                } finally {
-                    printer.EndPage();
-                }
-            } finally {
-                PdfiumNative.FPDF_ClosePage(page);
-            }
-        }
-
-        private static string? GetDefaultPrinterName() {
-            using var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows NT\CurrentVersion\Windows");
-            string? printer = key?.GetValue("Device") as string;
-            if (string.IsNullOrWhiteSpace(printer))
-                return null;
-
-            // Device has the form:
-            // Printer Name,winspool,PORT
-            int comma = printer.IndexOf(',');
-            return comma >= 0 ? printer[..comma] : printer;
-        }
-    }
-}
@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Elwig.Helpers.Printing {
-    internal partial class PdfiumNative {
-
-        public const int FPDF_ANNOT = 0x01;
-        public const int FPDF_PRINTING = 0x800;
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_InitLibrary();
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_DestroyLibrary();
-
-        [LibraryImport("pdfium.dll", StringMarshalling = StringMarshalling.Utf8)]
-        public static partial IntPtr FPDF_LoadDocument(string filePath, string? password);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_CloseDocument(IntPtr document);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial int FPDF_GetPageCount(IntPtr document);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial IntPtr FPDF_LoadPage(IntPtr document, int pageIndex);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_ClosePage(IntPtr page);
-
-        [LibraryImport("pdfium.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static partial bool FPDF_GetPageSizeByIndex(IntPtr document, int pageIndex, out double width, out double height);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_RenderPage(IntPtr hdc, IntPtr page, int startX, int startY, int sizeX, int sizeY, int rotate, int flags);
-    }
-}
@@ -1,239 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Printing;
-using System.Runtime.InteropServices;
-
-namespace Elwig.Helpers.Printing {
-    public partial class Win32Printer {
-
-        private const int DM_OUT_BUFFER = 2;
-
-        private const int HORZRES = 8;
-        private const int VERTRES = 10;
-        private const int LOGPIXELSX = 88;
-        private const int LOGPIXELSY = 90;
-        private const int PHYSICALWIDTH = 110;
-        private const int PHYSICALHEIGHT = 111;
-        private const int PHYSICALOFFSETX = 112;
-        private const int PHYSICALOFFSETY = 113;
-
-        private const int DM_DUPLEX = 0x1000;
-        private const short DMDUP_SIMPLEX = 1;
-        private const short DMDUP_VERTICAL = 2;
-        private const short DMDUP_HORIZONTAL = 3;
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private struct DOCINFO {
-            public int cbSize;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszDocName;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszOutput;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszDatatype;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private struct DEVMODE {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string dmDeviceName;
-
-            public short dmSpecVersion;
-            public short dmDriverVersion;
-            public short dmSize;
-            public short dmDriverExtra;
-            public int dmFields;
-
-            public short dmOrientation;
-            public short dmPaperSize;
-            public short dmPaperLength;
-            public short dmPaperWidth;
-            public short dmScale;
-            public short dmCopies;
-            public short dmDefaultSource;
-            public short dmPrintQuality;
-            public short dmColor;
-            public short dmDuplex;
-            public short dmYResolution;
-            public short dmTTOption;
-            public short dmCollate;
-
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string dmFormName;
-
-            public short dmLogPixels;
-            public int dmBitsPerPel;
-            public int dmPelsWidth;
-            public int dmPelsHeight;
-            public int dmDisplayFlags;
-            public int dmDisplayFrequency;
-            public int dmICMMethod;
-            public int dmICMIntent;
-            public int dmMediaType;
-            public int dmDitherType;
-            public int dmReserved1;
-            public int dmReserved2;
-            public int dmPanningWidth;
-            public int dmPanningHeight;
-        }
-
-        [DllImport("winspool.drv", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern bool OpenPrinter(string pPrinterName, out IntPtr phPrinter, IntPtr pDefault);
-
-        [DllImport("winspool.drv", SetLastError = true)]
-        private static extern bool ClosePrinter(IntPtr hPrinter);
-
-        [DllImport("winspool.drv", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern int DocumentProperties(IntPtr hwnd, IntPtr hPrinter, string pDeviceName, IntPtr pDevModeOutput, IntPtr pDevModeInput, int fMode);
-
-        [DllImport("gdi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr CreateDC(string? pDriver, string? pDevice, string? pOutput, IntPtr pInitData);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern bool DeleteDC(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int GetDeviceCaps(IntPtr hdc, int index);
-
-        [DllImport("gdi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern int StartDoc(IntPtr hdc, ref DOCINFO lpdi);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int EndDoc(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int AbortDoc(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int StartPage(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int EndPage(IntPtr hdc);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr GlobalAlloc(uint uFlags, UIntPtr dwBytes);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr GlobalFree(IntPtr hMem);
-
-        [DllImport("kernel32.dll")]
-        private static extern IntPtr GlobalLock(IntPtr hMem);
-
-        [DllImport("kernel32.dll")]
-        private static extern bool GlobalUnlock(IntPtr hMem);
-
-        public class Printer : IDisposable {
-            private readonly string _printerName;
-            private readonly IntPtr _printerHandle;
-            private readonly IntPtr _devMode;
-            private readonly IntPtr _hdc;
-
-            public IntPtr Hdc => _hdc;
-
-            public int PrintableWidth => GetDeviceCaps(_hdc, HORZRES);
-            public int PrintableHeight => GetDeviceCaps(_hdc, VERTRES);
-            public int DpiX => GetDeviceCaps(_hdc, LOGPIXELSX);
-            public int DpiY => GetDeviceCaps(_hdc, LOGPIXELSY);
-            public int PhysicalWidth => GetDeviceCaps(_hdc, PHYSICALWIDTH);
-            public int PhysicalHeight => GetDeviceCaps(_hdc, PHYSICALHEIGHT);
-            public int PhysicalOffsetX => GetDeviceCaps(_hdc, PHYSICALOFFSETX);
-            public int PhysicalOffsetY => GetDeviceCaps(_hdc, PHYSICALOFFSETY);
-
-            public Printer(string printerName) {
-                _printerName = printerName;
-
-                if (!OpenPrinter(_printerName, out _printerHandle, IntPtr.Zero)) {
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), $"Unable to open printer '{printerName}'.");
-                }
-
-                try {
-                    _devMode = CreateDevMode();
-                    _hdc = CreateDC(null, _printerName, null, _devMode);
-                    if (_hdc == IntPtr.Zero)
-                        throw new Win32Exception(Marshal.GetLastWin32Error(), $"Unable to create printer DC for '{_printerName}'.");
-                } catch {
-                    if (_devMode != IntPtr.Zero) Marshal.FreeHGlobal(_devMode);
-                    ClosePrinter(_printerHandle);
-                    throw;
-                }
-            }
-
-            public bool TrySetDuplex(Duplexing duplex) {
-                var devMode = Marshal.PtrToStructure<DEVMODE>(_devMode);
-                switch (duplex) {
-                    case Duplexing.OneSided: devMode.dmDuplex = DMDUP_SIMPLEX; break;
-                    case Duplexing.TwoSidedShortEdge: devMode.dmDuplex = DMDUP_HORIZONTAL; break;
-                    case Duplexing.TwoSidedLongEdge: devMode.dmDuplex = DMDUP_VERTICAL; break;
-                }
-                if ((devMode.dmFields & DM_DUPLEX) != 0) {
-                    Marshal.StructureToPtr(devMode, _devMode, false);
-                    return true;
-                } else {
-                    devMode.dmFields |= DM_DUPLEX;
-                    Marshal.StructureToPtr(devMode, _devMode, false);
-                    return false;
-                }
-            }
-
-            private IntPtr CreateDevMode() {
-                int size = DocumentProperties(IntPtr.Zero, _printerHandle, _printerName, IntPtr.Zero, IntPtr.Zero, 0);
-                if (size <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "DocumentProperties failed.");
-
-                IntPtr devMode = Marshal.AllocHGlobal(size);
-                int result = DocumentProperties(IntPtr.Zero, _printerHandle, _printerName, devMode, IntPtr.Zero, DM_OUT_BUFFER);
-                if (result < 0) {
-                    Marshal.FreeHGlobal(devMode);
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "Unable to obtain printer DEVMODE.");
-                }
-
-                return devMode;
-            }
-
-            public void StartDocument(string documentName) {
-                var docInfo = new DOCINFO {
-                    cbSize = Marshal.SizeOf<DOCINFO>(),
-                    lpszDocName = documentName,
-                    lpszDatatype = null,
-                    lpszOutput = null
-                };
-
-                if (StartDoc(_hdc, ref docInfo) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "StartDoc failed.");
-            }
-
-            public void StartPage() {
-                if (Win32Printer.StartPage(_hdc) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "StartPage failed.");
-            }
-
-            public void EndPage() {
-                if (Win32Printer.EndPage(_hdc) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "EndPage failed.");
-            }
-
-            public void EndDocument() {
-                if (EndDoc(_hdc) <= 0)
-                    throw new Win32Exception( Marshal.GetLastWin32Error(), "EndDoc failed.");
-            }
-
-            public void AbortDocument() {
-                AbortDoc(_hdc);
-            }
-
-            public void Dispose() {
-                if (_hdc != IntPtr.Zero)
-                    DeleteDC(_hdc);
-
-                if (_devMode != IntPtr.Zero)
-                    Marshal.FreeHGlobal(_devMode);
-
-                if (_printerHandle != IntPtr.Zero)
-                    ClosePrinter(_printerHandle);
-            }
-        }
-    }
-}
@@ -516,7 +516,7 @@ namespace Elwig.Helpers {
        public static async Task<SmtpClient?> GetSmtpClient() {
            if (App.Config.Smtp == null)
                return null;
-            var (host, port, mode, username, password, _, _) = App.Config.Smtp.Value;
+            var (host, port, mode, username, password, _) = App.Config.Smtp.Value;
            var client = new SmtpClient();
            await client.ConnectAsync(host, port, mode == "starttls" ? SecureSocketOptions.StartTls : SecureSocketOptions.None);
            await client.AuthenticateAsync(username, password);
@@ -9,8 +9,9 @@ namespace Elwig.Helpers.Weighing {
    public class AveryEventScale : Scale, IEventScale, IDisposable {

        public string Manufacturer => "Avery";
+        public int InternalScaleNr => 1;
        public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
        public bool IsReady { get; private set; }
        public bool HasFillingClearance { get; private set; }

@@ -18,11 +19,13 @@ namespace Elwig.Helpers.Weighing {

        private bool IsRunning = true;
        private readonly Thread BackgroundThread;
+        private readonly string Connection;

        public AveryEventScale(string id, string model, string cnx, string? log = null, bool required = true) :
            base(cnx, null, null, null, log, true, !required) {
-            ScaleTerminalId = id;
+            ScaleId = id;
            Model = model;
+            Connection = cnx;
            IsReady = true;
            HasFillingClearance = false;
            Stream.WriteTimeout = -1;
@@ -5,17 +5,18 @@ using System.Text;
 using System.Threading.Tasks;

 namespace Elwig.Helpers.Weighing {
-    public class GassnerEnqScale : Scale, ICommandScale {
+    public class GassnerScale : Scale, ICommandScale {

        public string Manufacturer => "Gassner";
+        public int InternalScaleNr => 1;
        public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
        public bool IsReady { get; private set; }
        public bool HasFillingClearance { get; private set; }

-        public GassnerEnqScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+        public GassnerScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
          base(cnx, empty, filling, limit, log) {
-            ScaleTerminalId = id;
+            ScaleId = id;
            Model = model;
            IsReady = true;
            HasFillingClearance = false;
@@ -23,9 +24,10 @@ namespace Elwig.Helpers.Weighing {
            Stream.ReadTimeout = 11000;
        }

-        protected Task SendCommand(string command) => SendCommand(Encoding.ASCII.GetBytes(command));
+        protected Task SendCommand(char command) => SendCommand(Convert.ToByte(command));

-        protected async Task SendCommand(byte[] cmd) {
+        protected async Task SendCommand(byte command) {
+            byte[] cmd = [command];
            await Stream.WriteAsync(cmd);
            if (LogPath != null) await File.AppendAllTextAsync(LogPath, Encoding.ASCII.GetString(cmd));
        }
@@ -51,15 +53,15 @@ namespace Elwig.Helpers.Weighing {
            return line[1..^1];
        }

-        protected async Task<WeighingResult> Weigh(int? internalScaleNr, bool incIdentNr, bool retry = true) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
            string record;
            try {
-                await SendCommand(incIdentNr ? "\x05" : "?");
+                await SendCommand(incIdentNr ? '\x05' : '?');
                record = await ReceiveResponse();
            } catch (IOException) {
                if (!retry || Tcp == null) throw;
                ReconnectTcp();
-                return await Weigh(internalScaleNr, incIdentNr, false);
+                return await Weigh(incIdentNr, false);
            }
            if (record.Length != 45)
                throw new FormatException("Invalid response from scale: Received record has invalid size");
@@ -78,7 +80,6 @@ namespace Elwig.Helpers.Weighing {
                GrossWeight = int.Parse(brutto),
                TareWeight = int.Parse(tara),
                NetWeight = int.Parse(netto),
-                ScaleId = scaleNr,
                WeighingId = identNr,
                FullWeighingId = identNr,
                Date = DateOnly.TryParseExact(date, "yyyyMMdd", out var d) ? d : null,
@@ -86,12 +87,12 @@ namespace Elwig.Helpers.Weighing {
            };
        }

-        public async Task<WeighingResult> Weigh(int? scaleNr = null) {
-            return await Weigh(scaleNr, true);
+        public async Task<WeighingResult> Weigh() {
+            return await Weigh(true);
        }

-        public async Task<WeighingResult> GetCurrentWeight(int? scaleNr = null) {
-            return await Weigh(scaleNr, false);
+        public async Task<WeighingResult> GetCurrentWeight() {
+            return await Weigh(false);
        }

        public async Task Empty() {
@@ -125,9 +126,8 @@ namespace Elwig.Helpers.Weighing {
            await SetFillingClearance(false);
        }

-        public async Task SetDateAndTime(DateTime dateTime) {
-            await SendCommand($"C{dateTime:yyyyMMddHHmmss}\r");
-            await ReceiveResponse();
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
        }
    }
 }
@@ -10,13 +10,13 @@ namespace Elwig.Helpers.Weighing {
        /// Get the current weight on the scale without performing a weighing process
        /// </summary>
        /// <returns>Result of the weighing process (probably without a weighing id)</returns>
-        Task<WeighingResult> GetCurrentWeight(int? scaleNr = null);
+        Task<WeighingResult> GetCurrentWeight();

        /// <summary>
        /// Perform a weighing process
        /// </summary>
        /// <returns>Result of the weighing process (including a weighing id)</returns>
-        Task<WeighingResult> Weigh(int? scaleNr = null);
+        Task<WeighingResult> Weigh();

        /// <summary>
        /// Empty the scale container or grant clearance to do so
@@ -18,7 +18,12 @@ namespace Elwig.Helpers.Weighing {
        /// <summary>
        /// Unique identificator of the scale
        /// </summary>
-        string ScaleTerminalId { get; }
+        string ScaleId { get; }
+
+        /// <summary>
+        /// Internal identifying number of the scale in its system
+        /// </summary>
+        int InternalScaleNr { get; }

        /// <summary>
        /// Indicates if the scale is currently processing a request or not
@@ -5,7 +5,8 @@ namespace Elwig.Helpers.Weighing {

        public string Manufacturer => "NONE";
        public string Model => "NONE";
-        public string ScaleTerminalId => id;
+        public string ScaleId => id;
+        public int InternalScaleNr => 0;
        public bool IsReady => false;
        public bool HasFillingClearance => false;
        public int? WeightLimit => null;
@@ -28,10 +28,10 @@ namespace Elwig.Helpers.Weighing {
            int? limit = config.Limit != null ? int.Parse(config.Limit) : null;
            if (config.Type == "SysTec-IT") {
                return new SysTecITScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
-            } else if (config.Type == "Gassner-Enq" || config.Type == "Gassner") {
-                return new GassnerEnqScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
-            } else if (config.Type == "Avery-Event" || config.Type == "Avery-Async") {
+            } else if (config.Type == "Avery-Async") {
                return new AveryEventScale(config.Id, config.Model!, config.Connection!, config.Log, config.Required);
+            } else if (config.Type == "Gassner") {
+                return new GassnerScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
            } else {
                throw new ArgumentException($"Invalid scale type: \"{config.Type}\"");
            }
@@ -8,14 +8,15 @@ namespace Elwig.Helpers.Weighing {
    public class SysTecITScale : Scale, ICommandScale {

        public string Manufacturer => "SysTec";
+        public int InternalScaleNr => 1;
        public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
        public bool IsReady { get; private set; }
        public bool HasFillingClearance { get; private set; }

        public SysTecITScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
            base(cnx, empty, filling, limit, log) {
-            ScaleTerminalId = id;
+            ScaleId = id;
            Model = model;
            IsReady = true;
            HasFillingClearance = false;
@@ -73,15 +74,15 @@ namespace Elwig.Helpers.Weighing {
            return line[1..^3];
        }

-        protected async Task<WeighingResult> Weigh(int internalScalNr, bool incIdentNr, bool retry = true) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
            string record;
            try {
-                await SendCommand(incIdentNr ? $"RN{internalScalNr}" : $"RM{internalScalNr}");
+                await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
                record = await ReceiveResponse();
            } catch (IOException) {
                if (!retry || Tcp == null) throw;
                ReconnectTcp();
-                return await Weigh(internalScalNr, incIdentNr, false);
+                return await Weigh(incIdentNr, false);
            }
            if (record.Length != 62)
                throw new FormatException("Invalid response from scale: Received record has invalid size");
@@ -113,7 +114,6 @@ namespace Elwig.Helpers.Weighing {
                GrossWeight = int.Parse(brutto),
                TareWeight = int.Parse(tara),
                NetWeight = int.Parse(netto),
-                ScaleId = scaleNr,
                WeighingId = identNr,
                FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                Date = parsedDate,
@@ -121,12 +121,12 @@ namespace Elwig.Helpers.Weighing {
            };
        }

-        public async Task<WeighingResult> Weigh(int? scaleNr = 1) {
-            return await Weigh(scaleNr ?? 1, true);
+        public async Task<WeighingResult> Weigh() {
+            return await Weigh(true);
        }

-        public async Task<WeighingResult> GetCurrentWeight(int? scaleNr = 1) {
-            return await Weigh(scaleNr ?? 1, false);
+        public async Task<WeighingResult> GetCurrentWeight() {
+            return await Weigh(false);
        }

        public async Task Empty() {
@@ -21,11 +21,6 @@ namespace Elwig.Helpers.Weighing {
        /// </summary>
        public int? NetWeight;

-        /// <summary>
-        /// Reported id of the scale
-        /// </summary>
-        public string? ScaleId;
-
        /// <summary>
        /// Weighing id (or IdentNr) provided by the scale
        /// </summary>
@@ -49,12 +44,11 @@ namespace Elwig.Helpers.Weighing {
        /// <returns>&lt;[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time&gt;</returns>
        public override readonly string ToString() {
            var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
-            return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm:ss}>";
+            return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
        }

        public readonly JsonObject ToJson() {
            var obj = new JsonObject();
-            if (ScaleId != null) obj["scale"] = ScaleId;
            if (FullWeighingId != null) obj["id"] = FullWeighingId;
            if (WeighingId != null) obj["nr"] = int.Parse(WeighingId);
            if (Date != null) obj["date"] = $"{Date:yyyy-MM-dd}";
@@ -118,18 +118,17 @@ namespace Elwig.Models.Entities {
        [Column("acid")]
        public double? Acid { get; set; }

-        [Column("scale_terminal")]
-        public string? ScaleTerminalId { get; set; }
+        [Column("scale_id")]
+        public string? ScaleId { get; set; }

        [Column("weighing_data")]
        public string? WeighingData { get; set; }
        [NotMapped]
-        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
+        public (string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
            get {
                try {
                    var obj = JsonNode.Parse(WeighingData!)!.AsObject();
                    return (
-                        obj["scale"]?.AsValue().GetValue<string>(),
                        obj["id"]?.AsValue().GetValue<string>(),
                        obj["gross_weight"]?.AsValue().GetValue<int>(),
                        obj["tare_weight"]?.AsValue().GetValue<int>(),
@@ -138,7 +137,7 @@ namespace Elwig.Models.Entities {
                        TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue<string>(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null
                    );
                } catch {
-                    return (null, null, null, null, null, null, null);
+                    return (null, null, null, null, null, null);
                }
            }
        }
@@ -3,11 +3,15 @@
 PRAGMA writable_schema = ON;

 ALTER TABLE member RENAME COLUMN business_shares TO shares;
-ALTER TABLE member ADD COLUMN shares_red       INTEGER NOT NULL DEFAULT 0 CHECK (shares_red >= 0);
-ALTER TABLE member ADD COLUMN shares_white     INTEGER NOT NULL DEFAULT 0 CHECK (shares_white >= 0);
-ALTER TABLE member ADD COLUMN shares_dormant   INTEGER NOT NULL DEFAULT 0 CHECK (shares_dormant >= 0);
+ALTER TABLE member ADD COLUMN shares_red       INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE member ADD COLUMN shares_white     INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE member ADD COLUMN shares_dormant   INTEGER NOT NULL DEFAULT 0;

-UPDATE sqlite_schema SET sql = REPLACE(sql, 'shares  INTEGER NOT NULL DEFAULT 0', 'shares           INTEGER NOT NULL DEFAULT 0 CHECK (shares >= 0)')
+UPDATE sqlite_schema SET sql = REPLACE(sql, CHAR(10) ||
+    ') STRICT',
+    ',' || CHAR(10) ||
+    '    CONSTRAINT c_member_shares CHECK (shares >= 0 AND shares_red >= 0 AND shares_white >= 0 AND shares_dormant >= 0)' || CHAR(10) ||
+    ') STRICT')
 WHERE type = 'table' AND name = 'member';

 UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
@@ -1,37 +0,0 @@
-- schema version 40 to 41
-
-PRAGMA writable_schema = ON;
-
-UPDATE sqlite_schema SET sql = REPLACE(sql, 'scale_id      ', 'scale_terminal')
-WHERE type = 'table' AND name = 'delivery_part';
-
-DROP VIEW v_bki_delivery;
-DROP VIEW v_bki_member;
-
-CREATE VIEW v_bki_member AS
-SELECT s.year, m.mgnr, m.lfbis_nr, m.name,
-       (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names,
-       a.name AS billing_name, COALESCE(a.address, m.address) AS address,
-       COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest,
-       m.volllieferant AS vollablieferer,
-       SUM(COALESCE(IIF((c.year_from IS NULL OR c.year_from <= s.year) AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, NULL), 0)) AS area
-FROM season s, member m
-    LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
-    LEFT JOIN area_commitment c ON c.mgnr = m.mgnr
-GROUP BY s.year, m.mgnr;
-
-CREATE VIEW v_bki_delivery AS
-SELECT m.lfbis_nr, m.name, m.other_names, m.billing_name,
-       m.address, plz.plz, IIF(INSTR(o.name, ',') = 0, o.name, SUBSTR(o.name, 1, INSTR(o.name, ',') - 1)) AS ort,
-       d.date, d.weight, v.type, v.sortid, d.qualid, d.year, d.hkid, d.kmw, d.oe,
-       m.vollablieferer, m.area
-FROM v_delivery d
-    JOIN v_bki_member m ON (m.year, m.mgnr) = (d.year, d.mgnr)
-    JOIN postal_dest pd ON (pd.country, pd.id) = (m.country, m.postal_dest)
-    LEFT JOIN AT_plz_dest ap ON (ap.country, ap.id) = (pd.country, pd.id)
-    LEFT JOIN AT_plz plz ON plz.plz = ap.plz
-    LEFT JOIN AT_ort o ON o.okz = ap.okz
-    JOIN wine_variety v ON v.sortid = d.sortid
-ORDER BY d.date, d.time;
-
-PRAGMA writable_schema = OFF;
@@ -67,7 +67,7 @@ namespace Elwig.Services {
            vm.IsGebunden = p.IsGebunden;
            vm.Unloading = p.Unloading;

-            vm.ScaleTerminalId = p.ScaleTerminalId;
+            vm.ScaleId = p.ScaleId;
            vm.WeighingData = p.WeighingData;
            vm.ManualWeighingReason = p.WeighingReason;
        }
@@ -515,7 +515,7 @@ namespace Elwig.Services {

                    Weight = vm.Weight!.Value,
                    IsManualWeighing = vm.IsManualWeighing,
-                    ScaleTerminalId = vm.ScaleTerminalId,
+                    ScaleId = vm.ScaleId,
                    WeighingData = vm.WeighingData,
                    WeighingReason = vm.ManualWeighingReason,
                };
@@ -214,7 +214,7 @@ namespace Elwig.Services {
            ];
        }

-        public static async Task Download(string url, string username, string password, bool confirmImports) {
+        public static async Task Download(string url, string username, string password) {
            try {
                var import = await GetFilesToImport(url, username, password);
                var paths = new List<string>();
@@ -226,7 +226,7 @@ namespace Elwig.Services {
                        paths.Add(filename);
                    }
                }
-                await ElwigData.Import(paths, confirmImports ? ElwigData.ImportMode.Interactively : ElwigData.ImportMode.FromBranches);
+                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
            } catch (HttpRequestException exc) {
                InteractionService.ShowException("Daten herunterladen", "Eventuell Internetverbindung prüfen!", exc);
            } catch (TaskCanceledException exc) {
@@ -264,14 +264,5 @@ namespace Elwig.Services {
                return false;
            }
        }
-
-        public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password, int? year = null) {
-            try {
-                year ??= Utils.CurrentLastSeason;
-                return await ctx.Deliveries.Where(d => d.ZwstId == App.ZwstId && d.Year == year).Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
-            } catch {
-                return false;
-            }
-        }
    }
 }
@@ -25,7 +25,7 @@ namespace Elwig.ViewModels {
        [ObservableProperty]
        private string? _manualWeighingReason;
        [ObservableProperty]
-        private string? _scaleTerminalId;
+        private string? _scaleId;
        [ObservableProperty]
        private string? _weighingData;

@@ -47,26 +47,26 @@ namespace Elwig.Windows {
            if (!_actChanged || _actList == null || _acts == null || _actIds == null)
                return;

-            // delete
-            var delete = _acts.Where(a => a.Value == null).Select(a => a.Key).ToList();
-            await ctx.AreaCommitmentTypes.Where(v => delete.Contains(v.VtrgId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_actList
-                .Where(_actIds.ContainsKey)
-                .Select(t => {
-                    t.VtrgId = _actIds[t];
-                    ctx.Entry(t).State = EntityState.Added;
-                    return t;
-                }));
+            foreach (var (vtrgid, _) in _acts.Where(a => a.Value == null)) {
+                ctx.Remove(ctx.AreaCommitmentTypes.Find(vtrgid)!);
+            }
+            foreach (var (attr, old) in _actIds) {
+                attr.VtrgId = old;
+            }
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
+                ctx.Update(ctx.AreaCommitmentTypes.Find(old)!);
+            }
            await ctx.SaveChangesAsync();
-            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null && a.Key != a.Value)) {
+
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = {vtrgid} WHERE vtrgid = {old}");
            }
+            await ctx.SaveChangesAsync();

-            // insert
-            ctx.AddRange(_actList
-                .Where(t => !_actIds.ContainsKey(t) && t.VtrgId != null));
+            foreach (var type in _actList.Where(a => !_actIds.ContainsKey(a))) {
+                if (type.VtrgId == null) continue;
+                ctx.Add(type);
+            }
            await ctx.SaveChangesAsync();
        }

@@ -125,7 +125,7 @@ namespace Elwig.Windows {
            var id = AreaCommitmentTypeIdInput.Text;
            if (old != null) _acts[old] = id;
            attr.VtrgId = id;
-            attr.SortId = v?.SortId ?? "";
+            attr.SortId = v?.SortId;
            attr.AttrId = a?.AttrId;
            attr.MinKgPerHa = AreaCommitmentTypeMinKgPerHaInput.Text.Length > 0 ? int.Parse(AreaCommitmentTypeMinKgPerHaInput.Text) : null;
            attr.PenaltyPerKg = AreaCommitmentTypePenaltyPerKgInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyPerKgInput.Text) : null;
@@ -41,26 +41,25 @@ namespace Elwig.Windows {
            if (!_branchChanged || _branchList == null || _branches == null || _branchIds == null)
                return;

-            // delete
            var deleteZwstIds = _branches.Where(b => b.Value == null).Select(b => b.Key).ToList();
            await ctx.Branches.Where(b => deleteZwstIds.Contains(b.ZwstId)).ExecuteDeleteAsync();

-            // update
-            ctx.UpdateRange(_branchList
-                .Where(_branchIds.ContainsKey)
-                .Select(b => {
-                    b.ZwstId = _branchIds[b];
-                    ctx.Entry(b).State = EntityState.Added;
-                    return b;
-                }));
+            foreach (var (branch, old) in _branchIds) {
+                branch.ZwstId = old;
+            }
+            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
+                ctx.Update(ctx.Branches.Find(old)!);
+            }
            await ctx.SaveChangesAsync();
-            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null && b.Key != b.Value)) {
+
+            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
                await ctx.Database.ExecuteSqlAsync($"UPDATE branch SET zwstid = {zwstid} WHERE zwstid = {old}");
            }

-            // insert
-            ctx.AddRange(_branchList
-                .Where(b => !_branchIds.ContainsKey(b) && b.ZwstId != null));
+            foreach (var branch in _branchList.Where(b => !_branchIds.ContainsKey(b))) {
+                if (branch.ZwstId == null) continue;
+                ctx.Add(branch);
+            }
            await ctx.SaveChangesAsync();
        }

@@ -48,30 +48,30 @@ namespace Elwig.Windows {
            if (!_modChanged || _modList == null || _mods == null || _modIds == null)
                return;

-            var year = (SeasonList.SelectedItem as Season)?.Year;
            int i = 0;
            foreach (var mod in _modList) mod.Ordering = ++i;

-            // delete
-            var deleteModIds = _mods.Where(b => b.Value == null).Select(b => b.Key).ToList();
-            await ctx.Modifiers.Where(b => b.Year == year && deleteModIds.Contains(b.ModId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_modList
-                .Where(_modIds.ContainsKey)
-                .Select(m => {
-                    m.ModId = _modIds[m];
-                    ctx.Entry(m).State = EntityState.Added;
-                    return m;
-                }));
+            var year = (SeasonList.SelectedItem as Season)?.Year;
+            foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
+                ctx.Remove(ctx.Modifiers.Find(year, modid)!);
+            }
+            foreach (var (mod, old) in _modIds) {
+                mod.ModId = old;
+            }
+            foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
+                ctx.Update(ctx.Modifiers.Find(year, old)!);
+            }
            await ctx.SaveChangesAsync();
+
            foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
                await ctx.Database.ExecuteSqlAsync($"UPDATE modifier SET modid = {modid} WHERE (year, modid) = ({year}, {old})");
            }
+            await ctx.SaveChangesAsync();

-            // insert
-            ctx.AddRange(_modList
-                .Where(m => !_modIds.ContainsKey(m) && m.ModId != null));
+            foreach (var mod in _modList.Where(m => !_modIds.ContainsKey(m))) {
+                if (mod.ModId == null) continue;
+                await ctx.AddAsync(mod);
+            }
            await ctx.SaveChangesAsync();
        }

@@ -41,28 +41,26 @@ namespace Elwig.Windows {
            if (!_attrChanged || _attrList == null || _attrs == null || _attrIds == null)
                return;

-            // delete
            var deleteAttrIds = _attrs.Where(a => a.Value == null).Select(a => a.Key).ToList();
            await ctx.WineAttributes.Where(a => deleteAttrIds.Contains(a.AttrId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_attrList
-                .Where(_attrIds.ContainsKey)
-                .Select(a => {
-                    a.AttrId = _attrIds[a];
-                    ctx.Entry(a).State = EntityState.Added;
-                    return a;
-                }));
+            foreach (var (attr, old) in _attrIds) {
+                attr.AttrId = old;
+            }
+            foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
+                ctx.Update(ctx.WineAttributes.Find(old)!);
+            }
            await ctx.SaveChangesAsync();
+
            foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
                await ctx.Database.ExecuteSqlAsync($"UPDATE wine_attribute SET attrid = {attrid} WHERE attrid = {old}");
                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = (sortid || COALESCE(attrid, '') || COALESCE(disc, '')) WHERE attrid = {attrid}");
-                await ctx.Database.ExecuteSqlAsync($"UPDATE payment_variant SET data = REPLACE(REPLACE(data, {$"/{old}\""}, {$"/{attrid}\""}), {$"/{old}-"}, {$"/{attrid}-"})");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(REPLACE(data, '/{old}\"', '/{attrid}\"'), '/{old}-', '/{attrid}-')");
            }

-            // insert
-            ctx.AddRange(_attrList
-                .Where(a => !_attrIds.ContainsKey(a) && a.AttrId != null));
+            foreach (var attr in _attrList.Where(a => !_attrIds.ContainsKey(a))) {
+                if (attr.AttrId == null) continue;
+                ctx.Add(attr);
+            }
            await ctx.SaveChangesAsync();
        }

@@ -41,27 +41,25 @@ namespace Elwig.Windows {
            if (!_cultChanged || _cultList == null || _cults == null || _cultIds == null)
                return;

-            // delete
            var deleteCultIds = _cults.Where(c => c.Value == null).Select(c => c.Key).ToList();
            await ctx.WineCultivations.Where(c => deleteCultIds.Contains(c.CultId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_cultList
-                .Where(_cultIds.ContainsKey)
-                .Select(c => {
-                    c.CultId = _cultIds[c];
-                    ctx.Entry(c).State = EntityState.Added;
-                    return c;
-                }));
+            foreach (var (cult, old) in _cultIds) {
+                cult.CultId = old;
+            }
+            foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
+                ctx.Update(ctx.WineCultivations.Find(old)!);
+            }
            await ctx.SaveChangesAsync();
+
            foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
                await ctx.Database.ExecuteSqlAsync($"UPDATE wine_cultivation SET cultid = {cultid} WHERE cultid = {old}");
-                await ctx.Database.ExecuteSqlAsync($"UPDATE payment_variant SET data = REPLACE(data, {$"-{old}\""}, {$"-{cultid}\""})");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(data, '-{old}\"', '-{cultid}\"')");
            }

-            // insert
-            ctx.AddRange(_cultList
-                .Where(c => !_cultIds.ContainsKey(c) && c.CultId != null));
+            foreach (var cult in _cultList.Where(c => !_cultIds.ContainsKey(c))) {
+                if (cult.CultId == null) continue;
+                ctx.Add(cult);
+            }
            await ctx.SaveChangesAsync();
        }

@@ -12,6 +12,8 @@ using System.Windows.Input;
 namespace Elwig.Windows {
    public partial class BaseDataWindow : AdministrationWindow {

+        protected AppDbContext? EditContext;
+
        public BaseDataWindow() {
            InitializeComponent();
            RequiredInputs = [
@@ -187,30 +189,31 @@ namespace Elwig.Windows {
        }

        private async Task InitEditing() {
-            using var ctx = new AppDbContext();
-            await BranchesInitEditing(ctx);
-            await WineAttributesInitEditing(ctx);
-            await WineCultivationsInitEditing(ctx);
-            await AreaCommitmentTypesInitEditing(ctx);
-            await SeasonsInitEditing(ctx);
-            await ModifiersInitEditing(ctx);
+            EditContext = new AppDbContext();
+            await BranchesInitEditing(EditContext);
+            await WineAttributesInitEditing(EditContext);
+            await WineCultivationsInitEditing(EditContext);
+            await AreaCommitmentTypesInitEditing(EditContext);
+            await SeasonsInitEditing(EditContext);
+            await ModifiersInitEditing(EditContext);
        }

        private async Task Save() {
            await UpdateClientParameters(App.Client);
            await UpdateParameters(Utils.CurrentLastSeason);
-            using var ctx = new AppDbContext();
-            using var tx = await ctx.Database.BeginTransactionAsync();
-            await BranchesSave(ctx);
-            await WineAttributesSave(ctx);
-            await WineCultivationsSave(ctx);
-            await AreaCommitmentTypesSave(ctx);
-            await SeasonsSave(ctx);
-            await ModifiersSave(ctx);
+            using var tx = await EditContext!.Database.BeginTransactionAsync();
+            await BranchesSave(EditContext!);
+            await WineAttributesSave(EditContext!);
+            await WineCultivationsSave(EditContext!);
+            await AreaCommitmentTypesSave(EditContext!);
+            await SeasonsSave(EditContext!);
+            await ModifiersSave(EditContext!);
            await tx.CommitAsync();
        }

        private async Task FinishEditing() {
+            EditContext?.Dispose();
+            EditContext = null;
            using var ctx = new AppDbContext();
            await BranchesFinishEditing(ctx);
            await WineAttributesFinishEditing(ctx);
@@ -85,10 +85,10 @@ namespace Elwig.Windows {
                if (n < 3) WeighingCButton.Visibility = Visibility.Hidden;
                if (n < 4) WeighingDButton.Visibility = Visibility.Hidden;
                if (n == 1) WeighingAButton.Content = "Wiegen";
-                if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleTerminalId}";
-                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleTerminalId}";
-                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleTerminalId}";
-                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleTerminalId}";
+                if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleId}";
+                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleId}";
+                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleId}";
+                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleId}";
                WeighingManualButton.Margin = new Thickness(10, 10 + n * 32, 10, 10);
                foreach (var s in App.EventScales) {
                    s.WeighingEvent += Scale_Weighing;
@@ -366,7 +366,7 @@ namespace Elwig.Windows {
        private void InitialInputs() {
            ViewModel.LastScaleError = null;
            ViewModel.WeighingData = null;
-            ViewModel.ScaleTerminalId = null;
+            ViewModel.ScaleId = null;
            ViewModel.ManualWeighingReason = null;

            ClearOriginalValues();
@@ -651,13 +651,13 @@ namespace Elwig.Windows {
        private void OnWeighingResult(IScale scale, WeighingResult res) {
            if ((res.NetWeight ?? 0) > 0 && res.FullWeighingId != null) {
                ViewModel.Weight = res.NetWeight;
-                ViewModel.ScaleTerminalId = scale.ScaleTerminalId;
+                ViewModel.ScaleId = scale.ScaleId;
                ViewModel.WeighingData = res.ToJson().ToJsonString();
                ViewModel.ManualWeighingReason = null;
                ManualWeighingInput.IsChecked = false;
            } else {
                ViewModel.Weight = null;
-                ViewModel.ScaleTerminalId = null;
+                ViewModel.ScaleId = null;
                ViewModel.WeighingData = null;
            }
            ViewModel.LastScaleError = null;
@@ -771,7 +771,7 @@ namespace Elwig.Windows {
        }

        private void EmptyScale() {
-            var scale = App.Scales.Where(s => s.ScaleTerminalId == ViewModel.ScaleTerminalId).FirstOrDefault();
+            var scale = App.Scales.Where(s => s.ScaleId == ViewModel.ScaleId).FirstOrDefault();
            if (scale is not ICommandScale cs) return;
            cs.Empty();
        }
@@ -953,7 +953,7 @@ namespace Elwig.Windows {
            ViewModel.Weight = res?.Item1;
            ManualWeighingInput.IsChecked = true;
            ViewModel.ManualWeighingReason = res?.Item2;
-            ViewModel.ScaleTerminalId = null;
+            ViewModel.ScaleId = null;
            ViewModel.WeighingData = null;
        }

@@ -958,7 +958,6 @@ namespace Elwig.Windows {
                            m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
                            subject, docs.Select(d => d.Title).ToArray()
                        )]);
-                        await Task.Delay((int)(App.Config.SmtpWait * 1000));
                    }
                });

@@ -200,13 +200,8 @@ namespace Elwig.Windows {
                return;
            Mouse.OverrideCursor = Cursors.Wait;
            await Task.Run(async () => {
-                if (App.Config.SyncMain) {
-                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, true);
-                    await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                } else {
-                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, false);
-                    await SyncService.UploadBranchDeliveries(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                }
+                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
            });
            Mouse.OverrideCursor = null;
        }
@@ -216,7 +211,7 @@ namespace Elwig.Windows {
                return;
            Mouse.OverrideCursor = Cursors.Wait;
            await Task.Run(async () => {
-                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, App.Config.SyncMain);
+                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
            });
            Mouse.OverrideCursor = null;
        }
@@ -234,10 +229,6 @@ namespace Elwig.Windows {
        private async void Menu_Sync_UploadModified_Click(object sender, RoutedEventArgs evt) {
            if (App.Config.SyncUrl == null)
                return;
-            if (!App.Config.SyncMain) {
-                InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
-                return;
-            }
            Mouse.OverrideCursor = Cursors.Wait;
            await Task.Run(async () => {
                await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
@@ -305,11 +296,6 @@ namespace Elwig.Windows {
            if (App.Config.SyncUrl == null)
                return;

-            if (!App.Config.SyncMain) {
-                InteractionService.ShowInformation("Datenbank hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
-                return;
-            }
-
            if (!InteractionService.AskContinue("Datenbank hochladen", "Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!"))
                return;

@@ -381,11 +367,7 @@ namespace Elwig.Windows {
                await Task.Delay(delay);
                var ch = false;
                using (var ctx = new AppDbContext()) {
-                    if (App.Config.SyncMain) {
-                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    } else {
-                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, default);
-                    }
+                    ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                }
                await App.MainDispatcher.BeginInvoke(() => {
                    if (ch) {
@@ -706,24 +706,12 @@
                        </TextBlock.ToolTip>
                    </TextBlock>

-                    <Button x:Name="DeliveryButton" IsEnabled="{Binding IsMemberSelected}"
+                    <Button x:Name="DeliveryButton" Content="Lieferungen" IsEnabled="{Binding IsMemberSelected}"
                            Click="DeliveryButton_Click"
-                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="160" VerticalAlignment="Bottom" Grid.ColumnSpan="3" HorizontalContentAlignment="Stretch">
-                        <Grid>
-                            <TextBlock Margin="0,0,10,0" TextAlignment="Center">Lieferungen</TextBlock>
-                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                        TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,0,0"/>
-                        </Grid>
-                    </Button>
-                    <Button x:Name="AreaCommitmentButton" IsEnabled="{Binding IsMemberSelected}"
+                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" IsEnabled="{Binding IsMemberSelected}"
                            Click="AreaCommitmentButton_Click"
-                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="160" VerticalAlignment="Bottom" Grid.ColumnSpan="3" HorizontalContentAlignment="Stretch">
-                        <Grid>
-                            <TextBlock Margin="0,0,15,0" TextAlignment="Center">Flächenbindungen</TextBlock>
-                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                       TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,0,0"/>
-                        </Grid>
-                    </Button>
+                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
                </Grid>
            </GroupBox>
        </Grid>
@@ -7,7 +7,7 @@
        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="430" MinWidth="850">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="850">
    <Window.DataContext>
        <vm:PaymentVariantsViewModel/>
    </Window.DataContext>
@@ -195,10 +195,11 @@
                      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"/>

            <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,200,10,10">
                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="130"/>
+                    <ColumnDefinition Width="110"/>
                    <ColumnDefinition Width="27"/>
                    <ColumnDefinition Width="110"/>
                    <ColumnDefinition Width="27"/>
@@ -206,7 +207,7 @@
                </Grid.ColumnDefinitions>
                <Grid.RowDefinitions>
                    <RowDefinition Height="27"/>
-                    <RowDefinition Height="37"/>
+                    <RowDefinition Height="5"/>
                    <RowDefinition Height="27"/>
                    <RowDefinition Height="5"/>
                    <RowDefinition Height="27"/>
@@ -226,23 +227,11 @@
                </Grid.Resources>

                <Button x:Name="EditButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                        Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Stretch"
-                        Click="EditButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,13,0" TextAlignment="Center" Text="{Binding EditText}"/>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                        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" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Stretch"
-                        Click="ModifierButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,15,0" TextAlignment="Center">Zu-/Abschläge</TextBlock>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
+                        Click="ModifierButton_Click"/>
                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
                    <Label.RenderTransform>
                        <TransformGroup>
@@ -255,14 +244,8 @@
                        Content="Berechnen" Grid.Column="2" Grid.Row="2"
                        Click="CalculateButton_Click"/>
                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3"/>
-                <Button x:Name="PaymentAdjustmentButton" Grid.Column="2" Grid.Row="4" HorizontalContentAlignment="Stretch"
-                        Click="PaymentAdjustmentButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,13,0" TextAlignment="Center">Anpassen</TextBlock>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
+                        Click="PaymentAdjustmentButton_Click"/>
                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" RenderTransformOrigin="0.5,0.5" >
                    <Label.RenderTransform>
                        <TransformGroup>
@@ -278,7 +261,7 @@
                        Content="Freigeben" Grid.Column="4" Grid.Row="2"
                        Click="RevertButton_Click"/>
                <Button x:Name="SaveButton" IsEnabled="{Binding SaveIsEnabled}"
-                        Content="Speichern" Grid.Column="2" Grid.Row="0"
+                        Content="Speichern" Grid.Column="4" Grid.Row="0"
                        Click="SaveButton_Click"/>
            </Grid>

@@ -5,7 +5,6 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -240,27 +239,15 @@ namespace Elwig.Windows {
        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null)
                return;
-
            Mouse.OverrideCursor = Cursors.Wait;
            try {
                await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
+                App.HintContextChange();
            } catch (Exception exc) {
                await ForceContextReload();
                InteractionService.ShowDbException("Auszahlungsvariante aktualisieren", exc);
            }
-            try {
-                await Task.Run(async () => {
-                    var b = await BillingVariant.Create(v.Year, v.AvNr);
-                    await b.Calculate(false);
-                });
-            } catch (KeyNotFoundException exc) {
-                InteractionService.ShowInformation("Noch nicht alle Preise festgelegt", exc.Message);
-            } catch (Exception exc) {
-                InteractionService.ShowException("Berechnungsfehler", exc);
-            }
-            App.HintContextChange();
            Mouse.OverrideCursor = null;
-
            await EnsureContextRenewed();
            CommentInput_TextChanged(null, null);
            DateInput_TextChanged(null, null);
@@ -16,7 +16,14 @@

  <dependency>
    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
    </dependentAssembly>
  </dependency>
 </assembly>
@@ -26,7 +26,6 @@ auto = true
 ;username = ""
 ;password = ""
 ;from = mail@wg.at
-;wait = 0.5

 ;[scale.1]
 ;type = SysTec-IT
@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.1.1.0 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.5.6 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.1.1.0 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.5.6 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
@@ -45,7 +45,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2020, 1, '2020-10-01', NULL, 'X', 1),
 (101, 2020, 2, '2020-10-01', NULL, 'X', 2),
 (101, 2020, 3, '2020-10-01', NULL, 'X', 3);
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2020, 1, 1, 'GV', 'K',  NULL, 4000, 17, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 1, 2, 'GV', NULL, NULL, 4000, 16, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 2, 1, 'GV', NULL, 'B',  4000, 15, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
@@ -60,7 +60,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2021, 1, '2021-10-01', NULL, 'X', 1),
 (101, 2021, 2, '2021-10-01', NULL, 'X', 2),
 (101, 2021, 3, '2021-10-01', NULL, 'X', 3);
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, gebunden, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, gebunden, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2021, 1, 1, 'GV', 'K',  NULL, 4000, 17, 'KAB', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 1, 2, 'GV', NULL, NULL, 4000, 16, 'QUW', 'WLNO', 06109, FALSE, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 2, 1, 'GV', NULL, 'B',  4000, 15, 'QUW', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),
@@ -39,7 +39,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (104, 2020, 11, '2020-10-03', '14:39:22', 'X', 2),
 (104, 2020, 12, '2020-10-03', '15:15:41', 'X', 3);

-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2020,  1, 1, 'GV', NULL, NULL,  3219, 15.0, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE,  '1', '{"id":"321","nr":321,"gross_weight":3219,"tare_weight":0,"net_weight":3219,"date":"2020-10-01","time":"09:02:46"}', NULL),
 (2020,  2, 1, 'GV',  'K', NULL,  2987, 17.5, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020,  2, 2, 'GV',  'K', NULL,  1873, 17.7, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
@@ -76,7 +76,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2023, 18, '2023-10-10', NULL, 'X', 2),
 (101, 2023, 19, '2023-10-10', NULL, 'X', 3);

-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2021,  1, 1, 'GV', NULL, NULL, 3500, 15.0, 'QUW', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021,  2, 1, 'GV', NULL, NULL, 4000, 17.0, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021,  2, 2, 'GV', NULL, NULL, 4000, 16.0, 'QUW', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
@@ -19,7 +19,7 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.6.1" />
@@ -23,7 +23,7 @@ namespace Tests.UnitTests.DocumentTests {
                    1 Grüner Veltliner Qualitätswein 73 15,0 3 219
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/1, ID: 321 – 09:02, 01.10.2020
+                    Waage: 1, ID: 321 – 09:02, 01.10.2020
                    Brutto: 3 219 kg – Tara: 0 kg – Netto: 3 219 kg – gerebelt gewogen
                    """));
            });
@@ -49,13 +49,13 @@ namespace Tests.UnitTests.DocumentTests {
                    1 Grüner Veltliner Qualitätswein 82 16,7 4 002
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("""
                    2 Grüner Veltliner Qualitätswein 75 15,3 481
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("Gesamt: 81 16,5 4 483"));
            });
@@ -80,19 +80,19 @@ namespace Tests.UnitTests.DocumentTests {
                    1 Grüner Veltliner Wein 75 15,4 2 561
                    Herkunft: Österreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("""
                    2 Grüner Veltliner Kabinett Wein 87 17,6 3 129
                    Herkunft: Österreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("""
                    3 Grüner Veltliner Wein 79 16,1 1 280
                    Herkunft: Österreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("Gesamt: 81 16,5 6 970"));
            });
@@ -118,14 +118,14 @@ namespace Tests.UnitTests.DocumentTests {
                    Bewirtschaftung: Bio (AT-BIO-302)
                    Herkunft: Österreich
                    / Wolkersdorfer Hochleithen / Wolkersdorf im Weinviertel / KG Wolkersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("""
                    2 Grüner Veltliner Qualitätswein 75 15,4 2 134
                    Bewirtschaftung: Bio (AT-BIO-302)
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Wolkersdorfer Hochleithen / Wolkersdorf im Weinviertel / KG Wolkersdorf
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    """));
                Assert.That(text, Contains.Substring("Gesamt: 78 15,9 5 332"));
            });
@@ -152,12 +152,12 @@ namespace Tests.UnitTests.DocumentTests {
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
                    Zu-/Abschläge: Geschädigte Trauben −10,00 %
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    2 Grüner Veltliner Kabinett Kabinett 87 17,7 1 873
                    Herkunft: Österreich / Weinland / Niederösterreich
                    / Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
                    Zu-/Abschläge: Keine Voranmeldung −0,1000 €/kg
-                    Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
+                    Waage: ?, ID: ? (gerebelt gewogen)
                    Gesamt: 87 17,6 4 860
                    """));
            }
@@ -31,19 +31,16 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1235;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1235, TareWeight = 0, NetWeight = 1235,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
            Mock.Weight = 1240;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1240, TareWeight = 0, NetWeight = 1240,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
            Mock.Weight = 1245;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1245, TareWeight = 0, NetWeight = 1245,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
        }
@@ -53,19 +50,19 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1235;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1235, TareWeight = 0, NetWeight = 1235,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = $"2020-10-17/1",
+                WeighingId = "1", FullWeighingId = $"2020-10-17/1",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
            Mock.Weight = 3335;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3335, TareWeight = 0, NetWeight = 3335,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = $"2020-10-17/2",
+                WeighingId = "2", FullWeighingId = $"2020-10-17/2",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
            Mock.Weight = 6420;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 6420, TareWeight = 0, NetWeight = 6420,
-                ScaleId = "1", WeighingId = "3", FullWeighingId = $"2020-10-17/3",
+                WeighingId = "3", FullWeighingId = $"2020-10-17/3",
                Date = new DateOnly(2020, 10, 17), Time = new TimeOnly(14, 23),
            }));
        }
@@ -5,7 +5,7 @@ namespace Tests.UnitTests.WeighingTests {
    public class ScaleTestHaugsdorfDMA02 {

        private MockScale Mock;
-        private GassnerEnqScale Scale;
+        private GassnerScale Scale;

        [OneTimeSetUp]
        public void SetupScale() {
@@ -32,23 +32,29 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Mock.Tare = 0;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1234,
+                TareWeight = 0,
+                NetWeight = 1234,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1235;
            Mock.Tare = 46;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1281, TareWeight = 46, NetWeight = 1235,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1281,
+                TareWeight = 46,
+                NetWeight = 1235,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1236;
            Mock.Tare = 92;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1328, TareWeight = 92, NetWeight = 1236,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1328,
+                TareWeight = 92,
+                NetWeight = 1236,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
        }

@@ -57,23 +63,35 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Mock.Tare = 92;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1326, TareWeight = 92, NetWeight = 1234,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1326,
+                TareWeight = 92,
+                NetWeight = 1234,
+                WeighingId = "1",
+                FullWeighingId = "1",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 3333;
            Mock.Tare = 41;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 3374, TareWeight = 41, NetWeight = 3333,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = "2",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 3374,
+                TareWeight = 41,
+                NetWeight = 3333,
+                WeighingId = "2",
+                FullWeighingId = "2",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 4321;
            Mock.Tare = 0;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 4321, TareWeight = 0, NetWeight = 4321,
-                ScaleId = "1", WeighingId = "3", FullWeighingId = "3",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 4321,
+                TareWeight = 0,
+                NetWeight = 4321,
+                WeighingId = "3",
+                FullWeighingId = "3",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
        }

@@ -31,19 +31,16 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1235;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1235, TareWeight = 0, NetWeight = 1235,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1236;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1236, TareWeight = 0, NetWeight = 1236,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
        }
@@ -53,19 +50,19 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = $"2020-10-15/1",
+                WeighingId = "1", FullWeighingId = $"2020-10-15/1",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 3333;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3333, TareWeight = 0, NetWeight = 3333,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = $"2020-10-15/2",
+                WeighingId = "2", FullWeighingId = $"2020-10-15/2",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 4321;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 4321, TareWeight = 0, NetWeight = 4321,
-                ScaleId = "1", WeighingId = "3", FullWeighingId = $"2020-10-15/3",
+                WeighingId = "3", FullWeighingId = $"2020-10-15/3",
                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
            }));
        }
@@ -5,7 +5,7 @@ namespace Tests.UnitTests.WeighingTests {
    public class ScaleTestSitzendorfDMA03Baby {

        private MockScale Mock;
-        private GassnerEnqScale Scale;
+        private GassnerScale Scale;

        [OneTimeSetUp]
        public void SetupScale() {
@@ -32,23 +32,29 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Mock.Tare = 0;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1234,
+                TareWeight = 0,
+                NetWeight = 1234,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1235;
            Mock.Tare = 46;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1281, TareWeight = 46, NetWeight = 1235,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1281,
+                TareWeight = 46,
+                NetWeight = 1235,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 1236;
            Mock.Tare = 92;
            Assert.That(await Scale!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1328, TareWeight = 92, NetWeight = 1236,
-                ScaleId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1328,
+                TareWeight = 92,
+                NetWeight = 1236,
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
        }

@@ -57,23 +63,35 @@ namespace Tests.UnitTests.WeighingTests {
            Mock.Weight = 1234;
            Mock.Tare = 92;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 1326, TareWeight = 92, NetWeight = 1234,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = "1",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 1326,
+                TareWeight = 92,
+                NetWeight = 1234,
+                WeighingId = "1",
+                FullWeighingId = "1",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 3333;
            Mock.Tare = 41;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 3374, TareWeight = 41, NetWeight = 3333,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = "2",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 3374,
+                TareWeight = 41,
+                NetWeight = 3333,
+                WeighingId = "2",
+                FullWeighingId = "2",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
            Mock.Weight = 4321;
            Mock.Tare = 0;
            Assert.That(await Scale!.Weigh(), Is.EqualTo(new WeighingResult {
-                GrossWeight = 4321, TareWeight = 0, NetWeight = 4321,
-                ScaleId = "1", WeighingId = "3", FullWeighingId = "3",
-                Date = new DateOnly(2020, 10, 15), Time = new TimeOnly(12, 34),
+                GrossWeight = 4321,
+                TareWeight = 0,
+                NetWeight = 4321,
+                WeighingId = "3",
+                FullWeighingId = "3",
+                Date = new DateOnly(2020, 10, 15),
+                Time = new TimeOnly(12, 34),
            }));
        }

@@ -40,25 +40,21 @@ namespace Tests.UnitTests.WeighingTests {
            MockA.Weight = 1234;
            Assert.That(await ScaleA!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockB.Weight = 3456;
            Assert.That(await ScaleB!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3456, TareWeight = 0, NetWeight = 3456,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockA.Weight = 1236;
            Assert.That(await ScaleA!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1236, TareWeight = 0, NetWeight = 1236,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockB.Weight = 3457;
            Assert.That(await ScaleB!.GetCurrentWeight(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3457, TareWeight = 0, NetWeight = 3457,
-                ScaleId = "1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
        }
@@ -68,25 +64,25 @@ namespace Tests.UnitTests.WeighingTests {
            MockA.Weight = 1234;
            Assert.That(await ScaleA!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 1234, TareWeight = 0, NetWeight = 1234,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = $"2020-10-08/1",
+                WeighingId = "1", FullWeighingId = $"2020-10-08/1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockB.Weight = 3456;
            Assert.That(await ScaleB!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3456, TareWeight = 0, NetWeight = 3456,
-                ScaleId = "1", WeighingId = "1", FullWeighingId = $"2020-10-08/1",
+                WeighingId = "1", FullWeighingId = $"2020-10-08/1",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockA.Weight = 4321;
            Assert.That(await ScaleA!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 4321, TareWeight = 0, NetWeight = 4321,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = $"2020-10-08/2",
+                WeighingId = "2", FullWeighingId = $"2020-10-08/2",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
            MockB.Weight = 3333;
            Assert.That(await ScaleB!.Weigh(), Is.EqualTo(new WeighingResult {
                GrossWeight = 3333, TareWeight = 0, NetWeight = 3333,
-                ScaleId = "1", WeighingId = "2", FullWeighingId = $"2020-10-08/2",
+                WeighingId = "2", FullWeighingId = $"2020-10-08/2",
                Date = new DateOnly(2020, 10, 8), Time = new TimeOnly(8, 47),
            }));
        }
@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=41" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=40" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
Author	SHA1	Message	Date
lorenz.stechauner	4dc8e19ed8	Tests: Update dependencies Test / Run tests (push) Successful in 2m2s Details	2026-07-09 00:05:58 +02:00
lorenz.stechauner	34556e32dc	Elwig: Update dependencies	2026-07-09 00:05:58 +02:00
lorenz.stechauner	e397c9d73d	[#20 ] MemberAdminWindow: Add MemberBusinessSharesAdminWindow to manage member shares	2026-07-09 00:05:47 +02:00