Windows: Add filters to Titles in some AdministrationWindows

DeliveryNote: Fix missing ':' for Comment and Acid
Entities/Member: Add OrganicAuthorityCode
2026-09-01 16:24:27 +02:00 · 2026-09-01 12:02:34 +02:00 · 2026-08-29 15:35:40 +02:00
27 changed files with 77 additions and 260 deletions
@@ -2,30 +2,6 @@
 Changelog
 =========

-[v1.1.2.2][v1.1.2.2] (2026-09-14) {#v1.1.2.2}
---------------------------------------------
-
-### Neue Funktionen {#v1.1.2.2-features}
-
-* Bei einigen Fenstern werden in den Titeln nun die aktiven Filter der Suche angezeigt. (fea779bd95)
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) ist es nun möglich die Tara nachträglich zu korrigieren. (8ba051198f, 6436762e8d)
-
-### Behobene Fehler {#v1.1.2.2-bugfixes}
-
-* Bei Lieferscheinen (`DeliveryNote`) hat bei Anmerkungen zu Teil-Lfrg. ein `:` gefehlt.
-  Außerdem wurden Seitenumbrüche so platziert, dass sie nicht mehr innerhalb einer Teil-Lfrg. liegen. (e66780ccd0, f4cc443521)
-
-### Sonstiges {#v1.1.2.2-misc}
-
-* Bei Datenbank-Fehler sind die Fehlermeldungen nun genauer bzw. auf deutsch übersetzt. (cc01f92005)
-* Im Mitglieder-Fenster (`MemberAdminWindow`) wurden Überschriften und Tooltips leicht angepasst. (6441fa4f50)
-* Abhängigkeiten aktualisiert. (4cc33b56c8, 6bed370eba)
-
-[v1.1.2.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.2.2
-
-
-
-
 [v1.1.2.1][v1.1.2.1] (2026-08-27) {#v1.1.2.1}
 ---------------------------------------------

@@ -4,7 +4,6 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Elwig.Dialogs"
-        xmlns:ctrl="clr-namespace:Elwig.Controls"
        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
        WindowStartupLocation="CenterOwner"
        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
@@ -38,9 +37,11 @@
        </Grid.ColumnDefinitions>

        <Label Content="Gewicht:" Margin="10,20,10,10"/>
-        <ctrl:UnitTextBox x:Name="WeightInput" Grid.Column="1" Width="62" Height="25" Unit="kg"
-                          Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
-                          TextChanged="WeightInput_TextChanged"/>
+        <Grid Grid.Column="1" Width="70" Height="25" Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2"
+                     TextChanged="WeightInput_TextChanged"/>
+            <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/>
+        </Grid>

        <Label Content="Grund:" Margin="10,50,10,10"/>
        <TextBox x:Name="ReasonInput" Grid.Column="1" Margin="0,50,10,10"
@@ -6,8 +6,8 @@ using System.Windows.Controls;
 namespace Elwig.Dialogs {
    public partial class ManualWeighingDialog : Window {

-        public int Weight { get; private set; }
-        public string? Reason { get; private set; }
+        public int Weight = 0;
+        public string? Reason = null;

        public ManualWeighingDialog(string? reason = null) {
            InitializeComponent();
@@ -1,55 +0,0 @@
-<Window x:Class="Elwig.Dialogs.TareCorrectionDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Dialogs"
-        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
-        WindowStartupLocation="CenterOwner"
-        FocusManager.FocusedElement="{Binding ElementName=TargetTareInput}"
-        Title="Tara korrigieren" Height="170" Width="300">
-    <Window.Resources>
-        <Style TargetType="Label">
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Padding" Value="2,4,2,4"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-        <Style TargetType="TextBox">
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Padding" Value="2"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="TextWrapping" Value="NoWrap"/>
-        </Style>
-        <Style TargetType="Button">
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="VerticalAlignment" Value="Bottom"/>
-            <Setter Property="Width" Value="100"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-    </Window.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="70"/>
-            <ColumnDefinition Width="3*"/>
-        </Grid.ColumnDefinitions>
-
-        <Label Content="Ist-Tara:" Margin="10,20,0,10" Grid.Column="1"/>
-        <ctrl:UnitTextBox x:Name="ActualTareInput" Grid.Column="2" Width="56" Height="25" Unit="kg" IsReadOnly="True"
-                          Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
-                          TextChanged="TareInput_TextChanged"/>
-
-        <Label Content="Soll-Tara:" Margin="10,50,0,10" Grid.Column="1"/>
-        <ctrl:UnitTextBox x:Name="TargetTareInput" Grid.Column="2" Width="56" Height="25" Unit="kg"
-                          Margin="0,50,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
-                          TextChanged="TareInput_TextChanged"/>
-
-        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="3" IsEnabled="False" IsDefault="True"
-                Click="ConfirmButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="3" IsCancel="True"/>
-    </Grid>
-</Window>
@@ -1,36 +0,0 @@
-using Elwig.Helpers;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Elwig.Dialogs {
-    public partial class TareCorrectionDialog : Window {
-
-        public int ActualTare { get; private set; }
-        public int TargetTare { get; private set; }
-
-        public TareCorrectionDialog(int actualTare, int? targetTare = null) {
-            InitializeComponent();
-            ActualTare = actualTare;
-            TargetTare = targetTare ?? actualTare;
-            ActualTareInput.Text = ActualTare.ToString();
-            TargetTareInput.Text = TargetTare.ToString();
-            TargetTareInput.SelectAll();
-        }
-
-        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
-            DialogResult = true;
-            TargetTare = int.Parse(TargetTareInput.Text);
-            Close();
-        }
-
-        private void UpdateButtons() {
-            ConfirmButton.IsEnabled = TargetTareInput.Text.Length > 0;
-        }
-
-        private void TareInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (sender is not TextBox b) return;
-            Validator.CheckInteger(b, true, 4);
-            UpdateButtons();
-        }
-    }
-}
@@ -68,7 +68,7 @@ namespace Elwig.Documents {
                .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
                .AddCell(NewAsideCell("Mitglied", 2))
                .AddCell(NewAsideCell("Mitglieds-Nr.:", isName: true)).AddCell(NewAsideCell($"{Member.MgNr}"))
-                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? ""))
+                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell((Member.LfbisNr ?? "-") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : "")))
                .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
        }

