[WIP] certs

Elwig/Dialogs/TareCorrectionDialog.xaml.cs

@@ -8,10 +8,11 @@ namespace Elwig.Dialogs {
         public int ActualTare { get; private set; }
         public int TargetTare { get; private set; }
 
-        public TareCorrectionDialog(int actualTare, int? targetTare = null) {
+        public TareCorrectionDialog(int? actualTare, int? targetTare = null) {
             InitializeComponent();
-            ActualTare = actualTare;
+            ActualTare = actualTare ?? 0;
-            TargetTare = targetTare ?? actualTare;
+            TargetTare = targetTare ?? actualTare ?? 0;
+            ActualTareInput.IsReadOnly = actualTare != null;
             ActualTareInput.Text = ActualTare.ToString();
             TargetTareInput.Text = TargetTare.ToString();
             TargetTareInput.SelectAll();
@@ -19,12 +20,13 @@ namespace Elwig.Dialogs {
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
+            ActualTare = int.Parse(ActualTareInput.Text);
             TargetTare = int.Parse(TargetTareInput.Text);
             Close();
         }
 
         private void UpdateButtons() {
-            ConfirmButton.IsEnabled = TargetTareInput.Text.Length > 0;
+            ConfirmButton.IsEnabled = ActualTareInput.Text.Length > 0 && TargetTareInput.Text.Length > 0;
         }
 
         private void TareInput_TextChanged(object sender, TextChangedEventArgs evt) {

Elwig/Documents/BusinessDocument.cs

@@ -34,19 +34,23 @@ namespace Elwig.Documents {
             }
         }
 
-        protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false) {
+        protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false, bool right = false, bool center = false) {
-            var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, 0.5f, 0.25f, isName ? 1 : 0);
+            var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, center ? 0 : right ? 1 : 0.5f, 0.25f, isName ? 1 : 0);
-            if (colspan > 1) {
+            if (colspan == 26) {
                 cell.SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
                     .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0))
                     .SetBorderTop(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
                     .SetPaddingsMM(0.5f, 1, 0.5f, 1);
+            } else if (isName) {
+                cell.SetBorderLeft(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness));
             }
+            if (right) cell.SetTextAlignment(TextAlignment.RIGHT);
+            if (center) cell.SetTextAlignment(TextAlignment.CENTER);
             return cell;
         }
 
-        protected Cell NewAsideCell(string text, int colspan = 1, bool isName = false) {
+        protected Cell NewAsideCell(string text, int colspan = 1, bool isName = false, bool right = false, bool center = false) {
-            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName);
+            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName, right, center);
         }
 
         public BusinessDocument(string title, Member m, DateOnly? dateFrom, bool includeSender = false) :
@@ -60,16 +64,27 @@ namespace Elwig.Documents {
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
             base.BeforeRenderBody(doc, pdf);
-            var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10);
+            Aside = new Table(ColsMM(2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5))
-            if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)"));
+                .SetWidth(UnitValue.CreatePointValue(65 * PtInMM)).SetFixedLayout()
-            Aside = new Table(ColsMM(22.5, 42.5))
-                .SetFont(NF).SetFontSize(10)
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetFont(NF).SetFontSize(10)
                 .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
-                .AddCell(NewAsideCell("Mitglied", 2))
+                .AddCell(NewAsideCell("Mitglied", 26));
-                .AddCell(NewAsideCell("Mitglieds-Nr.:", isName: true)).AddCell(NewAsideCell($"{Member.MgNr}"))
+            if (Member.IsOrganic) {
-                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? ""))
+                Aside
-                .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
+                    .AddCell(NewAsideCell("Mitgl.-Nr.:", 8, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 4, right: true))
+                    .AddCell(NewAsideCell("Bio-KSt.:", 6, isName: true)).AddCell(NewAsideCell(Member.OrganicAuthorityCode ?? "-", 8, right: true, center: Member.OrganicAuthorityCode == null))
+                    .AddCell(NewAsideCell("Betr.-Nr.:", 6, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null))
+                    .AddCell(NewAsideCell("OOC-ID:", 6, isName: true)).AddCell(NewAsideCell(Member.OrganicOperatorId ?? "-", 8, right: true, center: Member.OrganicOperatorId == null))
+                    .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+            } else {
+                Aside
+                    .AddCell(NewAsideCell("Mitglieds-Nr.:", 12, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 4, right: true)).AddCell(NewAsideCell("", 10))
+                    .AddCell(NewAsideCell("Betriebs-Nr.:", 10, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "-", 6, right: true, center: Member.LfbisNr == null)).AddCell(NewAsideCell("", 10))
+                    .AddCell(NewAsideCell("UID:", 6, isName: true)).AddCell(NewAsideCell(Member.UstIdNr ?? "-", 10, right: true, center: Member.UstIdNr == null))
+                    .AddCell(NewAsideCell(new KernedParagraph("", 10).Add(Italic(Member.IsBuchführend ? "(buchführend)" : "(pauschaliert)")), 10, center: true));
+            }
         }
 
         protected void RenderAddress(Canvas canvas, Rectangle pageSize) {
@@ -125,7 +140,7 @@ namespace Elwig.Documents {
                     .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
                     .Item(c.EmailAddress != null ? link1 : null)
                         .Item(c.Website != null ? link2 : null)
-                        .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
+                        .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthorityCode).NextLine()
                     .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
                     .ToLeafElements());
         }

Elwig/Documents/CreditNote.cs

@@ -125,10 +125,10 @@ namespace Elwig.Documents {
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
             base.BeforeRenderBody(doc, pdf);
-            Aside?.AddCell(NewAsideCell("Gutschrift", 2))
+            Aside?.AddCell(NewAsideCell("Gutschrift", 26))
-                .AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-"))
+                .AddCell(NewAsideCell("Tr.-Gutschr.-Nr.:", 12, isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-", 14))
-                .AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}"))
+                .AddCell(NewAsideCell("Datum:", 12, isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}", 14))
-                .AddCell(NewAsideCell("Überw. am:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.TransferDate:dd.MM.yyyy}"));
+                .AddCell(NewAsideCell("Überwiesen am:", 12, isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.TransferDate:dd.MM.yyyy}", 14));
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {

Elwig/Documents/DeliveryConfirmation.cs

@@ -55,10 +55,10 @@ namespace Elwig.Documents {
             base.BeforeRenderBody(doc, pdf);
             var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
             var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
-            Aside?.AddCell(NewAsideCell("Saison", 2))
+            Aside?.AddCell(NewAsideCell("Saison", 26))
-                .AddCell(NewAsideCell("Lieferungen:", isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})"))
+                .AddCell(NewAsideCell("Lieferungen:", 12, isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})", 14))
-                .AddCell(NewAsideCell("Zeitraum:", isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)"))
+                .AddCell(NewAsideCell("Zeitraum:", 8, isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)", 18, center: true))
-                .AddCell(NewAsideCell("Menge:", isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg"));
+                .AddCell(NewAsideCell("Menge:", 12, isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg", 14));
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {

Elwig/Documents/DeliveryNote.cs

@@ -72,10 +72,10 @@ namespace Elwig.Documents {
 
         protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
             base.BeforeRenderBody(doc, pdf);
-            Aside?.AddCell(NewAsideCell("Lieferung", 2))
+            Aside?.AddCell(NewAsideCell("Lieferung", 26))
-                .AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr))
+                .AddCell(NewAsideCell("Lieferschein-Nr.:", 12, isName: true)).AddCell(NewAsideCell(Delivery.LsNr, 14))
-                .AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}"))
+                .AddCell(NewAsideCell("Datum/Zeit:", 12, isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}", 14))
-                .AddCell(NewAsideCell("Zweigstelle:", isName: true)).AddCell(NewAsideCell(Delivery.Branch.Name));
+                .AddCell(NewAsideCell("Zweigstelle:", 12, isName: true)).AddCell(NewAsideCell(Delivery.Branch.Name, 14));
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
@@ -121,7 +121,7 @@ namespace Elwig.Documents {
         }
 
         protected Table NewDeliveryTable() {
-            var tbl = new Table(ColsMM(10, 21, 25, 19.5, 19.5, 30, 12.5, 12.5, 15), true)
+            var tbl = new Table(ColsMM(10, 21, 25, 20, 20, 30, 12.5, 12.5, 14), true)
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorder(Border.NO_BORDER).SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
 
@@ -130,13 +130,13 @@ namespace Elwig.Documents {
                 .AddHeaderCell(NewTh("Attribut", colspan: 2, rowspan: 2, left: true))
                 .AddHeaderCell(NewTh("Qualitätsstufe", rowspan: 2, left: true))
                 .AddHeaderCell(NewTh("Gradation", colspan: 2))
-                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("Menge").SetPaddingRight(0))
                 .AddHeaderCell(NewTh("[°Oe]", 8))
                 .AddHeaderCell(NewTh("[°KMW]", 8))
-                .AddHeaderCell(NewTh("[kg]", 8));
+                .AddHeaderCell(NewTh("[kg]", 8).SetPaddingRight(0));
 
             foreach (var part in Delivery.Parts.OrderBy(p => p.DPNr)) {
-                var sub = new Table(ColsMM(10, 21, 25, 19.5, 19.5, 30, 12.5, 12.5, 15), true)
+                var sub = new Table(ColsMM(10, 21, 25, 20, 20, 30, 12.5, 12.5, 14), true)
                     .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                     .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                     .SetKeepTogether(true);
@@ -148,11 +148,14 @@ namespace Elwig.Documents {
                     .AddCell(NewDeliveryMainTd(part.Quality.Name))
                     .AddCell(NewDeliveryMainTd($"{part.Oe:N0}", center: true))
                     .AddCell(NewDeliveryMainTd($"{part.Kmw:N1}", center: true))
-                    .AddCell(NewDeliveryMainTd($"{part.Weight:N0}", right: true));
+                    .AddCell(NewDeliveryMainTd($"{part.Weight:N0}", right: true).SetPaddingRight(0));
 
                 if (part.Cultivation != null) {
                     var cult = new KernedParagraph(8);
                     cult.Add(Italic("Bewirtschaftung:")).Add(Normal(" " + part.Cultivation.Name + (part.Cultivation.Description != null ? $" ({part.Cultivation.Description})" : "")));
+                    if (part.Cultivation.IsOrganic) {
+                        cult.Add(" \u2013 ").Add(Italic("Kontrollstelle:")).Add(Normal($" {Member.OrganicAuthorityCode ?? "?"}"));
+                    }
                     sub.AddCell(NewTd())
                         .AddCell(NewTd(cult, colspan: 5))
                         .AddCell(NewTd(colspan: 3));
@@ -238,10 +241,10 @@ namespace Elwig.Documents {
             }
 
             if (Delivery.Parts.Count > 1) {
-                tbl.AddCell(NewTd("Gesamt:", 12, bold: true, borderTop: true, colspan: 6).SetPaddingsMM(1, 1, 1, 1))
+                tbl.AddCell(NewTd("Gesamt:", 12, bold: true, borderTop: true, colspan: 6).SetPaddingsMM(1, 1, 1, 0))
                     .AddCell(NewTd($"{Delivery.Oe:N0}", 12, bold: true, center: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1))
                     .AddCell(NewTd($"{Delivery.Kmw:N1}", 12, bold: true, center: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1))
-                    .AddCell(NewTd($"{Delivery.Weight:N0}", 12, bold: true, right: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+                    .AddCell(NewTd($"{Delivery.Weight:N0}", 12, bold: true, right: true, borderTop: true).SetPaddingsMM(1, 0, 1, 1));
             }
 
             return tbl;

Elwig/Documents/MemberDataSheet.cs

@@ -161,7 +161,8 @@ namespace Elwig.Documents {
                 .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
                     .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
-                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(Member.IsOrganic ? "Ja" : "Nein", colspan: 2))
+                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsOrganic ? "Ja" : "Nein", 10)
+                    .Add(Normal(Member.OrganicAuthorityCode != null || Member.OrganicOperatorId != null ? $" ({Member.OrganicAuthorityCode}{(Member.OrganicAuthorityCode != null && Member.OrganicOperatorId != null ? ", " : "")}{Member.OrganicOperatorId})" : "", 8)), colspan: 2))
                 .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
                 .AddCell(NewDataTh("Status:")).AddCell(NewTd(new KernedParagraph(Member.IsActive ? "Aktiv " : "Nicht aktiv ", 10)
                     .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))

Elwig/Helpers/AppDbUpdater.cs

@@ -1,3 +1,5 @@
+using Elwig.Services;
+using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,7 +11,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 = 42;
 
         private static int VersionOffset = 0;
 
@@ -68,11 +70,11 @@ namespace Elwig.Helpers {
                 })
                 .OrderBy(s => s.Item1).ThenBy(s => s.Item2)];
 
-            List<string> toExecute = [];
+            List<(int ToVersion, string File)> toExecute = [];
             var vers = fromVersion;
             while (vers < toVersion) {
                 var (_, to, name) = scripts.Last(s => s.From == vers);
-                toExecute.Add(name);
+                toExecute.Add((to, name));
                 vers = to;
             }
             if (toExecute.Count == 0)
@@ -87,8 +89,11 @@ namespace Elwig.Helpers {
                 await cnx.IntegrityCheck();
                 await cnx.ForeignKeyCheck();
 
-                foreach (var script in toExecute) {
+                foreach (var (to, script) in toExecute) {
                     await cnx.ExecuteEmbeddedScript(asm, script);
+                    if (to == 42) {
+                        await UpdateDbSchema_41_To_42(cnx);
+                    }
                 }
 
                 await cnx.IntegrityCheck();
@@ -103,5 +108,52 @@ namespace Elwig.Helpers {
                 File.Delete(backup);
             }
         }
+
+        private static async Task UpdateDbSchema_41_To_42(SqliteConnection cnx) {
+            List<(int MgNr, string LfbisNr, string Name, string Address, int Plz)> members = [];
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = """
+                    SELECT m.mgnr, m.lfbis_nr,
+                           COALESCE(a.name, (COALESCE(m.prefix || ' ', '') || COALESCE(m.given_name || ' ', '') || m.name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, ''))),
+                           COALESCE(a.address, m.address),
+                           COALESCE(aplz.plz, mplz.plz)
+                    FROM member m
+                        JOIN postal_dest mp ON (mp.country, mp.id) = (m.country, m.postal_dest)
+                        JOIN AT_plz_dest ma ON (ma.country, ma.id) = (mp.country, mp.id)
+                        JOIN AT_plz mplz ON mplz.plz = ma.plz
+                        LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
+                        LEFT JOIN postal_dest ap ON (ap.country, ap.id) = (a.country, a.postal_dest)
+                        LEFT JOIN AT_plz_dest aa ON (aa.country, aa.id) = (ap.country, mp.id)
+                        LEFT JOIN AT_plz aplz ON aplz.plz = aa.plz
+                    WHERE organic
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                var header = await reader.GetColumnSchemaAsync();
+                while (await reader.ReadAsync()) {
+                    members.Add((reader.GetInt32(0), reader.GetString(1), reader.GetString(2), reader.GetString(3), reader.GetInt32(4)));
+                }
+            }
+
+            if (members.Count > 0)
+                InteractionService.ShowInformation("Datenbank-Update", "Es wird versucht, die Bio-Kontrollstellen-Informationen der Mitglieder automatisch zu laden. Dies könnte einen kurzen Moment in Anspruch nehmen.");
+
+            foreach (var m in members) {
+                string? oocId = null;
+                string? authCode = null;
+
+                var certs = await OrganicService.FetchTracesCertificates(null, m.LfbisNr, (m.Name, m.Address, m.Plz.ToString()));
+
+                if (certs.Length > 0) {
+                    oocId = certs[0].OperatorId;
+                    authCode = certs[0].AuthorityCode;
+                }
+
+                if (oocId != null || authCode != null) {
+                    oocId = oocId == null ? "NULL" : $"'{oocId}'";
+                    authCode = authCode == null ? "NULL" : $"'{authCode}'";
+                    await cnx.ExecuteBatch($"UPDATE member SET ooc_id = {oocId}, org_auth_code = {authCode} WHERE mgnr = {m.MgNr}");
+                }
+            }
+        }
     }
 }

Elwig/Helpers/ClientParameters.cs

@@ -49,7 +49,8 @@ namespace Elwig.Helpers {
         public string? Bic;
         public string? UstIdNr;
         public string? LfbisNr;
-        public string? OrganicAuthority;
+        public string? OrganicOperatorId;
+        public string? OrganicAuthorityCode;
 
         public string? PhoneNr;
         public string? FaxNr;
@@ -114,7 +115,8 @@ namespace Elwig.Helpers {
                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
-                OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
+                OrganicOperatorId = parameters.GetValueOrDefault("CLIENT_ORGANIC_OPERATORID");
+                OrganicAuthorityCode = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITYCODE");
 
                 EnableMemberHistory = (parameters.GetValueOrDefault("ENABLE_MEMBERHISTORY")?.ToUpper()) switch {
                     "1" or "TRUE" or "YES" or "JA" => true,
@@ -273,7 +275,8 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
-                ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
+                ("CLIENT_ORGANIC_OPERATORID", OrganicOperatorId),
+                ("CLIENT_ORGANIC_AUTHORITYCODE", OrganicAuthorityCode),
                 ("ENABLE_MEMBERHISTORY", EnableMemberHistory ? "YES" : "NO"),
                 ("MODE_BUSINESSSHARES", businessShares),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),

Elwig/Helpers/Export/Database.cs

@@ -212,7 +212,7 @@ namespace Elwig.Helpers.Export {
             }
         }
 
-        public static async Task ImportSqlite(string filename, bool zipFile = false) {
+        public static async Task ImportSqlite(string filename, bool zipFile = false, bool keepSource = true) {
             if (zipFile) {
                 var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
                 try {
@@ -221,7 +221,7 @@ namespace Elwig.Helpers.Export {
                     foreach (var entry in zip.Entries) {
                         if (entry.Name.EndsWith(".sqlite3")) {
                             entry.ExtractToFile(newName);
-                            await ImportSqlite(newName);
+                            await ImportSqlite(newName, keepSource: false);
                             return;
                         }
                     }
@@ -233,7 +233,11 @@ namespace Elwig.Helpers.Export {
 
             var oldName = Path.ChangeExtension(App.Config.DatabaseFile, ".old.sqlite3");
             File.Move(App.Config.DatabaseFile, oldName, true);
+            if (keepSource) {
+                File.Copy(filename, App.Config.DatabaseFile, false);
+            } else {
                 File.Move(filename, App.Config.DatabaseFile, false);
+            }
 
             using var cnx = await AppDbContext.ConnectAsync();
             await cnx.ExecuteBatch("VACUUM");
@@ -246,7 +250,7 @@ namespace Elwig.Helpers.Export {
                 using (var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{newName}\"; Mode=ReadWriteCreate; Foreign Keys=False; Cache=Default; Pooling=False")) {
                     await cnx.ExecuteBatch(await reader.ReadToEndAsync());
                 }
-                await ImportSqlite(newName);
+                await ImportSqlite(newName, keepSource: false);
             } finally {
                 if (File.Exists(newName)) File.Delete(newName);
             }

Elwig/Helpers/Export/ElwigData.cs

@@ -638,6 +638,8 @@ namespace Elwig.Helpers.Export {
                 ["zwstid"] = m.ZwstId,
                 ["lfbis_nr"] = m.LfbisNr,
                 ["ustid_nr"] = m.UstIdNr,
+                ["ooc_id"] = m.OrganicOperatorId,
+                ["org_auth_code"] = m.OrganicAuthorityCode,
                 ["juridical_pers"] = m.IsJuridicalPerson,
                 ["volllieferant"] = m.IsVollLieferant,
                 ["buchführend"] = m.IsBuchführend,
@@ -710,6 +712,8 @@ namespace Elwig.Helpers.Export {
                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
                 UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                OrganicOperatorId = json["ooc_id"]?.AsValue().GetValue<string>(),
+                OrganicAuthorityCode = json["org_auth_code"]?.AsValue().GetValue<string>(),
                 IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
                 IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
                 IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
@@ -762,7 +766,8 @@ namespace Elwig.Helpers.Export {
                 ["reason"] = h.Reason,
                 ["source"] = h.Source,
                 ["shares"] = h.Shares,
-                ["signed"] = h.MemberHasSigned,
+                ["signed_company"] = h.CompanyHasSigned,
+                ["signed_member"] = h.MemberHasSigned,
                 ["value_per_share"] = h.ValuePerShare,
                 ["currency"] = h.CurrencyCode,
                 ["deduct_year"] = h.DeductYear,
@@ -782,7 +787,8 @@ namespace Elwig.Helpers.Export {
                 Reason = json["reason"]!.AsValue().GetValue<string>(),
                 Source = json["source"]!.AsValue().GetValue<string>(),
                 Shares = json["shares"]!.AsValue().GetValue<int>(),
-                MemberHasSigned = json["signed"]?.AsValue().GetValue<bool>() ?? false,
+                CompanyHasSigned = json["signed_company"]?.AsValue().GetValue<bool>() ?? false,
+                MemberHasSigned = json["signed_member"]?.AsValue().GetValue<bool>() ?? false,
                 ValuePerShare = json["value_per_share"]?.AsValue().GetValue<decimal>(),
                 CurrencyCode = json["currency"]?.AsValue().GetValue<string>(),
                 DeductYear = json["deduct_year"]?.AsValue().GetValue<int>(),

Elwig/Helpers/Extensions.cs

@@ -13,6 +13,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Elwig.Helpers {
     public static partial class Extensions {
@@ -192,13 +193,14 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static void AddToolTipCell(this Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+        public static void AddToolTipCell(this Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false, Brush? color = null) {
             var tb = new TextBlock() {
                 Text = text,
                 TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
                 Margin = new(0, 12 * row, 0, 0),
                 FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
             };
+            if (color != null) tb.Foreground = color;
             tb.SetValue(Grid.ColumnProperty, col);
             tb.SetValue(Grid.ColumnSpanProperty, colSpan);
             grid.Children.Add(tb);

Elwig/Helpers/Utils.cs

@@ -303,7 +303,7 @@ namespace Elwig.Helpers {
             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
         }
 
-        public static int? ShowTareCorrectionDialog(int actualTare, int? targetTare = null) {
+        public static int? ShowTareCorrectionDialog(int? actualTare, int? targetTare = null) {
             var d = new TareCorrectionDialog(actualTare, targetTare);
             return d.ShowDialog() == true ? d.TargetTare - d.ActualTare : null;
         }

Elwig/Helpers/Validator.cs

@@ -623,6 +623,37 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckOrganicOperatorId(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            for (int i = 0, v = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (char.IsAsciiDigit(ch)) {
+                    if (v == 3 && text[^1] != '-')
+                        text += "-";
+                    v++;
+                    text += ch;
+                }
+
+                if (i == input.CaretIndex - 1) {
+                    pos = text.Length;
+                } else if (v >= 10) {
+                    break;
+                }
+            }
+
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "OOC-ID ist nicht optional") : new(true, null);
+            } else if (!text.StartsWith("040-") || text.Length != 11) {
+                return new(false, "OOC-ID ist ungültig");
+            }
+
+            return new(true, null);
+        }
+
         public static ValidationResult CheckOrganicAuthorityCode(TextBox input, bool required) {
             string text = "";
             int pos = input.CaretIndex;
@@ -631,15 +662,18 @@ namespace Elwig.Helpers {
                 if (v < 2 && char.IsAsciiLetter(ch)) {
                     v++;
                     text += ch;
-                } else if ((v == 2 || v == 6) && ch == '-') {
+                } else if ((v == 2 || v == 5) && ch == '-' && text[^1] != '-') {
-                    v++;
                     text += ch;
-                } else if (v >= 2 && char.IsLetterOrDigit(ch)) {
+                } else if (v >= 2 && v <= 4 && char.IsLetter(ch)) {
+                    if (v == 2 && text[^1] != '-')
+                        text += "-";
                     if (text.StartsWith("AT")) {
-                        if (v == 3 && ch == 'B' || v == 4 && ch == 'I' || v == 5 && ch == 'O') {
+                        if (v == 2 && ch == 'B' || v == 3 && ch == 'I' || v == 4 && ch == 'O') {
                             v++;
                             text += ch;
-                        } else if (v > 6 && char.IsAsciiDigit(ch)) {
+                        }
+                    } else if (text.StartsWith("DE")) {
+                        if (v == 2 && ch == 'Ö' || v == 3 && ch == 'K' || v == 4 && ch == 'O') {
                             v++;
                             text += ch;
                         }
@@ -647,11 +681,16 @@ namespace Elwig.Helpers {
                         v++;
                         text += ch;
                     }
+                } else if (v >= 5 && v <= 7 && char.IsAsciiDigit(ch)) {
+                    if (v == 5 && text[^1] != '-')
+                        text += "-";
+                    v++;
+                    text += ch;
                 }
 
                 if (i == input.CaretIndex - 1) {
                     pos = text.Length;
-                } else if (text.StartsWith("AT") && v >= 10) {
+                } else if ((text.StartsWith("AT") || text.StartsWith("DE")) && v >= 10) {
                     break;
                 }
             }
@@ -662,7 +701,7 @@ namespace Elwig.Helpers {
             if (text.Length == 0)
                 return required ? new(false, "Bio-Kontrollstellen-Code ist nicht optional") : new(true, null);
 
-            if (text.StartsWith("AT")) {
+            if (text.StartsWith("AT") || text.StartsWith("DE")) {
                 if (text.Length != 10) {
                     return new(false, "Bio-Kontrollstellen-Code ist ungültig");
                 }

Elwig/Models/Entities/Member.cs

@@ -96,6 +96,12 @@ namespace Elwig.Models.Entities {
         [Column("ustid_nr")]
         public string? UstIdNr { get; set; }
 
+        [Column("ooc_id")]
+        public string? OrganicOperatorId { get; set; }
+
+        [Column("org_auth_code")]
+        public string? OrganicAuthorityCode { get; set; }
+
         [Column("juridical_pers")]
         public bool IsJuridicalPerson { get; set; }
 

Elwig/Models/Entities/MemberHistory.cs

@@ -76,7 +76,10 @@ namespace Elwig.Models.Entities {
         [Column("shares")]
         public int Shares { get; set; }
 
-        [Column("signed")]
+        [Column("signed_company")]
+        public bool CompanyHasSigned { get; set; }
+
+        [Column("signed_member")]
         public bool MemberHasSigned { get; set; }
 
         [Column("value_per_share")]

Elwig/Models/Entities/WineCult.cs

@@ -11,6 +11,9 @@ namespace Elwig.Models.Entities {
         [Column("name")]
         public required string Name { get; set; }
 
+        [Column("organic")]
+        public bool IsOrganic { get; set; }
+
         [Column("description")]
         public string? Description { get; set; }
 

Elwig/Resources/Sql/41-42.sql

@@ -0,0 +1,22 @@
+-- schema version 41 to 42
+
+ALTER TABLE member ADD COLUMN ooc_id           TEXT             CHECK (ooc_id   REGEXP '^[0-9]{3}-[0-9]{7}$')      DEFAULT NULL;
+ALTER TABLE member ADD COLUMN org_auth_code    TEXT             CHECK (org_auth_code REGEXP '^[A-Z]{2}-[A-ZÖØ]{3}-[0-9]{2,3}(-[A-Z]{2})?$') DEFAULT NULL;
+
+ALTER TABLE wine_cultivation ADD COLUMN organic     INTEGER NOT NULL CHECK (organic IN (TRUE, FALSE)) DEFAULT FALSE;
+
+ALTER TABLE member_history RENAME COLUMN signed TO signed_member;
+ALTER TABLE member_history ADD COLUMN signed_company  INTEGER NOT NULL CHECK (signed_company IN (TRUE, FALSE)) DEFAULT FALSE;
+
+UPDATE member SET org_auth_code = UPPER(SUBSTR(a.name, -11, 10)) FROM member m JOIN member_billing_address a ON a.mgnr = m.mgnr WHERE a.name LIKE '%AT-BIO-___)';
+UPDATE member SET org_auth_code = UPPER(SUBSTR(a.name, -10, 10)) FROM member m JOIN member_billing_address a ON a.mgnr = m.mgnr WHERE a.name LIKE '%AT-BIO-___';
+UPDATE member SET org_auth_code = UPPER(suffix) WHERE suffix LIKE 'AT-BIO-___';
+
+UPDATE wine_cultivation SET organic = TRUE WHERE name LIKE '%bio%' OR name LIKE '%org%' OR description LIKE '%AT-BIO-%';
+UPDATE wine_cultivation SET description = NULL WHERE description LIKE '%AT-BIO-%';
+UPDATE wine_cultivation SET description = 'Biologische Produktion' WHERE organic;
+
+UPDATE client_parameter SET param = 'CLIENT_ORGANIC_AUTHORITYCODE' WHERE param = 'CLIENT_ORGANIC_AUTHORITY';
+
+UPDATE member_telephone_number SET comment = NULL WHERE comment = '';
+UPDATE member_email_address SET comment = NULL WHERE comment = '';

Elwig/Services/DeliveryService.cs

@@ -1,19 +1,21 @@
 using Elwig.Documents;
-using Elwig.Helpers.Export;
 using Elwig.Helpers;
+using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System;
 using Elwig.ViewModels;
+using iText.Commons.Internal.Runtime;
 using LinqKit;
-using System.Globalization;
-using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Elwig.Services {
     public static class DeliveryService {
@@ -37,7 +39,7 @@ namespace Elwig.Services {
             vm.GradationKmwString = "";
 
             vm.Weight = null;
-            vm.ActualTare = 0;
+            vm.ActualTare = null;
             vm.TargetTare = null;
             vm.Tare = null;
             vm.IsManualWeighing = false;
@@ -58,9 +60,9 @@ namespace Elwig.Services {
             vm.WineOrigin = ControlUtils.GetItemFromSourceWithPk(vm.WineOriginSource, p.HkId) as WineOrigin;
 
             vm.Weight = p.Weight;
-            vm.ActualTare = p.WeighingInfo.Tare ?? 0;
+            vm.ActualTare = p.WeighingInfo.Tare;
             vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
-            vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
+            vm.Tare = vm.TargetTare ?? (vm.ActualTare is int t && t != 0 ? t : null);
             vm.IsManualWeighing = p.IsManualWeighing;
             vm.IsNetWeight = p.IsNetWeight;
 
@@ -975,30 +977,40 @@ namespace Elwig.Services {
             }
         }
 
-        private static void AddWeightToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
+        private static void AddWeightToolTipRow(Grid grid, int row, string? h1, string? h2, string? h3, int weight, int? total1, int? total2, int total3, string? type) {
-            var bold = h2 == null;
+            var bold = h3 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            var color = type == "R" ? Brushes.Firebrick : type == "W" ? Brushes.ForestGreen : null;
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, 1, bold);
+            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? (h3 == null) ? 3 : 2 : 1, bold: bold, color: color);
-            grid.AddToolTipCell($"{weight:N0} kg", row, 2, bold: bold, alignRight: true);
+            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, (h3 == null) ? 2 : 1, bold: bold, color: color);
+            if (h3 != null) grid.AddToolTipCell(h3 + ":", row, 2, 1, bold: bold, color: color);
+            grid.AddToolTipCell($"{weight:N0} kg", row, 3, bold: bold, alignRight: true, color: color);
             if (total1 != null && total1 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 3, bold: bold, alignRight: true);
+                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 4, bold: bold, alignRight: true, color: color);
-            if (total2 != 0)
+            if (total2 != null && total2 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 4, bold: bold, alignRight: true);
+                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 5, bold: bold, alignRight: true, color: color);
+            if (total3 != 0)
+                grid.AddToolTipCell($"{weight * 100.0 / total3:N1} %", row, 6, bold: bold, alignRight: true, color: color);
         }
 
-        private static void AddGradationToolTipRow(Grid grid, int row, string? h1, string? h2, double min, double avg, double max) {
+        private static void AddGradationToolTipRow(Grid grid, int row, string? h1, string? h2, string? h3, double min, double avg, double max, string? type) {
-            var bold = h2 == null;
+            var bold = h3 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            var color = type == "R" ? Brushes.Firebrick : type == "W" ? Brushes.ForestGreen : null;
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, bold: bold);
+            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? (h3 == null) ? 3 : 2 : 1, bold: bold, color: color);
-            grid.AddToolTipCell($"{min:N1}°", row, 2, bold: bold, alignRight: true);
+            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, (h3 == null) ? 2 : 1, bold: bold, color: color);
-            grid.AddToolTipCell($"{avg:N1}°", row, 3, bold: bold, alignRight: true);
+            if (h3 != null) grid.AddToolTipCell(h3 + ":", row, 2, bold: bold, color: color);
-            grid.AddToolTipCell($"{max:N1}°", row, 4, bold: bold, alignRight: true);
+            grid.AddToolTipCell($"{min:N1}°", row, 3, bold: bold, alignRight: true, color: color);
+            grid.AddToolTipCell($"{avg:N1}°", row, 4, bold: bold, alignRight: true, color: color);
+            grid.AddToolTipCell($"{max:N1}°", row, 5, bold: bold, alignRight: true, color: color);
         }
 
-        public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
+        private static string? GetGroupName(params string?[] parts) {
-            var wGrid = new List<(string?, string?, int, int?, int)>();
+            return parts.All(p => p == null) ? null : string.Join(" / ", parts.Where(p => p != null));
+        }
+
+        public static async Task<(string WeightText, (string?, string?, string?, int, int?, int?, int, string?)[] WeightGrid, string GradationText, (string?, string?, string?, double, double, double, string?)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
+            var wGrid = new List<(string?, string?, string?, int, int?, int?, int, string?)>();
             var wText = "-";
-            var gGrid = new List<(string?, string?, double, double, double)>();
+            var gGrid = new List<(string?, string?, string?, double, double, double, string?)>();
             var gText = "-";
 
             var stat = (await deliveryParts.GroupBy(p => 0)
@@ -1013,11 +1025,11 @@ namespace Elwig.Services {
                 .Single();
 
             wText = $"{stat.Weight:N0} kg";
-            wGrid.Add(("Menge", null, stat.Weight, null, stat.Weight));
+            wGrid.Add(("Menge", null, null, stat.Weight, null, null, stat.Weight, null));
 
             if (stat.Min != null && stat.Max != null) {
                 gText = $"{stat.Min:N1}° / {stat.Avg:N1}° / {stat.Max:N1}°";
-                gGrid.Add(("Gradation", null, stat.Min.Value, stat.Avg, stat.Max.Value));
+                gGrid.Add(("Gradation", null, null, stat.Min.Value, stat.Avg, stat.Max.Value, null));
 
                 var attrGroups = await deliveryParts
                     .GroupBy(p => new { Attr = p.Attribute!.Name, Cult = p.Cultivation!.Name })
@@ -1034,9 +1046,10 @@ namespace Elwig.Services {
                     .ThenBy(g => g.Cult)
                     .ToListAsync();
                 var sortGroups = await deliveryParts
-                    .GroupBy(p => p.SortId)
+                    .GroupBy(p => new { p.SortId, p.Variety.Type })
                     .Select(g => new {
-                        SortId = g.Key,
+                        g.Key.SortId,
+                        g.Key.Type,
                         Weight = g.Sum(p => p.Weight),
                         Min = g.Min(p => p.Kmw),
                         Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
@@ -1049,11 +1062,13 @@ namespace Elwig.Services {
                     .GroupBy(p => new {
                         Attr = p.Attribute!.Name,
                         Cult = p.Cultivation!.Name,
+                        p.Variety.Type,
                         p.SortId,
                     })
                     .Select(g => new {
                         g.Key.Attr,
                         g.Key.Cult,
+                        g.Key.Type,
                         g.Key.SortId,
                         Weight = g.Sum(p => p.Weight),
                         Min = g.Min(p => p.Kmw),
@@ -1063,27 +1078,62 @@ namespace Elwig.Services {
                     .OrderByDescending(g => g.Weight)
                     .ThenBy(g => g.Attr)
                     .ThenBy(g => g.Cult)
+                    .ThenBy(g => g.Type)
                     .ThenBy(g => g.SortId)
                     .ToListAsync();
 
                 foreach (var attrG in attrGroups) {
-                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
+                    var name = GetGroupName(attrG.Attr, attrG.Cult);
-                    wGrid.Add((name, null, attrG.Weight, attrG.Weight, stat.Weight));
+                    var typeGroups = groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult)
+                        .GroupBy(g => g.Type)
+                        .Select(g => new { Type = g.Key, Weight = g.Sum(p => p.Weight) })
+                        .OrderByDescending(g => g.Weight).ThenBy(g => g.Type)
+                        .ToList();
+                    wGrid.Add((name, null, null, attrG.Weight, null, attrG.Weight, stat.Weight, typeGroups.Count == 1 ? typeGroups.First().Type : null));
+                    if (typeGroups.Count == 1) {
                         foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
-                        wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, stat.Weight));
+                            wGrid.Add((null, null, g.SortId, g.Weight, null, attrG.Weight, stat.Weight, null));
+                        }
+                    } else {
+                        foreach (var t in typeGroups) {
+                            wGrid.Add((null, t.Type == "R" ? "Rot" : "Weiß", null, t.Weight, t.Weight, attrG.Weight, stat.Weight, t.Type));
+                            foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult && g.Type == t.Type).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                                wGrid.Add((null, null, g.SortId, g.Weight, t.Weight, attrG.Weight, stat.Weight, null));
+                            }
+                        }
                     }
                 }
                 foreach (var attrG in attrGroups) {
-                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
+                    var name = GetGroupName(attrG.Attr, attrG.Cult);
-                    gGrid.Add((name, null, attrG.Min, attrG.Avg, attrG.Max));
+                    var typeGroups = groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult)
+                        .GroupBy(g => g.Type)
+                        .Select(g => new {
+                            Type = g.Key,
+                            Weight = g.Sum(p => p.Weight),
+                            Min = g.Min(p => p.Min),
+                            Avg = g.Sum(p => p.Avg * p.Weight) / g.Sum(p => p.Weight),
+                            Max = g.Max(p => p.Max),
+                        })
+                        .OrderByDescending(g => g.Weight).ThenBy(g => g.Type)
+                        .ToList();
+                    gGrid.Add((name, null, null, attrG.Min, attrG.Avg, attrG.Max, typeGroups.Count == 1 ? typeGroups.First().Type : null));
+                    if (typeGroups.Count == 1) {
                         foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
-                        gGrid.Add((null, g.SortId, g.Min, g.Avg, g.Max));
+                            gGrid.Add((null, null, g.SortId, g.Min, g.Avg, g.Max, null));
+                        }
+                    } else {
+                        foreach (var t in typeGroups) {
+                            gGrid.Add((null, t.Type == "R" ? "Rot" : "Weiß", null, t.Min, t.Avg, t.Max, t.Type));
+                            foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult && g.Type == t.Type).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
+                                gGrid.Add((null, null, g.SortId, g.Min, g.Avg, g.Max, null));
+                            }
+                        }
                     }
                 }
 
                 if (attrGroups.Count == 1) {
                     var g = attrGroups.First();
-                    var name = g.Attr == null && g.Cult == null ? null : g.Attr + (g.Attr != null && g.Cult != null ? " / " : "") + g.Cult;
+                    var name = GetGroupName(g.Attr, g.Cult);
                     if (name != null) {
                         wText += $" [{name}]";
                         gText += $" [{name}]";
@@ -1094,40 +1144,43 @@ namespace Elwig.Services {
 
                     }
                 } else if (attrGroups.Count <= 4) {
-                    wText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / stat.Weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                    wText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / stat.Weight:0%})" + (GetGroupName(g.Attr, g.Cult) is string s ? $" [{s}]" : "")))}";
-                    gText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                    gText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (GetGroupName(g.Attr, g.Cult) is string s ? $" [{s}]" : "")))}";
                 }
             }
 
             return (wText, wGrid.ToArray(), gText, gGrid.ToArray());
         }
 
-        public static (Grid WeightGrid, Grid GradationGrid) GenerateToolTip((string?, string?, int, int?, int)[] weightData, (string?, string?, double, double, double)[] gradationData) {
+        public static (Grid WeightGrid, Grid GradationGrid) GenerateToolTip((string?, string?, string?, int, int?, int?, int, string?)[] weightData, (string?, string?, string?, double, double, double, string?)[] gradationData) {
             var wGrid = new Grid();
             wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
             wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             int rowNum = 0;
             foreach (var row in weightData) {
-                if (rowNum != 0 && row.Item2 == null) rowNum++;
+                if (rowNum != 0 && row.Item2 == null && row.Item3 == null) rowNum++;
-                AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+                AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5, row.Item6, row.Item7, row.Item8);
             }
 
             var gGrid = new Grid();
             gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(80) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.AddToolTipCell("Min.", 0, 2, alignCenter: true);
+            gGrid.AddToolTipCell("Min.", 0, 3, alignCenter: true);
-            gGrid.AddToolTipCell("⌀", 0, 3, alignCenter: true);
+            gGrid.AddToolTipCell("⌀", 0, 4, alignCenter: true);
-            gGrid.AddToolTipCell("Max.", 0, 4, alignCenter: true);
+            gGrid.AddToolTipCell("Max.", 0, 5, alignCenter: true);
             rowNum = 1;
             foreach (var row in gradationData) {
-                if (rowNum != 1 && row.Item2 == null) rowNum++;
+                if (rowNum != 1 && row.Item2 == null && row.Item3 == null) rowNum++;
-                AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+                AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5, row.Item6, row.Item7);
             }
 
             return (wGrid, gGrid);

Elwig/Services/MemberBusinessSharesService.cs

@@ -26,6 +26,7 @@ namespace Elwig.Services {
             vm.DateEffective = h.DateEffective;
             vm.Reason = h.Reason + (h.Reason == MemberHistory.REASON_TRANSFER ? $"_{(h.ToMgNr == mgnr ? "from" : "to")}" : "");
             vm.Shares = h.Shares;
+            vm.CompanyHasSigned = h.CompanyHasSigned;
             vm.MemberHasSigned = h.MemberHasSigned;
             vm.ValuePerShare = h.ValuePerShare;
             vm.OtherMgNr = h.FromMgNr != null && h.FromMgNr != mgnr ? h.FromMgNr : h.ToMgNr != null && h.ToMgNr != mgnr ? h.ToMgNr : null;
@@ -63,6 +64,7 @@ namespace Elwig.Services {
                     Reason = vm.Reason?.Split("_")[0] ?? MemberHistory.REASON_CONVERT,
                     Source = "manual",
                     Shares = vm.Shares ?? 0,
+                    CompanyHasSigned = vm.CompanyHasSigned,
                     MemberHasSigned = vm.MemberHasSigned,
                     ValuePerShare = vm.ValuePerShare,
                     CurrencyCode = vm.ValuePerShare != null ? "EUR" : null,

Elwig/Services/MemberService.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Media;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -106,6 +107,8 @@ namespace Elwig.Services {
 
             vm.UstIdNr = m.UstIdNr;
             vm.LfbisNr = m.LfbisNr;
+            vm.OrganicOperatorId = m.OrganicOperatorId;
+            vm.OrganicAuthorityCode = m.OrganicAuthorityCode;
             vm.IsBuchführend = m.IsBuchführend;
             vm.IsOrganic = m.IsOrganic;
 
@@ -187,10 +190,9 @@ namespace Elwig.Services {
                     .GroupBy(d => d.Year)
                     .ToDictionaryAsync(g => g.Key, g => g.Any());
 
+                await App.MainDispatcher.BeginInvoke(() => {
                     if (m.MgNr != vm.MgNr)
                         return;
-
-                await App.MainDispatcher.BeginInvoke(() => {
                     var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
                     var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
                     var grid = AreaComService.GenerateToolTip(gridData);
@@ -203,13 +205,65 @@ namespace Elwig.Services {
                     vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
                     vm.StatusAreaCommitment = text;
                     vm.StatusAreaCommitmentToolTip = grid;
-                    vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, false)).ToList();
+                    vm.MemberHasDeliveries = [.. Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, false))];
+                });
+            });
+
+            vm.OrganicTest1 = null;
+            vm.OrganicTest2 = "...";
+            vm.OrganicTest3 = Brushes.Black;
+            vm.OrganicTest4 = null;
+            Utils.RunBackground("Bio-Zertifikatsdaten laden", async () => {
+                if (App.MainDispatcher == null || !m.IsOrganic)
+                    return;
+
+                var certs = await OrganicService.GetTracesCertificates(m);
+
+                // TODO button for TRACES search url
+                // TODO button for authority search url
+
+                await App.MainDispatcher.BeginInvoke(() => {
+                    if (m.MgNr != vm.MgNr)
+                        return;
+                    vm.OrganicTest2 = null;
+                    if (certs.Length == 0) {
+                        vm.OrganicTest1 = "Nicht gefunden";
+                        vm.OrganicTest3 = Brushes.DarkRed;
+                    } else {
+                        var cert = certs[0];
+                        vm.OrganicTest4 = $"Zertifikat-Nr.: {cert.Id}\nBio-KSt.: {cert.AuthorityCode}\nEU Operator-ID: {cert.OperatorId}\nOperator: {cert.OperatorName}";
+                        if (cert.IsValidForWineProduction) {
+                            vm.OrganicTest1 = "Gültig";
+                            vm.OrganicTest2 = $" (bis {cert.ExpiresOn:dd.MM.yyyy})";
+                            vm.OrganicTest3 = Brushes.DarkGreen;
+                        } else if (cert.IsValid) {
+                            vm.OrganicTest1 = "Teilw. gültig";
+                            vm.OrganicTest2 = $" (bis {cert.ExpiresOn:dd.MM.yyyy})";
+                            vm.OrganicTest3 = Brushes.OrangeRed;
+                        } else {
+                            vm.OrganicTest3 = Brushes.DarkRed;
+                            switch (cert.Status) {
+                                case OrganicService.TracesStatus.ISSUED:
+                                    vm.OrganicTest1 = "Ausgestellt";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.SUSPENDED:
+                                    vm.OrganicTest1 = "Gesperrt";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.EXPIRED:
+                                    vm.OrganicTest1 = "Ausgelaufen";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                                case OrganicService.TracesStatus.WITHDRAWN:
+                                    vm.OrganicTest1 = "Widerrufen";
+                                    vm.OrganicTest2 = $" (am {cert.LastStatusUpdateOn:dd.MM.yyyy})"; break;
+                            }
+                        }
+                    }
                 });
             });
 
             vm.MemberHasEmail = m.EmailAddresses.Count > 0;
             vm.MemberCanSendEmail = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
-            vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => false).ToList();
+            vm.MemberHasDeliveries = [.. Enumerable.Range(0, 9999).Select(i => false)];
         }
 
         public static async Task<(List<string>, IQueryable<Member>, List<string>)> GetFilters(this MemberAdminViewModel vm, AppDbContext ctx) {
@@ -555,6 +609,8 @@ namespace Elwig.Services {
 
                 UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
                 LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                OrganicOperatorId = string.IsNullOrWhiteSpace(vm.OrganicOperatorId) ? null : vm.OrganicOperatorId,
+                OrganicAuthorityCode = string.IsNullOrWhiteSpace(vm.OrganicAuthorityCode) ? null : vm.OrganicAuthorityCode,
                 IsBuchführend = vm.IsBuchführend,
                 IsOrganic = vm.IsOrganic,
 

Elwig/Services/OrganicService.cs

@@ -0,0 +1,143 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace Elwig.Services {
+    public static class OrganicService {
+
+        public const string TRACES_API_URL = "https://webgate.ec.europa.eu/tracesnt/directory/publication/organic-operator/for/query";
+        public const string TRACES_PDF_URL_PREFIX = "https://webgate.ec.europa.eu/tracesnt/directory/publication/organic-operator/digitally-signed/";
+
+        public enum TracesStatus {
+            ISSUED, SUSPENDED, WITHDRAWN, EXPIRED
+        }
+
+        public enum TracesActivity {
+            PREPARATION, EXPORT, IMPORT, STORING, PRODUCTION, DISTRIBUTION, DISTRIBUTION_PLACING_ON_THE_MARKET
+        }
+
+        public enum TracesCategoryOfProduct {
+            UNPROCESSED_PLANT_PRODUCTS_INCLUDING_SEEDS, LIVESTOCK_AND_UNPROCESSED_LIVESTOCK_PRODUCTS, ALGAE_AND_UNPROCESSED_AQUACULTURE_PRODUCTS,
+            PROCESSED_AGRICULTURAL_PRODUCTS_INCLUDING_AQUACULTURE_FOR_USE_AS_FOOD, FEED, WINE, OTHER_PRODUCTS_NOT_COVERED_BY_PREVIOUS_CATEGORIES
+        }
+
+        public record TracesCertificate {
+            public required string Id { get; init; }
+            public required string AuthorityCode { get; init; }
+            public required string OperatorId { get; init; }
+            public required string OperatorName { get; init; }
+            public required TracesActivity[] Activities { get; init; }
+            public required TracesCategoryOfProduct[] CategoriesOfProduct { get; init; }
+            public required DateOnly IssuedOn { get; init; }
+            public required DateOnly ExpiresOn { get; init; }
+            public required DateOnly LastStatusUpdateOn { get; init; }
+            public required TracesStatus Status { get; init; }
+
+            public string PdfUrl => TRACES_PDF_URL_PREFIX + Id + ".pdf";
+            public bool IsValid => Status == TracesStatus.ISSUED && IssuedOn.ToDateTime(new()) <= DateTime.Today && ExpiresOn.ToDateTime(new()) >= DateTime.Today;
+            public bool IsValidForWineProduction => IsValid && Activities.Contains(TracesActivity.PRODUCTION) &&
+                (CategoriesOfProduct.Contains(TracesCategoryOfProduct.UNPROCESSED_PLANT_PRODUCTS_INCLUDING_SEEDS) || CategoriesOfProduct.Contains(TracesCategoryOfProduct.WINE));
+        }
+
+        public async static Task<TracesCertificate[]> GetTracesCertificates(Member m, bool? tryNameAndAddress = null) {
+            // TODO cache
+            return await FetchTracesCertificates(m, tryNameAndAddress);
+        }
+
+        private async static Task<JsonArray> TryFetchTracesCertificates(Dictionary<string, string> query) {
+            var q = HttpUtility.ParseQueryString("");
+            q.Add("sort", "-issuedOn");
+            q.Add("countryCode", "AT");
+            foreach (var (k, v) in query) {
+                q.Add(k, v);
+            }
+
+            using var client = Utils.GetHttpClient();
+            using var res = await client.GetAsync($"{TRACES_API_URL}?{q}");
+            res.EnsureSuccessStatusCode();
+            var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
+            var certs = resJson?.AsArray() ?? throw new Exception();
+            if (certs.Count == 0)
+                throw new Exception();
+            return certs;
+        }
+
+        public static Task<TracesCertificate[]> FetchTracesCertificates(Member m, bool? tryNameAndAddress = null) {
+            return FetchTracesCertificates(m.OrganicOperatorId, m.LfbisNr,
+                (tryNameAndAddress ?? m.IsOrganic) ? m.BillingAddress is BillingAddr a ?
+                    (a.FullName, a.Address, $"{a.PostalDest.AtPlz?.Plz}") :
+                    (m.FullName, m.Address, $"{m.PostalDest.AtPlz?.Plz}") :
+                    null);
+        }
+
+        public async static Task<TracesCertificate[]> FetchTracesCertificates(string? oocId, string? lfbisNr, (string Name, string Address, string PostalCode)? address) {
+            bool searchedByName = false;
+
+            JsonArray? jsonCerts = null;
+            if (oocId != null) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorIdentifierType", "ooc_identifier" },
+                        { "operatorIdentifierSearchOperator", "STRICT" },
+                        { "operatorIdentifier", oocId },
+                    });
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+
+            if (jsonCerts == null && lfbisNr != null) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorIdentifierType", "comp_reg" },
+                        { "operatorIdentifierSearchOperator", "STRICT" },
+                        { "operatorIdentifier", lfbisNr.TrimStart('0') },
+                    });
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+
+            if (jsonCerts == null && address != null) {
+                try {
+                    jsonCerts = await TryFetchTracesCertificates(new Dictionary<string, string> {
+                        { "operatorPostalCode", address.Value.PostalCode },
+                        { "query", $"{address.Value.Name} {address.Value.Address}" },
+                    });
+                    searchedByName = true;
+                } catch {
+                    jsonCerts = null;
+                }
+            }
+
+            if (jsonCerts == null)
+                return [];
+
+            TracesCertificate[] certs = [];
+            try {
+                certs = [.. jsonCerts.Select(j => new TracesCertificate {
+                    Id = j!["reference"]?.GetValue<string>() ?? throw new Exception(),
+                    AuthorityCode = j["issuingBody"]?["code"]?.GetValue<string>() ?? throw new Exception(),
+                    OperatorId = j["operatorIdentifier"]?.GetValue<string>() ?? throw new Exception(),
+                    OperatorName = j["operator"]?["name"]?.GetValue<string>() ?? throw new Exception(),
+                    Activities = [.. j["activities"]?.AsArray().Select(a => Enum.Parse<TracesActivity>(a?["id"]?.GetValue<string>().ToUpper().Replace("_IMPORT", "IMPORT") ?? throw new Exception())) ?? []],
+                    CategoriesOfProduct = [.. j["categoriesOfProduct"]?.AsArray().Select(c => Enum.Parse<TracesCategoryOfProduct>(c?["id"]?.GetValue<string>() ?? throw new Exception())) ?? []],
+                    IssuedOn = DateOnly.FromDateTime(DateTime.ParseExact(j["issuedOn"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-ddTHH:mm:ss.fffK", CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                    ExpiresOn = DateOnly.ParseExact(j["expiresOn"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-dd"),
+                    LastStatusUpdateOn = DateOnly.FromDateTime(DateTime.ParseExact(j["lastStatusUpdateDateTime"]?.GetValue<string>() ?? throw new Exception(), "yyyy-MM-ddTHH:mm:ss.fffK", CultureInfo.InvariantCulture, DateTimeStyles.None)),
+                    Status = Enum.Parse<TracesStatus>(j["status"]?["id"]?.GetValue<string>() ?? throw new Exception()),
+                })];
+            } catch {
+                return [];
+            }
+
+            return (!searchedByName || certs.Where(c => c.Status == TracesStatus.ISSUED).Select(c => c.OperatorId).ToHashSet().Count == 1) ? certs : [];
+        }
+    }
+}

Elwig/ViewModels/DeliveryAdminViewModel.cs

@@ -125,7 +125,7 @@ namespace Elwig.ViewModels {
             get => int.TryParse(TareString?.Replace(Utils.GroupSeparator, "").Replace(" kg", ""), out var w) ? w : null;
             set => TareString = value == null ? "-" : $"{value:N0} kg{(TargetTare != null ? "*" : "")}";
         }
-        public int ActualTare;
+        public int? ActualTare;
         public int? TargetTare;
         [ObservableProperty]
         private bool _isManualWeighing;

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -6,6 +6,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
@@ -118,10 +119,23 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _lfbisNr;
         [ObservableProperty]
+        private string? _organicOperatorId;
+        [ObservableProperty]
+        private string? _organicAuthorityCode;
+        [ObservableProperty]
         private bool _isBuchführend;
         [ObservableProperty]
         private bool _isOrganic;
 
+        [ObservableProperty]
+        private string? _organicTest1;
+        [ObservableProperty]
+        private string? _organicTest2;
+        [ObservableProperty]
+        private Brush? _organicTest3;
+        [ObservableProperty]
+        private string? _organicTest4;
+
         [ObservableProperty]
         private string? _entryDate;
         [ObservableProperty]

Elwig/ViewModels/MemberBusinessSharesViewModel.cs

@@ -52,6 +52,8 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _deduct;
         [ObservableProperty]
+        private bool _companyHasSigned;
+        [ObservableProperty]
         private bool _memberHasSigned;
         [ObservableProperty]
         private string? _valuePerShareString;

Elwig/Windows/AdministrationWindow.cs

@@ -576,6 +576,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
 
+        protected void OrganicOperatorIdInput_TextChanged(object sender, TextChangedEventArgs? evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckOrganicOperatorId);
+        }
+
+        protected void OrganicOperatorIdInput_LostFocus(object sender, RoutedEventArgs? evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckOrganicOperatorId);
+        }
+
         protected void OrganicAuthorityCodeInput_TextChanged(object sender, TextChangedEventArgs? evt) {
             InputTextChanged((TextBox)sender, Validator.CheckOrganicAuthorityCode);
         }

Elwig/Windows/BaseDataWindow.xaml

@@ -109,24 +109,30 @@
                     <TextBox x:Name="ClientBicInput" Margin="0,250,10,0" Grid.Column="1"
                          TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
 
-                    <Label Content="UID:"
-                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,100,0,10"/>
-                    <TextBox x:Name="ClientUstIdNrInput"
-                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,100,10,10" Width="96"
-                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
-
                     <Label Content="Betriebs-Nr.:"
-                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,130,0,10"/>
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,100,0,10"/>
                     <TextBox x:Name="ClientLfbisNrInput"
-                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,130,10,10" Width="64"
+                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,100,10,10" Width="64"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                    <Label Content="Bio-Kontrollstelle:"
+                    <Label Content="UID:"
-                           VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,110,10"/>
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,130,0,10"/>
-                    <TextBox x:Name="ClientOrganicAuthorityInput"
+                    <TextBox x:Name="ClientUstIdNrInput"
-                             VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,10,10" Width="90"
+                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,130,10,10" Width="96"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+
+                    <Label Content="Bio-KSt.:" ToolTip="Bio-Konstrollstelle"
+                           VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,100,110,10"/>
+                    <TextBox x:Name="ClientOrganicAuthorityCodeInput"
+                             VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,100,10,10" Width="91"
                              TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
 
+                    <Label Content="OOC-ID:" ToolTip="Bio-EU-Operator-ID / Organic Operator Certificate ID"
+                           VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,110,10"/>
+                    <TextBox x:Name="ClientOrganicOperatorIdInput"
+                             VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,10,10" Width="91"
+                             TextChanged="OrganicOperatorIdInput_TextChanged" LostFocus="OrganicOperatorIdInput_LostFocus"/>
+
                     <Label Content="Telefon-Nr.:"
                            VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,160,0,10"/>
                     <TextBox x:Name="ClientPhoneNrInput" Margin="0,160,10,10" Grid.Column="3"
@@ -320,6 +326,10 @@
                         <Label Content="Beschreibung:" Margin="10,70,0,10"/>
                         <TextBox x:Name="WineCultivationDescriptionInput" Grid.Column="1" Margin="0,70,10,10"
                                  TextChanged="WineCultivation_Changed"/>
+
+                        <CheckBox x:Name="WineCultivationOrganicInput" Content="Bio" Grid.Column="1" Margin="0,105,10,10"
+	                              Checked="WineCultivation_Changed" Unchecked="WineCultivation_Changed"
+	                              HorizontalAlignment="Left"  VerticalAlignment="Top"/>
                     </Grid>
                 </Grid>
             </TabItem>

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -72,10 +72,12 @@ namespace Elwig.Windows {
                 WineCultivationIdInput.Text = "";
                 WineCultivationNameInput.Text = "";
                 WineCultivationDescriptionInput.Text = "";
+                WineCultivationOrganicInput.IsChecked = false;
             } else {
                 WineCultivationIdInput.Text = cult.CultId;
                 WineCultivationNameInput.Text = cult.Name;
                 WineCultivationDescriptionInput.Text = cult.Description;
+                WineCultivationOrganicInput.IsChecked = cult.IsOrganic;
             }
             _cultUpdate = false;
         }
@@ -105,7 +107,8 @@ namespace Elwig.Windows {
             _cultChanged = _cultChanged ||
                 WineCultivationIdInput.Text != cult.CultId ||
                 WineCultivationNameInput.Text != cult.Name ||
-                WineCultivationDescriptionInput.Text != (cult.Description ?? "");
+                WineCultivationDescriptionInput.Text != (cult.Description ?? "") ||
+                WineCultivationOrganicInput.IsChecked != cult.IsOrganic;
 
             var old = _cultIds.GetValueOrDefault(cult);
             var id = WineCultivationIdInput.Text ?? "";
@@ -113,7 +116,8 @@ namespace Elwig.Windows {
             cult.CultId = id;
             cult.Name = WineCultivationNameInput.Text ?? "";
             cult.Description = WineCultivationDescriptionInput.Text ?? "";
-            if (cult.Description.Length == 0) cult.Description = null;
+            cult.IsOrganic = WineCultivationOrganicInput.IsChecked ?? false;
+            if (string.IsNullOrWhiteSpace(cult.Description)) cult.Description = null;
 
             CollectionViewSource.GetDefaultView(_cultList).Refresh();
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -25,7 +25,7 @@ namespace Elwig.Windows {
                 BranchAddressInput, BranchPhoneNrInput, BranchFaxNrInput, BranchMobileNrInput,
                 WineAttributeIdInput, WineAttributeNameInput, WineAttributeActiveInput,
                 WineAttributeMaxKgPerHaInput, WineAttributeStrictInput, WineAttributeFillLowerInput,
-                WineCultivationIdInput, WineCultivationNameInput, WineCultivationDescriptionInput,
+                WineCultivationIdInput, WineCultivationNameInput, WineCultivationDescriptionInput, WineCultivationOrganicInput,
                 AreaCommitmentTypeIdInput, AreaCommitmentTypeWineVariantInput, AreaCommitmentTypeWineAttributeInput,
                 AreaCommitmentTypeMinKgPerHaInput, AreaCommitmentTypePenaltyPerKgInput,
                 AreaCommitmentTypePenaltyInput, AreaCommitmentTypePenaltyNoneInput,
@@ -67,6 +67,7 @@ namespace Elwig.Windows {
             WineCultivationIdInput.IsReadOnly = true;
             WineCultivationNameInput.IsReadOnly = true;
             WineCultivationDescriptionInput.IsReadOnly = true;
+            WineCultivationOrganicInput.IsEnabled = false;
 
             AreaCommitmentTypeWineVariantInput.IsEnabled = false;
             AreaCommitmentTypeWineAttributeInput.IsEnabled = false;
@@ -115,6 +116,7 @@ namespace Elwig.Windows {
             WineCultivationIdInput.IsReadOnly = false;
             WineCultivationNameInput.IsReadOnly = false;
             WineCultivationDescriptionInput.IsReadOnly = false;
+            WineCultivationOrganicInput.IsEnabled = true;
 
             AreaCommitmentTypeWineVariantInput.IsEnabled = true;
             AreaCommitmentTypeWineAttributeInput.IsEnabled = true;
@@ -329,7 +331,8 @@ namespace Elwig.Windows {
             ClientBicInput.Text = p.Bic;
             ClientUstIdNrInput.Text = p.UstIdNr;
             ClientLfbisNrInput.Text = p.LfbisNr;
-            ClientOrganicAuthorityInput.Text = p.OrganicAuthority;
+            ClientOrganicOperatorIdInput.Text = p.OrganicOperatorId;
+            ClientOrganicAuthorityCodeInput.Text = p.OrganicAuthorityCode;
             ClientPhoneNrInput.Text = p.PhoneNr;
             ClientFaxNrInput.Text = p.FaxNr;
             ClientEmailAddressInput.Text = p.EmailAddress;
@@ -369,7 +372,8 @@ namespace Elwig.Windows {
             p.Bic = string.IsNullOrWhiteSpace(ClientBicInput.Text) ? null : ClientBicInput.Text;
             p.UstIdNr = string.IsNullOrWhiteSpace(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
             p.LfbisNr = string.IsNullOrWhiteSpace(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
-            p.OrganicAuthority = string.IsNullOrWhiteSpace(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
+            p.OrganicOperatorId = string.IsNullOrWhiteSpace(ClientOrganicOperatorIdInput.Text) ? null : ClientOrganicOperatorIdInput.Text;
+            p.OrganicAuthorityCode = string.IsNullOrWhiteSpace(ClientOrganicAuthorityCodeInput.Text) ? null : ClientOrganicAuthorityCodeInput.Text;
             p.PhoneNr = string.IsNullOrWhiteSpace(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
             p.FaxNr = string.IsNullOrWhiteSpace(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
             p.EmailAddress = string.IsNullOrWhiteSpace(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -614,7 +614,7 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(p);
-            CorrectTareButton.Visibility = !ViewModel.IsReceipt && (ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
+            CorrectTareButton.Visibility = !ViewModel.IsReceipt && ((ViewModel.ActualTare is int t && t != 0) || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
             FinishInputFilling();
         }
 
@@ -625,13 +625,13 @@ namespace Elwig.Windows {
         }
 
         private void CorrectTareButton_Click(object sender, RoutedEventArgs evt) {
-            var lastCorrection = (ViewModel.TargetTare ?? ViewModel.ActualTare) - ViewModel.ActualTare;
+            var lastCorrection = (ViewModel.TargetTare ?? ViewModel.ActualTare ?? 0) - (ViewModel.ActualTare ?? 0);
             var correction = Utils.ShowTareCorrectionDialog(ViewModel.ActualTare, ViewModel.TargetTare);
             if (correction == null) return;
             ViewModel.Weight += lastCorrection - correction;
-            ViewModel.TargetTare = correction == 0 ? null : ViewModel.ActualTare + correction;
-            ViewModel.Tare = ViewModel.TargetTare ?? ViewModel.ActualTare;
             if (ViewModel.WeighingData is string s) {
+                ViewModel.TargetTare = correction == 0 ? null : (ViewModel.ActualTare ?? 0) + correction;
+                ViewModel.Tare = ViewModel.TargetTare ?? ViewModel.ActualTare;
                 var obj = JsonNode.Parse(s)!.AsObject();
                 if (correction == 0) {
                     obj.Remove("tare_correction");
@@ -673,16 +673,16 @@ namespace Elwig.Windows {
         private void OnWeighingResult(IScale scale, WeighingResult res) {
             if ((res.NetWeight ?? 0) > 0 && res.FullWeighingId != null) {
                 ViewModel.Weight = res.NetWeight;
-                ViewModel.ActualTare = res.TareWeight ?? 0;
+                ViewModel.ActualTare = res.TareWeight;
                 ViewModel.TargetTare = null;
-                ViewModel.Tare = ViewModel.ActualTare != 0 ? ViewModel.ActualTare : null;
+                ViewModel.Tare = ViewModel.ActualTare is int t && t != 0 ? t : null;
                 ViewModel.ScaleTerminalId = scale.ScaleTerminalId;
                 ViewModel.WeighingData = res.ToJson().ToJsonString();
                 ViewModel.ManualWeighingReason = null;
                 ManualWeighingInput.IsChecked = false;
             } else {
                 ViewModel.Weight = null;
-                ViewModel.ActualTare = 0;
+                ViewModel.ActualTare = null;
                 ViewModel.TargetTare = null;
                 ViewModel.Tare = null;
                 ViewModel.ScaleTerminalId = null;
@@ -1410,7 +1410,7 @@ namespace Elwig.Windows {
         private void UnloadingInput_Checked(object sender, RoutedEventArgs evt) {
             if (!IsEditing && !IsCreating) return;
             if (!ViewModel.IsReceipt)
-                CorrectTareButton.Visibility = ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox ? Visibility.Visible : Visibility.Hidden;
+                CorrectTareButton.Visibility = (ViewModel.ActualTare is int t && t != 0) || ViewModel.IsUnloadingBox ? Visibility.Visible : Visibility.Hidden;
             var mod = ViewModel.Modifiers.ToList();
             var source = ViewModel.ModifiersSource.ToList();
             if (App.Client.IsMatzen) {

Elwig/Windows/MemberAdminWindow.xaml

@@ -547,37 +547,47 @@
             <GroupBox Header="Betrieb" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="85"/>
-                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition Width="69"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="55"/>
+                        <ColumnDefinition Width="101"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
-
-                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="LfbisNrInput" Text="{Binding LfbisNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                             Margin="0,10,5,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
+                    <Label Content="UID:" Margin="10,40,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
+                             Margin="0,40,5,0" Grid.Column="0" Grid.ColumnSpan="2" Width="96" HorizontalAlignment="Right"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
 
                     <CheckBox x:Name="OrganicInput" Content="Bio" IsChecked="{Binding IsOrganic, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="5,15,0,0" VerticalAlignment="Top"/>
-                    <Button x:Name="OrganicButton" Content="easy-cert.com" IsEnabled="{Binding IsMemberSelected}"
+
-                            Height="25" FontSize="12"
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
-                            Click="OrganicButton_Click"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="5,45,0,0" VerticalAlignment="Top"/>
+
+                    <Label Content="Kontrollstelle:" Margin="0,10,5,0" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" ToolTip="Bio-Kontrollstelle"/>
+                    <TextBox x:Name="OrganicAuthorityCodeInput" Text="{Binding OrganicAuthorityCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,10,10,0" Grid.Column="4" Width="91" HorizontalAlignment="Left"
+                             TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
+
+                    <Label Content="OOC-ID:" Margin="0,40,0,0" Grid.Column="3" HorizontalAlignment="Left" ToolTip="Bio-EU-Operator-ID / Organic Operator Certificate ID"/>
+                    <TextBox x:Name="OrganicOperatorIdInput" Text="{Binding OrganicOperatorId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,0" Grid.Column="4" Width="91" HorizontalAlignment="Left"
+                             TextChanged="OrganicOperatorIdInput_TextChanged" LostFocus="OrganicOperatorIdInput_LostFocus"/>
                 </Grid>
             </GroupBox>
             <GroupBox Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
                 <GroupBox.Header>
-                    <TextBlock>Rechnungsadresse (optional) <Run FontSize="10">für Lieferschein, Anlfrg.-Bstng., Tr.-Gutschr.</Run></TextBlock>
+                    <TextBlock>Rechnungsadresse (optional)
+                        <Run FontSize="10">für Lieferschein, Anlfrg.-Bstng., Tr.-Gutschr.</Run>
+                    </TextBlock>
                 </GroupBox.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -608,7 +618,7 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="120"/>
-                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="135"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
 
@@ -655,6 +665,11 @@
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top"/>
 
+                    <Label Content="Bio-Zert.:" Margin="10,100,0,0" Grid.Column="2" HorizontalAlignment="Left"/>
+                    <TextBlock FontSize="14" Margin="70,102,10,0" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" ToolTip="{Binding OrganicTest4}">
+                        <Run Text="{Binding OrganicTest1}" FontWeight="Bold" Foreground="{Binding OrganicTest3}"/><Run FontSize="12" Text="{Binding OrganicTest2}"/>
+                    </TextBlock>
+
                     <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
                     <ComboBox x:Name="BranchInput" SelectedItem="{Binding Branch, Mode=TwoWay}" ItemsSource="{Binding BranchSource, Mode=TwoWay}"
                               DisplayMemberPath="Name" TextSearch.TextPath="Name"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -7,7 +7,6 @@ using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -966,17 +965,6 @@ namespace Elwig.Windows {
             }
         }
 
-        private void OrganicButton_Click(object sender, RoutedEventArgs evt) {
-            if (ViewModel.SelectedMember is not Member m) return;
-            var url = "https://www.easy-cert.com/htm/suchergebnis.htm?" +
-                //$"CustomerNumber={m.LfbisNr}&" +
-                $"Name={(m.BillingAddress?.FullName ?? m.FullName).Replace(' ', '+')}&" +
-                $"PostalCode={(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}";
-            Process.Start(new ProcessStartInfo(url) {
-                UseShellExecute = true,
-            });
-        }
-
         private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
             if (ViewModel.SelectedMember is not Member m || m.PredecessorMgNr == null) return;
             FocusMember((int)m.PredecessorMgNr);

Elwig/Windows/MemberBusinessSharesAdminWindow.xaml

@@ -173,8 +173,11 @@
                              Margin="0,100,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="DateNoticeInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
+                    <CheckBox x:Name="HasCompanySignedInput" IsChecked="{Binding CompanyHasSigned, Mode=TwoWay}" Content="Von WG unterfertigt"
+	                          Margin="88,105,10,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
+	                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
                     <CheckBox x:Name="HasMemberSignedInput" IsChecked="{Binding MemberHasSigned, Mode=TwoWay}" Content="Von Mg. unterfertigt"
-                              Margin="88,105,10,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="TOp"
+                              Margin="88,135,10,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
 
                     <Label Content="Wirksam:" Margin="10,130,0,0" Grid.Column="0"/>

Tests/E2ETests/MemberAdminWindowTest.cs

@@ -84,12 +84,12 @@ namespace Tests.E2ETests {
             Window.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
             Thread.Sleep(500);
             var memberListRow = Window.FindElement(By.WpfId("MemberList")).FindElement(By.ClassName("DataGridRow"));
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(memberListRow, Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("9999 ")), Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("Norbert")), Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("Neuling")), Is.Not.Null);
-            });
+            }
         }
 
         [Test]
@@ -128,12 +128,12 @@ namespace Tests.E2ETests {
             Assert.That(memberListRows, Has.Count.EqualTo(1));
 
             var memberListRow = memberListRows.First();
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(memberListRow, Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("9999 ")), Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("Norbert")), Is.Not.Null);
                 Assert.That(memberListRow.FindElement(By.Name("Neuling")), Is.Not.Null);
-            });
+            }
 
             Window.FindElement(By.WpfId("DeleteMemberButton")).Click();
             var dialog = Session.CreateWindowDriver("DeleteMemberDialog");

Tests/Resources/Sql/BillingInsert.sql

@@ -1,8 +1,8 @@
 -- inserts for HelperTests.BillingTest
 
-INSERT INTO wine_cultivation (cultid, name, description) VALUES
+INSERT INTO wine_cultivation (cultid, name, description, organic) VALUES
-('KIP', 'KIP', 'Kontrollierte Integrierte Produktion'),
+('KIP', 'KIP', 'Kontrollierte Integrierte Produktion', FALSE),
-('B',   'Bio', 'AT-BIO-302');
+('B',   'Bio', 'Biologische Produktion', TRUE);
 
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0),

Tests/Resources/Sql/DocumentInsert.sql

@@ -1,7 +1,7 @@
 -- inserts for DocumentTests
 
-INSERT INTO wine_cultivation (cultid, name, description) VALUES
+INSERT INTO wine_cultivation (cultid, name, description, organic) VALUES
-('B', 'Bio', 'AT-BIO-302');
+('B', 'Bio', 'Biologische Produktion', TRUE);
 
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0);

Tests/Resources/Sql/E2EInsert.sql

@@ -1,8 +1,8 @@
 -- inserts for E2ETests
 
-INSERT INTO wine_cultivation (cultid, name, description) VALUES
+INSERT INTO wine_cultivation (cultid, name, description, organic) VALUES
-('KIP', 'KIP', 'Kontrollierte Integrierte Produktion'),
+('KIP', 'KIP', 'Kontrollierte Integrierte Produktion', FALSE),
-('B',   'Bio', 'AT-BIO-302');
+('B',   'Bio', 'Biologische Produktion', TRUE);
 
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0),

Tests/Resources/Sql/Insert.sql

@@ -66,11 +66,11 @@ INSERT INTO wb_kg (kgnr, glnr) VALUES
 (15216, 2),
 (15224, 2);
 
-INSERT INTO member (mgnr, given_name, name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr) VALUES
+INSERT INTO member (mgnr, given_name, name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr, org_auth_code) VALUES
-(101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT811234567890123457', '0123463',         NULL ),
+(101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT811234567890123457', '0123463',         NULL ,        NULL ),
-(102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT541234567890123458', '0123471', 'ATU12345684'),
+(102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT541234567890123458', '0123471', 'ATU12345684',        NULL ),
-(103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT271234567890123459', '0123480',         NULL ),
+(103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT271234567890123459', '0123480',         NULL , 'AT-BIO-302'),
-(104, 'Waltraud',  'Winzer',      'X', FALSE, TRUE , 40, 212005138, 'Wiener Straße 15',  15224, 'AT971234567890123460', '0123498', 'ATU12345693');
+(104, 'Waltraud',  'Winzer',      'X', FALSE, TRUE , 40, 212005138, 'Wiener Straße 15',  15224, 'AT971234567890123460', '0123498', 'ATU12345693',        NULL );
 
 INSERT INTO member_billing_address (mgnr, name, country, postal_dest, address) VALUES
 (102, 'W&B Weinbauer GesbR',          40, 222303524, 'Winzerstraße 2'),

Tests/Resources/Sql/ServiceInsert.sql

@@ -1,8 +1,7 @@
 -- inserts for ServiceTests
 
-
+INSERT INTO wine_cultivation (cultid, name, description, organic) VALUES
-INSERT INTO wine_cultivation (cultid, name, description) VALUES
+('B',   'Bio', 'Biologische Produktion', TRUE);
-('B',   'Bio', 'AT-BIO-302');
 
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0);

Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs

@@ -8,7 +8,7 @@ namespace Tests.UnitTests.DocumentTests {
         public async Task Test_01_OneDeliveryPart() {
             using var doc = await DeliveryNote.Initialize(2020, 1);
             var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(text, Contains.Substring("""
                     MUSTERMANN Max
                     Winzerstraße 1
@@ -26,14 +26,14 @@ namespace Tests.UnitTests.DocumentTests {
                     Waage/Terminal: ?/1, ID: 321 – 09:02, 01.10.2020
                     Brutto: 3 219 kg – Tara: 0 kg – Netto: 3 219 kg – gerebelt gewogen
                     """));
-            });
+            }
         }
 
         [Test]
         public async Task Test_02_TwoDeliveryParts() {
             using var doc = await DeliveryNote.Initialize(2020, 4);
             var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(text, Contains.Substring("""
                     W&B Weinbauer GesbR
                     WEINBAUER Wernhardt
@@ -58,14 +58,14 @@ namespace Tests.UnitTests.DocumentTests {
                     Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
                     """));
                 Assert.That(text, Contains.Substring("Gesamt: 81 16,5 4 483"));
-            });
+            }
         }
 
         [Test]
         public async Task Test_03_DeliveryPartsWithAttribute() {
             using var doc = await DeliveryNote.Initialize(2020, 3);
             var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(text, Contains.Substring("""
                     MUSTERMANN Max
                     Winzerstraße 1
@@ -95,14 +95,14 @@ namespace Tests.UnitTests.DocumentTests {
                     Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
                     """));
                 Assert.That(text, Contains.Substring("Gesamt: 81 16,5 6 970"));
-            });
+            }
         }
 
         [Test]
         public async Task Test_04_DeliveryPartsWithCultivation() {
             using var doc = await DeliveryNote.Initialize(2020, 7);
             var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
+            using (Assert.EnterMultipleScope()) {
                 Assert.That(text, Contains.Substring("""
                     MUSTERBAUER Matthäus
                     Brünner Straße 10
@@ -115,20 +115,20 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht"));
                 Assert.That(text, Contains.Substring("""
                     1 Grüner Veltliner Wein 80 16,3 3 198
-                    Bewirtschaftung: Bio (AT-BIO-302)
+                    Bewirtschaftung: Bio (Biologische Produktion) – Kontrollstelle: AT-BIO-302
                     Herkunft: Österreich
                     / Wolkersdorfer Hochleithen / Wolkersdorf im Weinviertel / KG Wolkersdorf
                     Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
                     """));
                 Assert.That(text, Contains.Substring("""
                     2 Grüner Veltliner Qualitätswein 75 15,4 2 134
-                    Bewirtschaftung: Bio (AT-BIO-302)
+                    Bewirtschaftung: Bio (Biologische Produktion) – Kontrollstelle: AT-BIO-302
                     Herkunft: Österreich / Weinland / Niederösterreich
                     / Wolkersdorfer Hochleithen / Wolkersdorf im Weinviertel / KG Wolkersdorf
                     Waage/Terminal: ?/?, ID: ? (gerebelt gewogen)
                     """));
                 Assert.That(text, Contains.Substring("Gesamt: 78 15,9 5 332"));
-            });
+            }
         }
 
         [Test]

Tests/fetch-resources.bat

@@ -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=42" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"