@@ -138,8 +138,7 @@ namespace Elwig.Documents {
            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)
                    .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
-                    .SetKeepTogether(true);
+                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);

                int rowspan = 1 + (part.Cultivation != null ? 1 : 0) + 1 + part.Modifiers.Count() + 1 + (part.Comment != null ? 1 : 0) + (part.Temperature != null || part.Acid != null ? 1 : 0);
                sub.AddCell(NewDeliveryMainTd($"{part.DPNr:N0}", center: true))
@@ -197,17 +196,9 @@ namespace Elwig.Documents {
                            .Add(Italic("Brutto:"))
                            .Add(Normal($" {info.Gross:N0} kg \u2013 "))
                            .Add(Italic("Tara:"))
-                            .Add(Normal($" {info.Tare:N0} kg "));
-                        if (info.TareCorrection != null && info.TareCorrection != 0)
-                            weighing.Add(Bold($"(Korr.: {Utils.GetSign(info.TareCorrection.Value)}{Math.Abs(info.TareCorrection.Value)} kg)")).Add(" ");
-                        weighing
-                            .Add(Normal("\u2013 "))
+                            .Add(Normal($" {info.Tare:N0} kg \u2013 "))
                            .Add(Italic("Netto:"))
-                            .Add(Normal($" {info.Net:N0} kg "));
-                        if (info.TareCorrection != null && info.TareCorrection != 0)
-                            weighing.Add(Normal($"({Utils.GetSign(-info.TareCorrection.Value)}{Math.Abs(info.TareCorrection.Value)} kg) "));
-                        weighing
-                            .Add(Normal("\u2013 "))
+                            .Add(Normal($" {info.Net:N0} kg \u2013 "))
                            .Add(Italic(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen"));
                    } else {
                        weighing.Add(" ")
@@ -161,7 +161,7 @@ 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((Member.IsOrganic ? "Ja" : "Nein") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : ""), 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))))
@@ -9,7 +9,7 @@
    <UseWindowsForms>true</UseWindowsForms>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.1.2.2</Version>
+    <Version>1.1.2.1</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>App.manifest</ApplicationManifest>
@@ -23,21 +23,21 @@
  </ItemGroup>

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

 </Project>
@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
    public static class AppDbUpdater {

        // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 41;
+        public static readonly int RequiredSchemaVersion = 42;

        private static int VersionOffset = 0;

@@ -638,6 +638,7 @@ namespace Elwig.Helpers.Export {
                ["zwstid"] = m.ZwstId,
                ["lfbis_nr"] = m.LfbisNr,
                ["ustid_nr"] = m.UstIdNr,
+                ["org_auth_code"] = m.OrganicAuthorityCode,
                ["juridical_pers"] = m.IsJuridicalPerson,
                ["volllieferant"] = m.IsVollLieferant,
                ["buchführend"] = m.IsBuchführend,
@@ -710,6 +711,7 @@ namespace Elwig.Helpers.Export {
                ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
                UstIdNr = json["ustid_nr"]?.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,
@@ -303,11 +303,6 @@ namespace Elwig.Helpers {
            return d.ShowDialog() == true ? (d.Weight, d.Reason) : 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;
-        }
-
        public static (string?, int[])? ShowDeliverySplittingDialog(Delivery delivery) {
            var d = new DeliverySplittingDialog(delivery);
            return d.ShowDialog() == true ? (d.MgNr?.ToString() ?? d.LsNr, d.Weights ?? []) : null;
@@ -631,15 +631,18 @@ namespace Elwig.Helpers {
                if (v < 2 && char.IsAsciiLetter(ch)) {
                    v++;
                    text += ch;
-                } else if ((v == 2 || v == 6) && ch == '-') {
-                    v++;
+                } else if ((v == 2 || v == 5) && ch == '-' && text[^1] != '-') {
                    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 +650,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 +670,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");
                }
@@ -124,7 +124,7 @@ namespace Elwig.Models.Entities {
        [Column("weighing_data")]
        public string? WeighingData { get; set; }
        [NotMapped]
-        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? TareCorrection, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
+        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
            get {
                try {
                    var obj = JsonNode.Parse(WeighingData!)!.AsObject();
@@ -133,13 +133,12 @@ namespace Elwig.Models.Entities {
                        obj["id"]?.AsValue().GetValue<string>(),
                        obj["gross_weight"]?.AsValue().GetValue<int>(),
                        obj["tare_weight"]?.AsValue().GetValue<int>(),
-                        obj["tare_correction"]?.AsValue().GetValue<int>(),
                        obj["net_weight"]?.AsValue().GetValue<int>(),
                        DateOnly.TryParseExact(obj["date"]?.AsValue().GetValue<string>(), "yyyy-MM-dd", out var d) ? d : null,
                        TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue<string>(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null
                    );
                } catch {
-                    return (null, null, null, null, null, null, null, null);
+                    return (null, null, null, null, null, null, null);
                }
            }
        }
@@ -96,6 +96,9 @@ namespace Elwig.Models.Entities {
        [Column("ustid_nr")]
        public string? UstIdNr { get; set; }

+        [Column("org_auth_code")]
+        public string? OrganicAuthorityCode { get; set; }
+
        [Column("juridical_pers")]
        public bool IsJuridicalPerson { get; set; }

@@ -0,0 +1,3 @@
+-- schema version 41 to 42
+
+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;
@@ -35,13 +35,8 @@ namespace Elwig.Services {

            vm.SortId = "";
            vm.GradationKmwString = "";
-
-            vm.Weight = null;
-            vm.ActualTare = 0;
-            vm.TargetTare = null;
-            vm.Tare = null;
+            vm.WeightString = "";
            vm.IsManualWeighing = false;
-
            vm.PartComment = "";
            vm.TemperatureString = "";
            vm.AcidString = "";
@@ -56,11 +51,7 @@ namespace Elwig.Services {
            vm.WineKg = ControlUtils.GetItemFromSourceWithPk(vm.WineKgSource, p.KgNr) as AT_Kg;
            vm.WineRd = ControlUtils.GetItemFromSourceWithPk(vm.WineRdSource, p.KgNr, p.RdNr) as WbRd;
            vm.WineOrigin = ControlUtils.GetItemFromSourceWithPk(vm.WineOriginSource, p.HkId) as WineOrigin;
-
-            vm.Weight = p.Weight;
-            vm.ActualTare = p.WeighingInfo.Tare ?? 0;
-            vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
-            vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
+            vm.WeightString = $"{p.Weight:N0}";
            vm.IsManualWeighing = p.IsManualWeighing;
            vm.IsNetWeight = p.IsNetWeight;

@@ -106,6 +106,7 @@ namespace Elwig.Services {

            vm.UstIdNr = m.UstIdNr;
            vm.LfbisNr = m.LfbisNr;
+            vm.OrganicAuthorityCode = m.OrganicAuthorityCode;
            vm.IsBuchführend = m.IsBuchführend;
            vm.IsOrganic = m.IsOrganic;

@@ -555,6 +556,7 @@ namespace Elwig.Services {

                UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
                LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                OrganicAuthorityCode = string.IsNullOrWhiteSpace(vm.OrganicAuthorityCode) ? null : vm.OrganicAuthorityCode,
                IsBuchführend = vm.IsBuchführend,
                IsOrganic = vm.IsOrganic,

@@ -120,14 +120,6 @@ namespace Elwig.ViewModels {
            set => WeightString = $"{value:N0}";
        }
        [ObservableProperty]
-        private string? _tareString = "-";
-        public int? Tare {
-            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? TargetTare;
-        [ObservableProperty]
        private bool _isManualWeighing;
        [ObservableProperty]
        private bool? _isNetWeightValue = false;
@@ -118,6 +118,8 @@ namespace Elwig.ViewModels {
        [ObservableProperty]
        private string? _lfbisNr;
        [ObservableProperty]
+        private string? _organicAuthorityCode;
+        [ObservableProperty]
        private bool _isBuchführend;
        [ObservableProperty]
        private bool _isOrganic;
@@ -398,8 +398,7 @@
        <Grid Grid.Row="1" Grid.Column="2">
            <Grid.RowDefinitions>
                <RowDefinition Height="0.625*"/>
-                <RowDefinition Height="0.8125*"/>
-                <RowDefinition Height="0.0625*"/>
+                <RowDefinition Height="0.875*"/>
                <RowDefinition Height="0.875*"/>
                <RowDefinition Height="0.25*"/>
                <RowDefinition Height="*"/>
@@ -435,7 +434,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="4" Margin="5,5,5,5">
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="3" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -554,7 +553,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="70"/>
@@ -566,23 +565,16 @@
                                      TextChanged="WeightInput_TextChanged"
                                      Grid.Column="1" Width="70" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>

-                    <Label Content="Tara:" Margin="10,40,10,10"/>
-                    <TextBlock x:Name="Tare" Text="{Binding TareString}" Width="40"
-                               Grid.Column="1" Margin="30,44,10,10" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
                    <CheckBox x:Name="ManualWeighingInput" IsChecked="{Binding IsManualWeighing, Mode=TwoWay}"
                              Content="Handwiegung" IsEnabled="False"
-                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>

                    <CheckBox x:Name="GerebeltGewogenInput" IsChecked="{Binding IsNetWeightValue, Mode=TwoWay}"
                              Content="Gerebelt gewogen" IsThreeState="True"
-                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,100,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
                              Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed" Indeterminate="GerebeltGewogenInput_Changed"/>

-                    <Button x:Name="CorrectTareButton" Content="Tara korrigieren" Width="120" Visibility="Hidden"
-                            Click="CorrectTareButton_Click"
-                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
                    <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
                            Click="WeighingButton_Click"
                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
@@ -601,7 +593,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -654,7 +646,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="5" Margin="5,5,5,10">
+            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -9,7 +9,6 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -104,7 +103,6 @@ namespace Elwig.Windows {
                WeighingBButton.Visibility = Visibility.Hidden;
                WeighingCButton.Visibility = Visibility.Hidden;
                WeighingDButton.Visibility = Visibility.Hidden;
-                DisableWeighingButtons();
            }

            Menu_Statistics_WineQuality_ModeOe.IsChecked = false;
@@ -614,34 +612,14 @@ namespace Elwig.Windows {
            ClearOriginalValues();
            ClearDefaultValues();
            ViewModel.FillInputs(p);
-            CorrectTareButton.Visibility = !ViewModel.IsReceipt && (ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
            FinishInputFilling();
        }

        new protected void ClearInputs(bool validate = false) {
            ViewModel.ClearInputs();
-            CorrectTareButton.Visibility = Visibility.Hidden;
            base.ClearInputs(validate);
        }

-        private void CorrectTareButton_Click(object sender, RoutedEventArgs evt) {
-            var lastCorrection = (ViewModel.TargetTare ?? ViewModel.ActualTare) - ViewModel.ActualTare;
-            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) {
-                var obj = JsonNode.Parse(s)!.AsObject();
-                if (correction == 0) {
-                    obj.Remove("tare_correction");
-                } else {
-                    obj["tare_correction"] = correction;
-                }
-                ViewModel.WeighingData = obj.ToJsonString(Utils.JsonOpts);
-            }
-        }
-
        private void WeighingButton_Click(object sender, RoutedEventArgs evt) {
            int index = Array.IndexOf(WeighingButtons, sender as Button);
            if (index >= 0) WeighingButton_Click(index);
@@ -673,18 +651,12 @@ 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.TargetTare = null;
-                ViewModel.Tare = ViewModel.ActualTare != 0 ? ViewModel.ActualTare : null;
                ViewModel.ScaleTerminalId = scale.ScaleTerminalId;
                ViewModel.WeighingData = res.ToJson().ToJsonString();
                ViewModel.ManualWeighingReason = null;
                ManualWeighingInput.IsChecked = false;
            } else {
                ViewModel.Weight = null;
-                ViewModel.ActualTare = 0;
-                ViewModel.TargetTare = null;
-                ViewModel.Tare = null;
                ViewModel.ScaleTerminalId = null;
                ViewModel.WeighingData = null;
            }
@@ -999,8 +971,6 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = false;
            DeliveryPartList.IsEnabled = false;

-            if (!ViewModel.IsReceipt)
-                EnableWeighingButtons();
            HideNewEditDeleteButtons();
            ShowSaveResetCancelButtons();
            UnlockInputs();
@@ -1064,8 +1034,6 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = true;
            DeliveryPartList.IsEnabled = true;

-            if (!ViewModel.IsReceipt)
-                DisableWeighingButtons();
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
            LockInputs();
@@ -1099,8 +1067,6 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = true;
            DeliveryPartList.IsEnabled = true;

-            if (!ViewModel.IsReceipt)
-                DisableWeighingButtons();
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
            RefreshInputs();
@@ -1205,7 +1171,6 @@ namespace Elwig.Windows {
        }

        private void DisableWeighingButtons() {
-            CorrectTareButton.IsEnabled = false;
            WeighingManualButton.IsEnabled = false;
            WeighingAButton.IsEnabled = false;
            WeighingBButton.IsEnabled = false;
@@ -1214,7 +1179,6 @@ namespace Elwig.Windows {
        }

        private void EnableWeighingButtons() {
-            CorrectTareButton.IsEnabled = true;
            WeighingManualButton.IsEnabled = true;
            var n = App.CommandScales.Count;
            WeighingAButton.IsEnabled = n > 0 && App.CommandScales[0].IsReady;
@@ -1409,8 +1373,6 @@ 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;
            var mod = ViewModel.Modifiers.ToList();
            var source = ViewModel.ModifiersSource.ToList();
            if (App.Client.IsMatzen) {
@@ -548,36 +548,37 @@
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="90"/>
-                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition Width="110"/>
                        <ColumnDefinition/>
                    </Grid.ColumnDefinitions>

-                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="Umsatzsteuer-ID"/>
                    <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"/>
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>

                    <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"
                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>

-                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
-
                    <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"/>
-                    <Button x:Name="OrganicButton" Content="easy-cert.com" IsEnabled="{Binding IsMemberSelected}"
-                            Height="25" FontSize="12"
-                            Click="OrganicButton_Click"
-                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
+                    <Label Content="Bio-KSt.:" Margin="10,40,95,0" Grid.Column="2" HorizontalAlignment="Right" ToolTip="Bio-Kontrollstelle"/>
+                    <TextBox x:Name="OrganicAuthorityCodeInput" Text="{Binding OrganicAuthorityCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,0" Grid.Column="2" Width="82" HorizontalAlignment="Right"
+                             TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_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>
@@ -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);
@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.1.2.2 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.1.2.1 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.1.2.2 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.1.2.1 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
@@ -19,12 +19,12 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.6.1" />
    <PackageReference Include="NUnit3TestAdapter" Version="6.3.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.15.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.14.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -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"
Author	SHA1	Message	Date
lorenz.stechauner	c789f93159	Windows: Add filters to Titles in some AdministrationWindows Test / Run tests (push) Successful in 2m25s Details	2026-09-01 16:24:27 +02:00
lorenz.stechauner	1bdfff28f1	DeliveryNote: Fix missing ':' for Comment and Acid	2026-09-01 12:02:34 +02:00
lorenz.stechauner	c2e97abc5a	Entities/Member: Add OrganicAuthorityCode Test / Run tests (push) Successful in 2m4s Details	2026-08-29 15:35:40 +02:00