Setup/Installer: fix Elwig.ico/.png path

Elwig/App.xaml

@@ -2,11 +2,12 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Elwig"
-             xmlns:controls="clr-namespace:Elwig.Controls"
+             xmlns:ctrl="clr-namespace:Elwig.Controls"
              StartupUri="Windows\MainWindow.xaml"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
-        <controls:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">

Elwig/App.xaml.cs

@@ -128,7 +128,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0];  // FIXME
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -139,7 +139,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0];  // FIXME
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;

Elwig/Controls/BoolToValueConverter.cs

@@ -1,16 +1,17 @@
 using System;
 using System.Windows.Data;
+using System.Globalization;
 
 namespace Elwig.Controls {
     public class BoolToValueConverter<T> : IValueConverter {
         public T FalseValue { get; set; }
         public T TrueValue { get; set; }
 
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
             return (bool)value ? TrueValue : FalseValue;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
             return value?.Equals(TrueValue) ?? false;
         }
     }

Elwig/Controls/UnitTextBox.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="Elwig.Controls.UnitTextBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="25">
+        <TextBox x:Name="TextBox" TextAlignment="Right" FontSize="14" VerticalAlignment="Stretch"
+                 Padding="{Binding ElementName=UnitBlock, Path=ActualWidth, Converter={StaticResource WidthToPaddingConverter}}"
+                 Text="{Binding Path=Text}" TextChanged="TextBox_TextChanged"/>
+        <TextBlock x:Name="UnitBlock" Text="{Binding Path=Unit}" Margin="0,0,4,4" FontSize="10"
+                   HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
+    </Grid>
+</UserControl>

Elwig/Controls/UnitTextBox.xaml.cs

@@ -0,0 +1,37 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Controls {
+    public partial class UnitTextBox : UserControl {
+
+        public event TextChangedEventHandler? TextChanged;
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(UnitTextBox));
+        public string Text {
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value ?? "");
+        }
+
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitTextBox));
+        public string Unit {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value ?? "");
+        }
+
+        public UnitTextBox() {
+            Text = "";
+            Unit = "";
+            InitializeComponent();
+            DataContext = this;
+        }
+
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs evt) {
+            Text = TextBox.Text;
+            TextChanged?.Invoke(sender, evt);
+        }
+
+        public new void Focus() {
+            TextBox.Focus();
+        }
+    }
+}

Elwig/Controls/WidthToPaddingConverter.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Elwig.Controls {
+    public class WidthToPaddingConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return new Thickness(2, 2, 4 + (double)value, 2);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            return ((Thickness)value).Right - 4;
+        }
+    }
+}

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.4.3</Version>
+    <Version>0.5.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 

Elwig/Helpers/AppDbUpdater.cs

@@ -4,11 +4,12 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 6;
+        public static readonly int RequiredSchemaVersion = 7;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5, UpdateDbSchema_5_To_6
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5,
+            UpdateDbSchema_5_To_6, UpdateDBSchema_6_To_7
         };
 
         private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
@@ -492,5 +493,52 @@ namespace Elwig.Helpers {
                 ORDER BY year, mgnr, bucket;
                 """);
         }
+
+        private static void UpdateDBSchema_6_To_7(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bucket_strict");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bucket_strict AS
+                SELECT s.year, c.mgnr,
+                       t.sortid || COALESCE(a.attrid, '') AS bucket,
+                       t.sortid, a.attrid,
+                       SUM(area) AS area,
+                       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
+                       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
+                FROM season s, area_commitment c
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+                WHERE (year_from IS NULL OR year_from <= s.year) AND
+                      (year_to IS NULL OR year_to >= s.year)
+                GROUP BY s.year, c.mgnr, bucket
+                ORDER BY s.year, c.mgnr, bucket;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery_bucket_strict AS
+                SELECT c.year, c.mgnr, c.bucket, c.min_kg, COALESCE(p.weight, 0) AS weight
+                FROM v_area_commitment_bucket_strict c
+                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                ORDER BY c.year, c.mgnr, c.bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery_bucket AS
+                SELECT u.year, u.mgnr, u.bucket, u.min_kg,
+                       u.weight + SUM(MAX(COALESCE(p.weight - s.min_kg, 0), 0)) AS weight
+                FROM v_under_delivery_bucket_strict u
+                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.sortid) = (u.year, u.mgnr, u.bucket) AND p.attrid IS NOT NULL
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN v_area_commitment_bucket_strict s ON (s.year, s.mgnr, s.bucket) = (p.year, p.mgnr, p.bucket)
+                WHERE (p.gebunden IS NULL OR p.gebunden) AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY u.year, u.mgnr, u.bucket
+                ORDER BY u.year, u.mgnr, u.bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery AS
+                SELECT year, mgnr, bucket, min_kg, weight, weight - min_kg AS diff
+                FROM v_under_delivery_bucket
+                WHERE diff < 0;
+                """);
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -63,13 +63,15 @@ namespace Elwig.Helpers {
             return CheckDecimal(input, required, -1, -1);
         }
 
-        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal) {
+        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal, bool allowMinus = false) {
             string text = "";
             int pos = input.CaretIndex;
             int v1 = 0, v2 = -1;
             for (int i = 0; i < input.Text.Length; i++) {
                 char ch = input.Text[i];
-                if (char.IsAsciiDigit(ch)) {
+                if (ch == '-' && i == 0 && allowMinus) {
+                    text += ch;
+                } else if (char.IsAsciiDigit(ch)) {
                     if (v2 == -1 && (maxLen == -1 || v1 < maxLen)) {
                         text += ch; v1++;
                     } else if (v2 != -1 && (maxDecimal == -1 || v2 < maxDecimal)) {

Elwig/Models/AreaCom.cs

@@ -1,5 +1,9 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 namespace Elwig.Models {
     [Table("area_commitment"), PrimaryKey("FbNr")]
@@ -51,5 +55,12 @@ namespace Elwig.Models {
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            var list = new string?[] {
+                WineCult.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
+            }.ToList();
+            return Utils.GetSearchScore(list, keywords);
+        }
     }
 }

Elwig/Windows/AdministrationWindow.cs

@@ -1,3 +1,4 @@
+using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Models;
 using System;
@@ -62,10 +63,12 @@ namespace Elwig.Windows {
             OriginalValues = new();
             DefaultValues = new();
             Closing += OnClosing;
+            Loaded -= base.OnLoaded;
             Loaded += OnLoaded;
+            Loaded += base.OnLoaded;
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
+        private new void OnLoaded(object sender, RoutedEventArgs evt) {
             TextBoxInputs = ControlUtils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
             ComboBoxInputs = ControlUtils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
             CheckBoxInputs = ControlUtils.FindAllChildren<CheckBox>(this, ExemptInputs).ToArray();
@@ -105,6 +108,7 @@ namespace Elwig.Windows {
         }
 
         protected void ValidateInput(Control input, bool valid) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             Valid[input] = valid;
         }
 
@@ -205,6 +209,7 @@ namespace Elwig.Windows {
         }
 
         protected void SetOriginalValue(Control input, object? value) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             OriginalValues[input] = value is bool b ? b.ToString() : value;
             if (InputHasChanged(input)) {
                 ControlUtils.SetInputChanged(input);
@@ -214,15 +219,18 @@ namespace Elwig.Windows {
         }
 
         protected void SetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             SetOriginalValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             OriginalValues.Remove(input);
             ControlUtils.ClearInputState(input);
         }
 
         protected void SetDefaultValue(Control input, object? value) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             DefaultValues[input] = value is bool b ? b.ToString() : value;
             if (!InputHasChanged(input)) {
                 if (InputIsNotDefault(input)) {
@@ -234,10 +242,12 @@ namespace Elwig.Windows {
         }
 
         protected void SetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             SetDefaultValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             DefaultValues.Remove(input);
             if (!InputHasChanged(input)) {
                 ControlUtils.ClearInputState(input);
@@ -261,10 +271,12 @@ namespace Elwig.Windows {
         protected bool IsValid => Valid.All(kv => kv.Value);
 
         protected bool GetInputValid(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             return Valid[input];
         }
 
         protected bool InputHasChanged(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             if (!OriginalValues.ContainsKey(input)) {
                 return false;
             } else if (input is TextBox tb) {
@@ -283,6 +295,7 @@ namespace Elwig.Windows {
         }
 
         protected bool InputIsNotDefault(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             if (!DefaultValues.ContainsKey(input)) {
                 return false;
             } else if (input is TextBox tb) {
@@ -458,15 +471,15 @@ namespace Elwig.Windows {
             UpdateComboBox((Control)sender);
         }
 
-        protected void IntegerInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IntegerInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckInteger);
         }
 
-        protected void DecimalInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DecimalInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckDecimal);
         }
 
-        protected void PartialDateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PartialDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPartialDate);
         }
 
@@ -474,7 +487,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPartialDate);
         }
 
-        protected void DateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckDate);
         }
 
@@ -482,7 +495,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
-        protected void TimeInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TimeInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckTime);
         }
 
@@ -490,7 +503,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckTime);
         }
 
-        protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
             if ("PLZ".Equals(plz.Tag))
@@ -504,7 +517,7 @@ namespace Elwig.Windows {
                 UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
-        protected void EmailAddressInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void EmailAddressInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckEmailAddress);
         }
 
@@ -512,7 +525,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckEmailAddress);
         }
 
-        protected void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
@@ -520,7 +533,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
-        protected void IbanInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IbanInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckIban);
         }
 
@@ -528,7 +541,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckIban);
         }
 
-        protected void BicInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void BicInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckBic);
         }
 
@@ -536,7 +549,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckBic);
         }
 
-        protected void UstIdNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void UstIdNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckUstIdNr);
         }
 
@@ -544,7 +557,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckUstIdNr);
         }
 
-        protected void LfbisNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void LfbisNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckLfbisNr);
         }
 
@@ -552,7 +565,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
 
-        protected void UpperCaseInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void UpperCaseInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckUpperCase);
         }
 

Elwig/Windows/AreaComAdminWindow.xaml

@@ -4,9 +4,10 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindungen - Elwig" Height="480" Width="1100"
+        Title="Flächenbindungen - Elwig" Height="500" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -46,124 +47,168 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
-            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="340"/>
+            <ColumnDefinition Width="2*" MinWidth="555"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
 
-        <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Flächenbindugen"/>
-        </Menu>
-
-        <Grid Grid.RowSpan="2" Grid.Row="1" Grid.Column="0">
+        <Grid Grid.Row="0" Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="37"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
+            <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,7,145,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged"/>
+            <CheckBox x:Name="ActiveAreaCommitmentInput" Content="Nur aktive anzeigen"
+                      Checked="ActiveAreaCommitmentInput_Changed" Unchecked="ActiveAreaCommitmentInput_Changed"
+                      HorizontalAlignment="Right" Margin="0,12,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+
             <DataGrid x:Name="AreaCommitmentList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
-                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
-                  Margin="5,10,5,42" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
+                      Margin="5,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="2*"/>
-                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="6*"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="4*"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="4*"/>
-                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="3*">
+                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/>
+                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/>
+                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/>
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte"           Binding="{Binding AreaComType.WineVar.Name}" Width="4*"/>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr1.Name}" Width="3*"/>
+                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/>
                 </DataGrid.Columns>
             </DataGrid>
 
             <Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <Button x:Name="EditAreaCommitmentButton" Content="Bearbeiten" Click="EditAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <Button x:Name="DeleteAreaCommitmentButton" Content="Löschen" Click="DeleteAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
 
             <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
         </Grid>
 
-        <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="FbNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
+        <Grid Grid.Column="2" Grid.Row="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
 
-                <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" IsEnabled="False"
-                         Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
+            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="FbNrInput" Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
+                             TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" IsEnabled="False"
+                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
 
-                <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <ComboBox x:Name="AreaComTypeInput" DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
-                          HorizontalAlignment="Stretch" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="YearFromInput" Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="YearToInput" Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <TextBox x:Name="CommentInput" TextChanged="TextBox_TextChanged"
-                         HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <ComboBox x:Name="AreaComTypeInput" DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
+                              HorizontalAlignment="Stretch" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
 
-        <GroupBox Header="Lage" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
 
-                <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,10,10,0" Grid.Column="1"
-                          SelectionChanged="KgInput_SelectionChanged"/>
+                    <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <TextBox x:Name="CommentInput" TextChanged="TextBox_TextChanged"
+                             HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
 
-                <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,40,10,0" Grid.Column="1"/>
+            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
-                         TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
+                    <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,10,10,0" Grid.Column="1"
+                              SelectionChanged="KgInput_SelectionChanged"/>
 
-                <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AreaInput" Margin="0,100,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="IntegerInput_TextChanged"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,40,10,0" Grid.Column="1"/>
+
+
+                    <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
+                             TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
+
+                    <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" TextChanged="IntegerInput_TextChanged"
+                                      Grid.Column="1" Width="70" Margin="0,100,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="160"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusAreaCommitments" Text="Flächenbindungen: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusArea" Text="Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusContracts" Text="Vertragsarten: -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -9,10 +9,12 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Xceed.Wpf.Toolkit.Primitives;
+using System.Runtime.Intrinsics.Arm;
 
 namespace Elwig.Windows {
     public partial class AreaComAdminWindow : AdministrationWindow {
         private readonly Member Member;
+        private List<string> TextFilter = new();
 
         public AreaComAdminWindow(int mgnr) {
             InitializeComponent();
@@ -21,15 +23,16 @@ namespace Elwig.Windows {
             ExemptInputs = new Control[] {
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
                 EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
-                AreaCommitmentResetButton, AreaCommitmentCancelButton
+                AreaCommitmentResetButton, AreaCommitmentCancelButton, SearchInput, ActiveAreaCommitmentInput
             };
             RequiredInputs = new Control[] {
                 FbNrInput, YearFromInput, KgInput, RdInput,
-                GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
+                GstNrInput, AreaInput.TextBox, AreaComTypeInput, WineCultivationInput
             };
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e) {
+            ActiveAreaCommitmentInput.IsChecked = true;
             LockInputs();
         }
 
@@ -38,11 +41,84 @@ namespace Elwig.Windows {
             await RefreshAreaCommitmentListQuery();
         }
 
-        private async Task RefreshAreaCommitmentListQuery() {
-            List<AreaCom> areaComs = await Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr).ToListAsync();
+        private async Task RefreshAreaCommitmentListQuery(bool updateSort = false) {
+            var (_, areaComQuery, filter) = await GetFilters();
+            var areaComs = await areaComQuery.ToListAsync();
+
+            if (filter.Count > 0 && areaComs.Count > 0) {
+                var dict = areaComs.AsParallel()
+                    .ToDictionary(d => d, d => d.SearchScore(TextFilter))
+                    .OrderByDescending(c => c.Value);
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                areaComs = dict
+                    .Where(a => a.Value > threshold)
+                    .Select(a => a.Key)
+                    .ToList();
+            }
+
             ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr,
-                AreaCommitmentList_SelectionChanged, ControlUtils.RenewSourceDefault.None);
+                AreaCommitmentList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             RefreshInputs();
+
+            if(filter.Count == 0) {
+                StatusAreaCommitments.Text = $"Flächenbindungen: {await areaComQuery.CountAsync()}";
+                StatusArea.Text = $"Fläche: {await areaComQuery.Select(a => a.Area).SumAsync():N0} m²";
+            } else {
+                StatusAreaCommitments.Text = $"Flächenbindungen: {areaComs.Count}";
+                StatusArea.Text = $"Fläche: {areaComs.Select(a => a.Area).Sum():N0} m²";
+            }
+            var groups = areaComs.GroupBy(a => a.AreaComType.DisplayName).Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
+            StatusContracts.Text = $"Vertragsarten: {groups.Count} (" + string.Join(", ", groups.Select(g => $"{g.Key}: {g.Item2:N0} m²")) + ")";
+            StatusContracts.ToolTip = $"Vertragsarten: {groups.Count}\n" + string.Join($"\n", groups.Select(g => $"{g.Key}: {g.Item2:N0} m²"));
+        }
+
+        private async Task<(List<string>, IQueryable<AreaCom>, List<string>)> GetFilters() {
+            List<string> filterNames = new();
+            IQueryable<AreaCom> areaComQuery = Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr);
+            if (ActiveAreaCommitmentInput.IsChecked == true) {
+                areaComQuery = areaComQuery.Where(a => a.YearTo == null);
+                filterNames.Add("ohne Enddatum");
+            }
+
+            var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+
+            var filter = TextFilter.ToList();
+            if (filter.Count > 0) {
+                var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var attr = await Context.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                        filterVar.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add(var[e.ToUpper()].Name);
+                    } else if (e.Length == 3 && e[0] == '!' && var.ContainsKey(e[1..].ToUpper())) {
+                        filterNotVar.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (attr.ContainsKey(e.ToLower())) {
+                        var a = attr[e.ToLower()];
+                        filterAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Attribut {a.Name}");
+                    } else if (e[0] == '!' && attr.ContainsKey(e[1..].ToLower())) {
+                        var a = attr[e[1..].ToLower()];
+                        filterNotAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Attribut {a.Name}");
+                    }
+                }
+
+                if (filterVar.Count > 0) areaComQuery = areaComQuery.Where(a => filterVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterNotVar.Count > 0) areaComQuery = areaComQuery.Where(a => !filterNotVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr != null && a.AreaComType.WineAttr.AttrId != null && filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
+                if (filterNotAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr == null || a.AreaComType.WineAttr.AttrId == null || !filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
+            }
+
+           return (filterNames, areaComQuery, filter);
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -111,6 +187,7 @@ namespace Elwig.Windows {
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
             InitInputs();
+            LockSearchInputs();
         }
 
         private void EditAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -123,6 +200,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentNewEditDeleteButtons();
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
+            LockSearchInputs();
         }
 
         private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -194,6 +272,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentSaveResetCancelButtons();
             ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
+            UnlockSearchInputs();
             await RefreshAreaCommitmentList();
             AreaCommitmentList.SelectedItem = a;
         }
@@ -216,6 +295,7 @@ namespace Elwig.Windows {
             RefreshInputs();
             ClearInputStates();
             LockInputs();
+            UnlockSearchInputs();
         }
 
         override protected void UpdateButtons() {
@@ -269,6 +349,16 @@ namespace Elwig.Windows {
             DeleteAreaCommitmentButton.Visibility = Visibility.Hidden;
         }
 
+        private void LockSearchInputs() {
+            SearchInput.IsEnabled = false;
+            ActiveAreaCommitmentInput.IsEnabled = false;
+        }
+
+        private void UnlockSearchInputs() {
+            SearchInput.IsEnabled = true;
+            ActiveAreaCommitmentInput.IsEnabled = true;
+        }
+
         private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             RefreshInputs();
         }
@@ -277,6 +367,15 @@ namespace Elwig.Windows {
 
         }
 
+        private async void ActiveAreaCommitmentInput_Changed(object sender, RoutedEventArgs evt) {
+            await RefreshAreaCommitmentListQuery();
+        }
+
+        private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
+            TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(e => e.Length > 0);
+            await RefreshAreaCommitmentListQuery(true);
+        }
+
         private async void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (KgInput.SelectedItem is AT_Kg curr_kg) {
                 var rdList = await Context.WbRde.Where(r => r.KgNr == curr_kg.KgNr).OrderBy(r => r.Name).Cast<object>().ToListAsync();

Elwig/Windows/BaseDataWindow.xaml

@@ -1,11 +1,13 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.BaseDataWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.BaseDataWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
-        Title="Stammdaten - Elwig" Height="500" MinHeight="400" Width="800" MinWidth="800"
+        Title="Stammdaten - Elwig" Height="500" MinHeight="400" Width="850" MinWidth="810"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -198,7 +200,7 @@
             <TabItem Header="Sortenattribute">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="260"/>
+                        <ColumnDefinition Width="280"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <ListBox x:Name="WineAttributeList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,35,10"
@@ -242,11 +244,8 @@
                         <GroupBox Header="Auszahlung" Grid.ColumnSpan="2" Margin="10,100,10,10">
                             <Grid>
                                 <Label Content="Max. Ertrag:" Margin="10,10,0,10"/>
-                                <Grid Grid.Column="1" Width="80" Height="25" Margin="84,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                    <TextBox x:Name="WineAttributeMaxKgPerHaInput" TextAlignment="Right" Padding="2,2,30,2"
-                                             TextChanged="WineAttributeMaxKgPerHaInput_TextChanged"/>
-                                    <Label Content="kg/ha" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                                </Grid>
+                                <ctrl:UnitTextBox x:Name="WineAttributeMaxKgPerHaInput" Unit="kg/ha" TextChanged="WineAttributeMaxKgPerHaInput_TextChanged"
+                                                  Grid.Column="1" Width="80" Margin="84,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                                 <CheckBox x:Name="WineAttributeStrictInput" Content="Strikte Trennung zu Flächenbindung ohne Attribut"
                                           Margin="10,50,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"
@@ -309,13 +308,85 @@
                     </Grid>
                 </Grid>
             </TabItem>
-            <TabItem Header="Flächenbindungsverträge">
 
+            <TabItem Header="Flächenbindungsverträge">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="260"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="AreaCommitmentTypeList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,35,10"
+                             SelectionChanged="AreaCommitmentTypeList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding WineAttr.Name}" Width="70"/>
+                                    <TextBlock Text="{Binding Discriminator}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button x:Name="AreaCommitmentTypeAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="AreaCommitmentTypeAddButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,30"/>
+                    <Button x:Name="AreaCommitmentTypeDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="AreaCommitmentTypeDeleteButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,30,5,0"/>
+
+                    <Grid Grid.Column="1" Margin="0,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Identifikator:" Margin="10,10,0,10"/>
+                        <TextBox x:Name="AreaCommitmentTypeIdInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left" IsEnabled="False"/>
+
+                        <Label Content="Sorte:" Margin="10,40,0,10"/>
+                        <ComboBox x:Name="AreaCommitmentTypeWineVariantInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,40,10,10" Width="250" HorizontalAlignment="Left"
+                                  ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
+                                  SelectionChanged="AreaCommitmentType_Changed"/>
+
+                        <Label Content="Attribut:" Margin="10,70,0,10"/>
+                        <ComboBox x:Name="AreaCommitmentTypeWineAttributeInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,70,10,10" Width="250" HorizontalAlignment="Left"
+                                  SelectionChanged="AreaCommitmentType_Changed"/>
+
+                        <Label Content="Lieferpflicht:" Margin="10,100,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypeMinKgPerHaInput" Unit="kg/ha" Grid.Column="2" Margin="0,100,10,10" Width="80" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypeMinKgPerHa_TextChanged"/>
+
+                        <Label Content="Strafe (pro unterl. kg):" Margin="10,130,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyPerKgInput" Unit="€/kg" Grid.Column="2" Margin="0,130,10,10" Width="80"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyPerKgInput_TextChanged"/>
+
+                        <Label Content="Strafe (bei Unterlieferung):" Margin="10,160,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyInput" Unit="€" Grid.Column="2" Margin="0,160,10,10" Width="68"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyInput_TextChanged"/>
+
+                        <Label Content="Strafe (bei Nicht-Lieferung):" Margin="10,190,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyNoneInput" Unit="€" Grid.Column="2" Margin="0,190,10,10" Width="68"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyInput_TextChanged"/>
+                    </Grid>
+                </Grid>
             </TabItem>
 
             <TabItem Header="Saisons">
                 <Grid>
-                    <ListBox x:Name="SeasonList" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="150" Margin="10,10,10,10"
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="180"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="180"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <ListBox x:Name="SeasonList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Grid.RowSpan="2"
                              SelectionChanged="SeasonList_SelectionChanged">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
@@ -328,7 +399,56 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
 
-                    <GroupBox Header="Zu-/Abschläge" Margin="170,150,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <Grid Grid.Column="1" Margin="0,10,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Maximaler Ertrag:" Margin="10,10,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerHaInput" Unit="kg/ha" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="1" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="MwSt. (buchführend):" Margin="10,40,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonVatNormalInput" Unit="%" TextChanged="SeasonVatInput_TextChanged"
+                                          Grid.Column="1" Width="48" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="MwSt. (pauschaliert):" Margin="10,70,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonVatFlatrateInput" Unit="%" TextChanged="SeasonVatInput_TextChanged"
+                                          Grid.Column="1" Width="48" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Übernahme-Beginn:" Margin="10,100,0,10"/>
+                        <TextBox x:Name="SeasonStartInput" Grid.Column="1" Margin="0,100,10,10" Width="78" IsEnabled="False"
+                                 HorizontalAlignment="Left"/>
+
+                        <Label Content="Übernahme-Ende:" Margin="10,130,0,10"/>
+                        <TextBox x:Name="SeasonEndInput" Grid.Column="1" Margin="0,130,10,10" Width="78" IsEnabled="False"
+                                 HorizontalAlignment="Left"/>
+
+                        <Label Content="Lieferpflicht:" Margin="10,10,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMinKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Lieferrecht:" Margin="10,40,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (pro unterl. kg):" Margin="10,70,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (Unterlieferung):" Margin="10,100,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="68" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (Nicht-Lieferung):" Margin="10,130,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="68" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    </Grid>
+
+                    <GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
@@ -369,12 +489,12 @@
                                      TextChanged="SeasonModifier_Changed"/>
 
                             <Label Content="Relativ:" Grid.Column="1" Margin="10,70,10,10"/>
-                            <TextBox x:Name="SeasonModifierRelInput" Grid.Column="2" Margin="0,70,10,10"
-                                     TextChanged="SeasonModifierRelInput_TextChanged"/>
+                            <ctrl:UnitTextBox x:Name="SeasonModifierRelInput" Unit="%" TextChanged="SeasonModifierRelInput_TextChanged"
+                                             Grid.Column="2" Width="68" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                             <Label Content="Absolut:" Grid.Column="1" Margin="10,100,10,10"/>
-                            <TextBox x:Name="SeasonModifierAbsInput" Grid.Column="2" Margin="0,100,10,10"
-                                     TextChanged="SeasonModifierAbsInput_TextChanged"/>
+                            <ctrl:UnitTextBox x:Name="SeasonModifierAbsInput" Unit="€/kg" TextChanged="SeasonModifierAbsInput_TextChanged"
+                                             Grid.Column="2" Width="86" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                         </Grid>
                     </GroupBox>
                 </Grid>

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -0,0 +1,154 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _acts = null;
+        private Dictionary<AreaComType, string>? _actIds = null;
+        private ObservableCollection<AreaComType>? _actList = null;
+        private bool _actChanged = false;
+        private bool _actUpdate = false;
+
+        private void AreaCommitmentTypesInitEditing() {
+            _actList = new(Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToList());
+            _acts = _actList.ToDictionary(v => v.VtrgId, v => (string?)v.VtrgId);
+            _actIds = _actList.ToDictionary(v => v, v => v.VtrgId);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, _actList, a => (a as AreaComType)?.VtrgId);
+            AreaCommitmentTypeList_SelectionChanged(null, null);
+        }
+
+        private void AreaCommitmentTypesFinishEditing() {
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, Context.AreaCommitmentTypes.OrderBy(v => v.SortId).ToList(), v => (v as AreaComType)?.VtrgId);
+            _actList = null;
+            _acts = null;
+            _actIds = null;
+            _actChanged = false;
+
+            AreaCommitmentTypeAddButton.IsEnabled = false;
+            AreaCommitmentTypeDeleteButton.IsEnabled = false;
+        }
+
+        private async Task AreaCommitmentTypesSave() {
+            if (!_actChanged || _actList == null || _acts == null || _actIds == null)
+                return;
+
+            foreach (var (vtrgid, _) in _acts.Where(a => a.Value == null)) {
+                Context.Remove(Context.AreaCommitmentTypes.Find(vtrgid));
+            }
+            foreach (var (attr, old) in _actIds) {
+                attr.VtrgId = old;
+            }
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
+                Context.Update(Context.AreaCommitmentTypes.Find(old));
+            }
+            await Context.SaveChangesAsync();
+
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
+                await Context.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = {vtrgid} WHERE vtrgid = {old}");
+            }
+            await Context.SaveChangesAsync();
+
+            foreach (var type in _actList.Where(a => !_actIds.ContainsKey(a))) {
+                if (type.VtrgId == null) continue;
+                await Context.AddAsync(type);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void AreaCommitmentTypeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _actUpdate = true;
+            if (AreaCommitmentTypeList.SelectedItem is AreaComType type) {
+                AreaCommitmentTypeIdInput.Text = $"{type.SortId}{type.AttrId}";
+                ControlUtils.SelectComboBoxItem(AreaCommitmentTypeWineVariantInput, s => (s as WineVar)?.SortId, type.SortId);
+                ControlUtils.SelectComboBoxItem(AreaCommitmentTypeWineAttributeInput, a => (a as WineAttr)?.AttrId, type.AttrId);
+                AreaCommitmentTypeMinKgPerHaInput.Text = $"{type.MinKgPerHa}";
+                AreaCommitmentTypePenaltyPerKgInput.Text = $"{type.PenaltyPerKg}";
+                AreaCommitmentTypePenaltyInput.Text = $"{type.PenaltyAmount}";
+                AreaCommitmentTypePenaltyNoneInput.Text = $"{type.PenaltyNone}";
+            } else {
+                AreaCommitmentTypeIdInput.Text = "";
+                AreaCommitmentTypeWineVariantInput.SelectedItem = null;
+                AreaCommitmentTypeWineAttributeInput.SelectedItem = null;
+                AreaCommitmentTypeMinKgPerHaInput.Text = "";
+                AreaCommitmentTypePenaltyPerKgInput.Text = "";
+                AreaCommitmentTypePenaltyInput.Text = "";
+                AreaCommitmentTypePenaltyNoneInput.Text = "";
+            }
+            _actUpdate = false;
+        }
+
+        private void AreaCommitmentTypeAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_actList == null) return;
+            _actChanged = true;
+            var item = Context.CreateProxy<AreaComType>();
+            _actList.Add(item);
+            AreaCommitmentTypeList.SelectedItem = item;
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentTypeDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_actList == null || _acts == null) return;
+            _actChanged = true;
+            var idx = AreaCommitmentTypeList.SelectedIndex;
+            var item = _actList[idx];
+            _acts[item.VtrgId] = null;
+            _actList.RemoveAt(idx);
+            AreaCommitmentTypeList.SelectedIndex = idx < _actList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentType_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_actUpdate || (!IsEditing && !IsCreating) || AreaCommitmentTypeList.SelectedItem is not AreaComType attr || _acts == null || _actIds == null) return;
+            _actChanged = true;
+
+            var v = AreaCommitmentTypeWineVariantInput.SelectedItem as WineVar;
+            var a = AreaCommitmentTypeWineAttributeInput.SelectedItem as WineAttr;
+            AreaCommitmentTypeIdInput.Text = $"{v?.SortId}{a?.AttrId}";
+
+            var old = _actIds.GetValueOrDefault(attr);
+            var id = AreaCommitmentTypeIdInput.Text;
+            if (old != null) _acts[old] = id;
+            attr.VtrgId = id;
+            attr.SortId = v?.SortId;
+            attr.AttrId = a?.AttrId;
+            attr.MinKgPerHa = AreaCommitmentTypeMinKgPerHaInput.Text.Length > 0 ? int.Parse(AreaCommitmentTypeMinKgPerHaInput.Text) : null;
+            attr.PenaltyPerKg = AreaCommitmentTypePenaltyPerKgInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyPerKgInput.Text) : null;
+            attr.PenaltyAmount = AreaCommitmentTypePenaltyInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyInput.Text) : null;
+            attr.PenaltyNone = AreaCommitmentTypePenaltyNoneInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyNoneInput.Text) : null;
+
+            CollectionViewSource.GetDefaultView(_actList).Refresh();
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentTypeIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpperCaseInput_TextChanged(sender, evt);
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypeMinKgPerHa_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, false, 5));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypePenaltyPerKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypePenaltyInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, 2));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -23,6 +23,7 @@ namespace Elwig.Windows {
             _branches = _branchList.ToDictionary(b => b.ZwstId, b => (string?)b.ZwstId);
             _branchIds = _branchList.ToDictionary(b => b, b => b.ZwstId);
             ControlUtils.RenewItemsSource(BranchList, _branchList, b => (b as Branch)?.ZwstId);
+            BranchList_SelectionChanged(null, null);
         }
 
         private void BranchesFinishEditing() {
@@ -63,7 +64,7 @@ namespace Elwig.Windows {
             await Context.SaveChangesAsync();
         }
 
-        private void BranchList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void BranchList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             UpdateButtons();
             _branchUpdate = true;
             if (BranchList.SelectedItem is not Branch branch) {

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -19,11 +19,13 @@ namespace Elwig.Windows {
         private bool _modUpdate = false;
 
         private void ModifiersInitEditing() {
+            SeasonList.IsEnabled = false;
             var year = (SeasonList.SelectedItem as Season)?.Year;
             _modList = new(Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToList());
             _mods = _modList.ToDictionary(m => m.ModId, m => (string?)m.ModId);
             _modIds = _modList.ToDictionary(m => m, m => m.ModId);
             ControlUtils.RenewItemsSource(SeasonModifierList, _modList, m => (m as Modifier)?.ModId);
+            SeasonModifierList_SelectionChanged(null, null);
         }
 
         private void ModifiersFinishEditing() {
@@ -38,6 +40,7 @@ namespace Elwig.Windows {
             SeasonModifierDownButton.IsEnabled = false;
             SeasonModifierAddButton.IsEnabled = false;
             SeasonModifierDeleteButton.IsEnabled = false;
+            SeasonList.IsEnabled = true;
         }
 
         private async Task ModifiersSave() {
@@ -117,7 +120,7 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private void SeasonModifierList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void SeasonModifierList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             UpdateButtons();
             _modUpdate = true;
             if (SeasonModifierList.SelectedItem is not Modifier mod) {
@@ -128,25 +131,23 @@ namespace Elwig.Windows {
             } else {
                 SeasonModifierIdInput.Text = mod.ModId;
                 SeasonModifierNameInput.Text = mod.Name;
-                SeasonModifierRelInput.Text = (mod.Rel * 100)?.ToString();
-                SeasonModifierAbsInput.Text = mod.Abs?.ToString();
+                SeasonModifierRelInput.Text = (mod.Rel * 100)?.ToString() ?? "";
+                SeasonModifierAbsInput.Text = mod.Abs?.ToString() ?? "";
             }
             _modUpdate = false;
         }
 
-        private void SeasonModifier_Changed(object? sender, RoutedEventArgs evt) {
+        private void SeasonModifier_Changed(object? sender, RoutedEventArgs? evt) {
             if (_modUpdate || (!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod || SeasonList.SelectedItem is not Season s || _mods == null || _modIds == null) return;
-            _modChanged = _modChanged ||
-                SeasonModifierIdInput.Text != mod.ModId;
+            _modChanged = true;
 
             var old = _modIds.GetValueOrDefault(mod);
             var id = SeasonModifierIdInput.Text ?? "";
             if (old != null) _mods[old] = id;
             mod.ModId = id;
+            mod.Name = SeasonModifierNameInput.Text;
             mod.Rel = decimal.TryParse(SeasonModifierRelInput.Text, out var vRel) ? vRel / 100 : null;
-            if (mod.Rel != null) SeasonModifierAbsInput.Text = "";
             mod.AbsValue = decimal.TryParse(SeasonModifierAbsInput.Text, out var vAbs) ? Utils.DecToDb(vAbs, s.Precision) : null;
-            if (mod.AbsValue != null) SeasonModifierRelInput.Text = "";
 
             CollectionViewSource.GetDefaultView(_modList).Refresh();
             UpdateButtons();
@@ -158,12 +159,17 @@ namespace Elwig.Windows {
         }
 
         private void SeasonModifierRelInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 3, 2, true));
+            if (SeasonModifierRelInput.Text.Length > 0 && SeasonModifierAbsInput.Text.Length > 0)
+                SeasonModifierAbsInput.Text = "";
             SeasonModifier_Changed(sender, evt);
         }
 
         private void SeasonModifierAbsInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision, true));
+            if (SeasonModifierAbsInput.Text.Length > 0 && SeasonModifierRelInput.Text.Length > 0)
+                SeasonModifierRelInput.Text = "";
             SeasonModifier_Changed(sender, evt);
         }
     }

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -0,0 +1,113 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private bool _seasonChanged = false;
+        private bool _seasonUpdate = false;
+
+        private void SeasonsInitEditing() {
+            ControlUtils.RenewItemsSource(SeasonList, Context.Seasons.OrderByDescending(s => s.Year).ToList(), s => (s as Season)?.Year);
+            SeasonList_SelectionChanged(null, null);
+        }
+
+        private void SeasonsFinishEditing() {
+            ControlUtils.RenewItemsSource(SeasonList, Context.Seasons.OrderByDescending(s => s.Year).ToList(), s => (s as Season)?.Year);
+            _seasonChanged = false;
+        }
+
+        private async Task SeasonsSave() {
+            if (!_seasonChanged || SeasonList.SelectedItem is not Season s)
+                return;
+            Context.Update(s);
+            await Context.SaveChangesAsync();
+        }
+
+        private async void SeasonList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            _seasonUpdate = true;
+            if (SeasonList.SelectedItem is Season s) {
+                SeasonModifierList.ItemsSource = await Context.Modifiers.Where(m => m.Year == s.Year).OrderBy(m => m.Ordering).ToListAsync();
+                SeasonMaxKgPerHaInput.Text = s.MaxKgPerHa.ToString();
+                SeasonVatNormalInput.Text = (s.VatNormal * 100).ToString();
+                SeasonVatFlatrateInput.Text = (s.VatFlatrate * 100).ToString();
+                SeasonStartInput.Text = $"{s.StartDate:dd.MM.yyyy}";
+                SeasonEndInput.Text = $"{s.EndDate:dd.MM.yyyy}";
+                SeasonMinKgPerBsInput.Text = s.MinKgPerBusinessShare.ToString();
+                SeasonMaxKgPerBsInput.Text = s.MaxKgPerBusinessShare.ToString();
+                SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
+                SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
+                SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
+
+                var sym = s.Currency.Symbol ?? "";
+                SeasonModifierAbsInput.Unit = $"{sym}/kg";
+                SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
+                SeasonPenaltyInput.Unit = sym;
+                SeasonPenaltyNoneInput.Unit = sym;
+                AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
+                AreaCommitmentTypePenaltyInput.Unit = sym;
+                AreaCommitmentTypePenaltyNoneInput.Unit = sym;
+            } else {
+                SeasonModifierList.ItemsSource = null;
+                SeasonMaxKgPerHaInput.Text = "";
+                SeasonVatNormalInput.Text = "";
+                SeasonVatFlatrateInput.Text = "";
+                SeasonStartInput.Text = "";
+                SeasonEndInput.Text = "";
+                SeasonMinKgPerBsInput.Text = "";
+                SeasonMaxKgPerBsInput.Text = "";
+                SeasonPenaltyPerKgInput.Text = "";
+                SeasonPenaltyInput.Text = "";
+                SeasonPenaltyNoneInput.Text = "";
+            }
+            _seasonUpdate = false;
+        }
+
+        private void Season_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_seasonUpdate || (!IsEditing && !IsCreating) || SeasonList.SelectedItem is not Season s) return;
+            _seasonChanged = true;
+
+            if (SeasonMaxKgPerHaInput.Text.Length > 0)
+                s.MaxKgPerHa = int.Parse(SeasonMaxKgPerHaInput.Text);
+            if (SeasonVatNormalInput.Text.Length > 0)
+                s.VatNormal = double.Parse(SeasonVatNormalInput.Text) / 100;
+            if (SeasonVatFlatrateInput.Text.Length > 0)
+                s.VatFlatrate = double.Parse(SeasonVatFlatrateInput.Text) / 100;
+            if (SeasonMinKgPerBsInput.Text.Length > 0)
+                s.MinKgPerBusinessShare = int.Parse(SeasonMinKgPerBsInput.Text);
+            if (SeasonMaxKgPerBsInput.Text.Length > 0)
+                s.MaxKgPerBusinessShare = int.Parse(SeasonMaxKgPerBsInput.Text);
+            s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
+            s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
+            s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
+
+            UpdateButtons();
+        }
+
+        private void SeasonMinMaxKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, true, 5));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonVatInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, true, 2, 1));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonPenaltyPerKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonPenaltyInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, 2));
+            Season_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -19,11 +19,11 @@ namespace Elwig.Windows {
         private bool _attrUpdate = false;
 
         private void WineAttributesInitEditing() {
-            SeasonList.IsEnabled = false;
             _attrList = new(Context.WineAttributes.OrderBy(a => a.Name).ToList());
             _attrs = _attrList.ToDictionary(a => a.AttrId, a => (string?)a.AttrId);
             _attrIds = _attrList.ToDictionary(a => a, a => a.AttrId);
             ControlUtils.RenewItemsSource(WineAttributeList, _attrList, a => (a as WineAttr)?.AttrId);
+            WineAttributeList_SelectionChanged(null, null);
         }
 
         private void WineAttributesFinishEditing() {
@@ -35,7 +35,6 @@ namespace Elwig.Windows {
 
             WineAttributeAddButton.IsEnabled = false;
             WineAttributeDeleteButton.IsEnabled = false;
-            SeasonList.IsEnabled = true;
         }
 
         private async Task WineAttributesSave() {
@@ -65,7 +64,7 @@ namespace Elwig.Windows {
             await Context.SaveChangesAsync();
         }
 
-        private void WineAttributeList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void WineAttributeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             UpdateButtons();
             _attrUpdate = true;
             if (WineAttributeList.SelectedItem is not WineAttr attr) {

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -23,6 +23,7 @@ namespace Elwig.Windows {
             _cults = _cultList.ToDictionary(c => c.CultId, c => (string?)c.CultId);
             _cultIds = _cultList.ToDictionary(c => c, c => c.CultId);
             ControlUtils.RenewItemsSource(WineCultivationList, _cultList, c => (c as WineCult)?.CultId);
+            WineCultivationList_SelectionChanged(null, null);
         }
 
         private void WineCultivationsFinishEditing() {
@@ -63,7 +64,7 @@ namespace Elwig.Windows {
             await Context.SaveChangesAsync();
         }
 
-        private void WineCultivationList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void WineCultivationList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             UpdateButtons();
             _cultUpdate = true;
             if (WineCultivationList.SelectedItem is not WineCult cult) {

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -21,9 +21,14 @@ namespace Elwig.Windows {
                 BranchIdInput, BranchNameInput, BranchPlzInput, BranchOrtInput,
                 BranchAddressInput, BranchPhoneNrInput, BranchFaxNrInput, BranchMobileNrInput,
                 WineAttributeIdInput, WineAttributeNameInput, WineAttributeActiveInput,
-                WineAttributeMaxKgPerHaInput, WineAttributeStrictInput, WineAttributeFillLowerInput,
+                WineAttributeMaxKgPerHaInput.TextBox, WineAttributeStrictInput, WineAttributeFillLowerInput,
                 WineCultivationIdInput, WineCultivationNameInput, WineCultivationDescriptionInput,
-                SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput, SeasonModifierAbsInput,
+                AreaCommitmentTypeIdInput, AreaCommitmentTypeWineVariantInput, AreaCommitmentTypeWineAttributeInput,
+                AreaCommitmentTypeMinKgPerHaInput.TextBox, AreaCommitmentTypePenaltyPerKgInput.TextBox,
+                AreaCommitmentTypePenaltyInput.TextBox, AreaCommitmentTypePenaltyNoneInput.TextBox,
+                SeasonMaxKgPerHaInput.TextBox, SeasonVatNormalInput.TextBox, SeasonVatFlatrateInput.TextBox, SeasonStartInput, SeasonEndInput,
+                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
+                SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput.TextBox, SeasonModifierAbsInput.TextBox,
             };
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
             WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
@@ -44,7 +49,7 @@ namespace Elwig.Windows {
             WineAttributeIdInput.IsReadOnly = true;
             WineAttributeNameInput.IsReadOnly = true;
             WineAttributeActiveInput.IsEnabled = false;
-            WineAttributeMaxKgPerHaInput.IsReadOnly = true;
+            WineAttributeMaxKgPerHaInput.TextBox.IsReadOnly = true;
             WineAttributeStrictInput.IsEnabled = false;
             WineAttributeFillLowerInput.IsEnabled = false;
 
@@ -52,10 +57,26 @@ namespace Elwig.Windows {
             WineCultivationNameInput.IsReadOnly = true;
             WineCultivationDescriptionInput.IsReadOnly = true;
 
+            AreaCommitmentTypeWineVariantInput.IsEnabled = false;
+            AreaCommitmentTypeWineAttributeInput.IsEnabled = false;
+            AreaCommitmentTypeMinKgPerHaInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyPerKgInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyNoneInput.TextBox.IsReadOnly = true;
+
+            SeasonMaxKgPerHaInput.TextBox.IsReadOnly = true;
+            SeasonVatNormalInput.TextBox.IsReadOnly = true;
+            SeasonVatFlatrateInput.TextBox.IsReadOnly = true;
+            SeasonMinKgPerBsInput.TextBox.IsReadOnly = true;
+            SeasonMaxKgPerBsInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyPerKgInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyNoneInput.TextBox.IsReadOnly = true;
+
             SeasonModifierIdInput.IsReadOnly = true;
             SeasonModifierNameInput.IsReadOnly = true;
-            SeasonModifierRelInput.IsReadOnly = true;
-            SeasonModifierAbsInput.IsReadOnly = true;
+            SeasonModifierRelInput.TextBox.IsReadOnly = true;
+            SeasonModifierAbsInput.TextBox.IsReadOnly = true;
         }
 
         new protected void UnlockInputs() {
@@ -73,7 +94,7 @@ namespace Elwig.Windows {
             WineAttributeIdInput.IsReadOnly = false;
             WineAttributeNameInput.IsReadOnly = false;
             WineAttributeActiveInput.IsEnabled = true;
-            WineAttributeMaxKgPerHaInput.IsReadOnly = false;
+            WineAttributeMaxKgPerHaInput.TextBox.IsReadOnly = false;
             WineAttributeStrictInput.IsEnabled = true;
             WineAttributeFillLowerInput.IsEnabled = true;
 
@@ -81,30 +102,52 @@ namespace Elwig.Windows {
             WineCultivationNameInput.IsReadOnly = false;
             WineCultivationDescriptionInput.IsReadOnly = false;
 
+            AreaCommitmentTypeWineVariantInput.IsEnabled = true;
+            AreaCommitmentTypeWineAttributeInput.IsEnabled = true;
+            AreaCommitmentTypeMinKgPerHaInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyPerKgInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyNoneInput.TextBox.IsReadOnly = false;
+
+            SeasonMaxKgPerHaInput.TextBox.IsReadOnly = false;
+            SeasonVatNormalInput.TextBox.IsReadOnly = false;
+            SeasonVatFlatrateInput.TextBox.IsReadOnly = false;
+            SeasonMinKgPerBsInput.TextBox.IsReadOnly = false;
+            SeasonMaxKgPerBsInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyPerKgInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyNoneInput.TextBox.IsReadOnly = false;
+
             SeasonModifierIdInput.IsReadOnly = false;
             SeasonModifierNameInput.IsReadOnly = false;
-            SeasonModifierRelInput.IsReadOnly = false;
-            SeasonModifierAbsInput.IsReadOnly = false;
+            SeasonModifierRelInput.TextBox.IsReadOnly = false;
+            SeasonModifierAbsInput.TextBox.IsReadOnly = false;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
             LockInputs();
-            FillInputs(App.Client);
         }
 
         protected override async Task OnRenewContext() {
             await base.OnRenewContext();
-            var year = (SeasonList.SelectedItem as Season)?.Year;
+            FillInputs(App.Client);
             ControlUtils.RenewItemsSource(SeasonList, await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync(), s => (s as Season)?.Year, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(BranchList, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), b => (b as Branch)?.ZwstId);
-            ControlUtils.RenewItemsSource(WineAttributeList, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), a => (a as WineAttr)?.AttrId);
-            ControlUtils.RenewItemsSource(WineCultivationList, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), c=> (c as WineCult)?.CultId);
-            ControlUtils.RenewItemsSource(SeasonModifierList, await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync(), m => (m as Modifier)?.ModId);
+            var year = (SeasonList.SelectedItem as Season)?.Year;
+            ControlUtils.RenewItemsSource(BranchList, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), b => (b as Branch)?.ZwstId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineAttributeList, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), a => (a as WineAttr)?.AttrId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineVariantInput, await Context.WineVarieties.OrderBy(s => s.Name).ToListAsync(), s => (s as WineVar)?.SortId);
+            var attrList = await Context.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem(""));
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineAttributeInput, attrList, a => (a as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), v => (v as AreaComType)?.VtrgId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineCultivationList, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), c=> (c as WineCult)?.CultId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(SeasonModifierList, await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync(), m => (m as Modifier)?.ModId, null, ControlUtils.RenewSourceDefault.First);
         }
 
         protected override void UpdateButtons() {
             if (!IsEditing && !IsCreating) return;
-            bool ch = _branchChanged || _attrChanged || _cultChanged || _modChanged || HasChanged,
+            bool ch = _branchChanged || _attrChanged || _cultChanged || _actChanged ||
+                      _seasonChanged || _modChanged || HasChanged,
                 v = IsValid;
             CancelButton.IsEnabled = true;
             ResetButton.IsEnabled = ch;
@@ -116,7 +159,8 @@ namespace Elwig.Windows {
             WineAttributeDeleteButton.IsEnabled = WineAttributeList.SelectedIndex != -1;
             WineCultivationAddButton.IsEnabled = true;
             WineCultivationDeleteButton.IsEnabled = WineCultivationList.SelectedIndex != -1;
-
+            AreaCommitmentTypeAddButton.IsEnabled = true;
+            AreaCommitmentTypeDeleteButton.IsEnabled = AreaCommitmentTypeList.SelectedIndex != -1;
             SeasonModifierUpButton.IsEnabled = SeasonModifierList.SelectedIndex >= 1;
             SeasonModifierDownButton.IsEnabled = SeasonModifierList.SelectedIndex != -1 && SeasonModifierList.SelectedIndex < (_modList?.Count - 1 ?? 0);
             SeasonModifierAddButton.IsEnabled = true;
@@ -131,7 +175,10 @@ namespace Elwig.Windows {
             BranchesInitEditing();
             WineAttributesInitEditing();
             WineCultivationsInitEditing();
+            AreaCommitmentTypesInitEditing();
+            SeasonsInitEditing();
             ModifiersInitEditing();
+
             UnlockInputs();
             UpdateButtons();
         }
@@ -149,6 +196,8 @@ namespace Elwig.Windows {
             BranchesFinishEditing();
             WineCultivationsFinishEditing();
             WineAttributesFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -166,6 +215,8 @@ namespace Elwig.Windows {
             BranchesInitEditing();
             WineAttributesInitEditing();
             WineCultivationsInitEditing();
+            AreaCommitmentTypesInitEditing();
+            SeasonsInitEditing();
             ModifiersInitEditing();
 
             ClearInputStates();
@@ -179,6 +230,8 @@ namespace Elwig.Windows {
                 await BranchesSave();
                 await WineAttributesSave();
                 await WineCultivationsSave();
+                await AreaCommitmentTypesSave();
+                await SeasonsSave();
                 await ModifiersSave();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -197,6 +250,8 @@ namespace Elwig.Windows {
             BranchesFinishEditing();
             WineAttributesFinishEditing();
             WineCultivationsFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -267,10 +322,5 @@ namespace Elwig.Windows {
             ClientNameFull.Text = $"{ClientNameInput.Text}{(suffix != null ? $", {suffix}," : "")} {ClientNameTypeInput.Text}";
             TextBox_TextChanged(sender, evt);
         }
-
-        private async void SeasonList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            var year = (SeasonList.SelectedItem as Season)?.Year;
-            SeasonModifierList.ItemsSource = await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync();
-        }
     }
 }

Elwig/Windows/ChartWindow.xaml.cs

@@ -375,7 +375,7 @@ namespace Elwig.Windows {
             OechslePricePlot.Plot.Legend(false, Alignment.UpperRight);
         }
 
-        private void OechsleInput_TextChanged(object sender, RoutedEventArgs evt) {
+        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
             IntegerInput_TextChanged(sender, evt);
 
             bool success = int.TryParse(OechsleInput.Text, out int oechsle);

Elwig/Windows/ContextWindow.cs

@@ -31,8 +31,8 @@ namespace Elwig.Windows {
             await RenewContext();
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
-            OnRenewContext().GetAwaiter().GetResult();
+        protected async void OnLoaded(object sender, RoutedEventArgs evt) {
+            await OnRenewContext();
         }
 
         protected override void OnClosed(EventArgs evt) {

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
@@ -93,7 +94,7 @@
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
                      TextChanged="SearchInput_TextChanged"
                      ToolTip="Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.&#xA;&#xA;Filtern nach:&#xA;Sorte: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...&#xA;Qualitätsstufe: z.B. QUW, kab, ldw, ...&#xA;Gradation: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...&#xA;Mitglied: z.B. 1234, 987, ...&#xA;Saison: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...&#xA;Zweigstelle: z.B. musterort, ...&#xA;Attribute: z.B. kabinett, !kabinett (alle außer kabinett), ...&#xA;Datum: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...&#xA;Uhrzeit: z.B. 06:00-08:00, 18:00-, ...&#xA;Freitext: z.B. Lieferscheinnummern, &quot;quw&quot; (sucht nach dem Text &quot;quw&quot;)"/>
-            <xctk:IntegerUpDown Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+            <xctk:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>
             <CheckBox x:Name="TodayOnlyInput" Content="Nur heute"
@@ -268,7 +269,7 @@
                     <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
                              TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
                     <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
-                              ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
+                              ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
                               SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
                     <Label Content="Attribut:" Margin="10,40,0,0" Grid.Column="0"/>
@@ -285,17 +286,12 @@
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
                     <Label Content="Gradation:" Margin="10,10,10,10"/>
-                    <Grid Grid.Column="1" Width="54" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="GradationOeInput"  TextAlignment="Right" Padding="2,2,23,2"
-                                 TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"/>
-                        <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="GradationOeInput" Unit="°Oe" TextChanged="GradationOeInput_TextChanged" KeyUp="Input_KeyUp"
+                                      Grid.Column="1" Width="54" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
                     <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
-                    <Grid Grid.Column="1" Width="68" Height="25" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,34,2" SnapsToDevicePixels="True"
-                                 TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
-                        <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="GradationKmwInput" Unit="°KMW" TextChanged="GradationKmwInput_TextChanged" KeyUp="Input_KeyUp"
+                                      Grid.Column="1" Width="68" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
                     <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
@@ -315,11 +311,8 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Gewicht:" Margin="10,10,10,10"/>
-                    <Grid Grid.Column="1" Width="70" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" IsReadOnly="True"
-                                 TextChanged="WeightInput_TextChanged"/>
-                        <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" TextChanged="WeightInput_TextChanged"
+                                      Grid.Column="1" Width="70" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
                               VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
@@ -365,18 +358,14 @@
                              TextChanged="TextBox_TextChanged"/>
 
                     <Label Content="Temperatur:" Margin="10,70,0,10"/>
-                    <Grid Grid.Column="1" Height="25" Margin="0,70,10,10" VerticalAlignment="Top">
-                        <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
-                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                        <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="TemperatureInput" Unit="°C"
+                                      TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"
+                                      Grid.Column="1" Margin="0,70,10,10" VerticalAlignment="Top"/>
 
                     <Label Content="Säure:" Margin="10,100,0,10"/>
-                    <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
-                        <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
-                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                        <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="AcidInput" Unit="g/l"
+                                      TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"
+                                      Grid.Column="1" Margin="0,100,10,10" VerticalAlignment="Top"/>
 
                     <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
@@ -465,23 +454,47 @@
                 </ItemsPanelTemplate>
             </StatusBar.ItemsPanel>
             <StatusBarItem>
-                <TextBlock Name="StatusMembers" Text="Mitglieder: -"/>
+                <TextBlock x:Name="StatusMembers" Text="Mitglieder: -"/>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
-                <TextBlock Name="StatusDeliveries" Text="Lieferungen: -"/>
+                <TextBlock x:Name="StatusDeliveries" Text="Lieferungen: -"/>
             </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4">
-                <TextBlock Name="StatusVarieties" Text="Sorten: -"/>
+                <TextBlock x:Name="StatusVarieties" Text="Sorten: -"/>
             </StatusBarItem>
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
-                <TextBlock Name="StatusWeight" Text="Gewicht: -"/>
+                <TextBlock x:Name="StatusWeight" Text="Gewicht: -">
+                    <TextBlock.ToolTip>
+                        <Grid x:Name="StatusWeightToolTip">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="10"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="50"/>
+                                <ColumnDefinition Width="50"/>
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </TextBlock.ToolTip>
+                </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>
             <StatusBarItem Grid.Column="8">
-                <TextBlock Name="StatusGradation" Text="Gradation: -"/>
+                <TextBlock x:Name="StatusGradation" Text="Gradation: -">
+                    <TextBlock.ToolTip>
+                        <Grid x:Name="StatusGradationToolTip">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="10"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="35"/>
+                                <ColumnDefinition Width="35"/>
+                                <ColumnDefinition Width="35"/>
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </TextBlock.ToolTip>
+                </TextBlock>
             </StatusBarItem>
         </StatusBar>
     </Grid>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -40,9 +40,9 @@ namespace Elwig.Windows {
                 MgNrInput, MemberInput,
                 LsNrInput, DateInput, BranchInput,
                 SortIdInput, WineVarietyInput,
-                GradationOeInput, GradationKmwInput, WineQualityLevelInput,
+                GradationOeInput.TextBox, GradationKmwInput.TextBox, WineQualityLevelInput,
                 WineOriginInput, WineKgInput,
-                WeightInput
+                WeightInput.TextBox
             };
             ExemptInputs = new Control[] {
                 SearchInput, SeasonInput, TodayOnlyInput, AllSeasonsInput,
@@ -282,7 +282,7 @@ namespace Elwig.Windows {
                 SortIdInput.SelectAll();
             } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributeInput) {
                 GradationOeInput.Focus();
-                GradationOeInput.SelectAll();
+                GradationOeInput.TextBox.SelectAll();
             } else if (ctrl == GradationKmwInput || ctrl == GradationOeInput || ctrl == WineQualityLevelInput) {
                 if (WeighingAButton.IsVisible) WeighingAButton.Focus();
                 else WeighingManualButton.Focus();
@@ -519,6 +519,38 @@ namespace Elwig.Windows {
             return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter);
         }
 
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            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,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
+        private void AddWeightToolTipRow(int row, string? h1, string? h2, int weight, int? total1, int total2) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(StatusWeightToolTip, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(StatusWeightToolTip, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(StatusWeightToolTip, $"{weight:N0} kg", row, 2, 1, bold, true);
+            if (total1 != null && total1 != 0)
+                AddToolTipCell(StatusWeightToolTip, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
+            if (total2 != 0)
+                AddToolTipCell(StatusWeightToolTip, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
+        }
+
+        private void AddGradationToolTipRow(int row, string? h1, string? h2, double min, double avg, double max) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(StatusGradationToolTip, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(StatusGradationToolTip, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(StatusGradationToolTip, $"{min:N1}°", row, 2, 1, bold, true);
+            AddToolTipCell(StatusGradationToolTip, $"{avg:N1}°", row, 3, 1, bold, true);
+            AddToolTipCell(StatusGradationToolTip, $"{max:N1}°", row, 4, 1, bold, true);
+        }
+
         private async Task RefreshDeliveryListQuery(bool updateSort = false) {
             var (_, deliveryQuery, deliveryPartsQuery, filter) = await GetFilters();
             var deliveries = await deliveryQuery.ToListAsync();
@@ -551,47 +583,99 @@ namespace Elwig.Windows {
                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
                 StatusVarieties.Text = $"Sorten: {varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
 
+                StatusWeightToolTip.Children.Clear();
+                StatusGradationToolTip.Children.Clear();
+
                 var weight = await deliveryParts.SumAsync(p => p.Weight);
                 StatusWeight.Text = $"Gewicht: {weight:N0} kg";
+                AddWeightToolTipRow(0, "Gewicht", null, weight, null, weight);
 
                 if (n > 0) {
                     var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
                     var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
                     var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
                     StatusGradation.Text = $"Gradation: {kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
-                } else {
-                    StatusGradation.Text = "Gradation: -";
-                }
+                    AddToolTipCell(StatusGradationToolTip, "Min.", 0, 2, 1, false, false, true);
+                    AddToolTipCell(StatusGradationToolTip, "⌀", 0, 3, 1, false, false, true);
+                    AddToolTipCell(StatusGradationToolTip, "Max.", 0, 4, 1, false, false, true);
+                    AddGradationToolTipRow(1, "Gradation", null, kmwMin, kmwAvg, kmwMax);
 
-                if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
-                    var parts = await deliveryParts.ToListAsync();
-                    var groups = parts
-                        .GroupBy(p => p.Attribute?.Name)
-                        .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
-                        .OrderByDescending(g => g.Item2)
-                        .ToList();
+                    var attrGroups = await deliveryParts
+                        .GroupBy(p => p.Attribute.Name)
+                        .Select(g => new {
+                            Attr = g.Key,
+                            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),
+                            Max = g.Max(p => p.Kmw),
+                        })
+                        .OrderByDescending(g => g.Weight)
+                        .ThenBy(g => g.Attr)
+                        .ToListAsync();
+                    var sortGroups = await deliveryParts
+                        .GroupBy(p => p.SortId)
+                        .Select(g => new {
+                            SortId = g.Key,
+                            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),
+                            Max = g.Max(p => p.Kmw),
+                        })
+                        .OrderByDescending(g => g.Weight)
+                        .ThenBy(g => g.SortId)
+                        .ToListAsync();
+                    var groups = await deliveryParts
+                        .GroupBy(p => new {
+                            p.Attribute.Name,
+                            p.SortId,
+                        })
+                        .Select(g => new {
+                            Attr = g.Key.Name,
+                            g.Key.SortId,
+                            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),
+                            Max = g.Max(p => p.Kmw)
+                        })
+                        .OrderByDescending(g => g.SortId)
+                        .ThenBy(g => g.Attr)
+                        .ThenBy(g => g.SortId)
+                        .ToListAsync();
 
-                    if (groups.Count == 1) {
-                        var g = groups.First().Key;
-                        if (g != "") {
+                    int rowNum = 1;
+                    foreach (var attrG in attrGroups) {
+                        rowNum++;
+                        AddWeightToolTipRow(rowNum++, attrG.Attr, null, attrG.Weight, attrG.Weight, weight);
+                        foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                            AddWeightToolTipRow(rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                        }
+                    }
+                    rowNum = 2;
+                    foreach (var attrG in attrGroups) {
+                        rowNum++;
+                        AddGradationToolTipRow(rowNum++, attrG.Attr, null, attrG.Min, attrG.Avg, attrG.Max);
+                        foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
+                            AddGradationToolTipRow(rowNum++, null, g.SortId, g.Min, g.Avg, g.Max);
+                        }
+                    }
+
+                    if (attrGroups.Count == 1) {
+                        var g = attrGroups.First().Attr;
+                        if (g != null) {
                             StatusWeight.Text += $" [{g}]";
                             StatusGradation.Text += $" [{g}]";
                         }
-
-                        var sortGroups = parts
-                            .GroupBy(p => p.SortId)
-                            .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
-                            .OrderByDescending(g => g.Item2)
-                            .ToList();
-
                         if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
-                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
-                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+
                         }
-                    } else if (groups.Count <= 4) {
-                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
-                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                    } else if (attrGroups.Count <= 4) {
+                        StatusWeight.Text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null ? "" : $" [{g.Attr}]")))}";
+                        StatusGradation.Text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.Attr == null ? "" : $" [{g.Attr}]")))}";
                     }
+                } else {
+                    StatusGradation.Text = "Gradation: -";
                 }
             } else {
                 StatusVarieties.Text = "Sorten: -";
@@ -600,9 +684,6 @@ namespace Elwig.Windows {
             }
 
             StatusVarieties.ToolTip = StatusVarieties.Text;
-            // TODO display Weight/Gradation with newlines in ToolTip and grouped by sortid AND attributes
-            StatusWeight.ToolTip = StatusWeight.Text;
-            StatusGradation.ToolTip = StatusGradation.Text;
         }
 
         protected override async Task OnRenewContext() {
@@ -1367,7 +1448,7 @@ namespace Elwig.Windows {
                 WineOriginInput.IsEnabled = false;
             if (WineKgInput.SelectedItem == null)
                 WineRdInput.IsEnabled = false;
-            WeightInput.IsReadOnly = true;
+            WeightInput.TextBox.IsReadOnly = true;
             AbgewertetInput.IsEnabled = false;
             ManualWeighingInput.IsEnabled = false;
             LsNrInput.IsReadOnly = true;
@@ -1408,12 +1489,12 @@ namespace Elwig.Windows {
             }
         }
 
-        private async void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private new async void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.DateInput_TextChanged(sender, evt);
             if (IsEditing || IsCreating) await UpdateLsNr();
         }
 
-        private async void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private async void BranchInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             base.ComboBox_SelectionChanged(sender, evt);
             if (IsEditing || IsCreating) {
                 await UpdateLsNr();
@@ -1465,17 +1546,17 @@ namespace Elwig.Windows {
 
         private void UpdateGradationKmw() {
             IsUpdatingGradation = true;
-            var caret = GradationKmwInput.CaretIndex;
+            var caret = GradationKmwInput.TextBox.CaretIndex;
             GradationKmwInput.Text = $"{Utils.OeToKmw(double.Parse(GradationOeInput.Text)):#.0}";
-            GradationKmwInput.CaretIndex = caret;
+            GradationKmwInput.TextBox.CaretIndex = caret;
             IsUpdatingGradation = false;
         }
 
         private void UpdateGradationOe() {
             IsUpdatingGradation = true;
-            var caret = GradationOeInput.CaretIndex;
+            var caret = GradationOeInput.TextBox.CaretIndex;
             GradationOeInput.Text = $"{Utils.KmwToOe(double.Parse(GradationKmwInput.Text)):#}";
-            GradationOeInput.CaretIndex = caret;
+            GradationOeInput.TextBox.CaretIndex = caret;
             IsUpdatingGradation = false;
         }
 

Elwig/Windows/MemberAdminWindow.xaml

@@ -311,6 +311,10 @@
                     <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+
+                    <CheckBox x:Name="OrganicInput" Content="Bio" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
                 </Grid>
             </GroupBox>
             <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -425,6 +425,7 @@ namespace Elwig.Windows {
             m.UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text;
             m.LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text;
             m.IsBuchführend = BuchführendInput.IsChecked ?? false;
+            m.IsOrganic = OrganicInput.IsChecked ?? false;
 
             m.EntryDateString = (EntryDateInput.Text == "") ? null : string.Join("-", EntryDateInput.Text.Split(".").Reverse());
             m.ExitDateString = (ExitDateInput.Text == "") ? null : string.Join("-", ExitDateInput.Text.Split(".").Reverse());
@@ -585,6 +586,7 @@ namespace Elwig.Windows {
             UstIdNrInput.Text = m.UstIdNr;
             LfbisNrInput.Text = m.LfbisNr;
             BuchführendInput.IsChecked = m.IsBuchführend;
+            OrganicInput.IsChecked = m.IsOrganic;
 
             var billingAddr = m.BillingAddress;
             if (billingAddr != null) {
@@ -668,7 +670,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPredecessorMgNr);
         }
 
-        private new void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        private new void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.PhoneNrInput_TextChanged(sender, evt);
             UpdatePhoneNrInputVisibility(IsEditing || IsCreating);
         }

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -80,13 +80,14 @@ namespace Elwig.Windows {
                 using (var cmd = cnx.CreateCommand()) {
                     cmd.CommandText = $"""
                     SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address, m.business_shares,
-                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_OBLIGATION') AS min_kg,
-                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_RIGHT') AS max_kg,
+                           m.business_shares * s.min_kg_per_bs AS min_kg,
+                           m.business_shares * s.max_kg_per_bs AS max_kg,
                            COALESCE(SUM(d.weight), 0) AS sum
                     FROM member m
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz
-                        LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = {year}
+                        LEFT JOIN season s ON s.year = {year}
+                        LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
                     WHERE m.active = 1
                     GROUP BY d.year, m.mgnr
                     ORDER BY sum = 0 DESC, 100.0 * sum / max_kg, m.mgnr;
@@ -97,7 +98,7 @@ namespace Elwig.Windows {
                         var familyName = reader.GetString(1);
                         var givenName = reader.GetString(2);
                         var plz = reader.GetInt32(3);
-                        var ort = reader.GetString(4);
+                        var ort = reader.GetString(4).Split(',')[0];
                         var addr = reader.GetString(5);
                         var ga = reader.GetInt32(6);
                         var minKg = reader.GetInt32(7);
@@ -111,17 +112,17 @@ namespace Elwig.Windows {
 
                 await file.WriteLineAsync($";;;;;;;;;;;");
                 await file.WriteLineAsync($"Unterlieferungen lt. Flächenbindungen;;;;;;;;;;;");
-                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Vertrag;Lieferpflicht;Lieferrecht;Geliefert;Unterliefert;Prozent");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Vertrag;Fläche;Lieferpflicht;Geliefert;Unterliefert;Prozent");
                 using (var cmd = cnx.CreateCommand()) {
                     cmd.CommandText = $"""
                     SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address,
-                           c.bucket, c.min_kg, c.max_kg, b.weight
+                           c.bucket, c.area, u.min_kg, u.weight
                     FROM member m
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz
-                        JOIN v_area_commitment_bucket c ON c.mgnr = m.mgnr AND c.year = {year}
-                        LEFT JOIN v_payment_bucket b ON (b.mgnr, b.bucket) = (m.mgnr, c.bucket) AND b.year = {year}
-                    WHERE m.active = 1 AND b.weight < c.min_kg
+                        LEFT JOIN v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
+                        JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
+                    WHERE m.active = 1
                     ORDER BY m.mgnr, c.bucket
                     """;
                     using var reader = await cmd.ExecuteReaderAsync();
@@ -130,16 +131,61 @@ namespace Elwig.Windows {
                         var familyName = reader.GetString(1);
                         var givenName = reader.GetString(2);
                         var plz = reader.GetInt32(3);
-                        var ort = reader.GetString(4);
+                        var ort = reader.GetString(4).Split(',')[0];
                         var addr = reader.GetString(5);
                         var id = reader.GetString(6);
-                        var minKg = reader.GetInt32(7);
-                        var maxKg = reader.GetInt32(8);
+                        var area = reader.GetInt32(7);
+                        var minKg = reader.GetInt32(8);
                         var sum = reader.GetInt32(9);
-                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id};{minKg};{maxKg};{sum};{sum - minKg};{sum * 100.0 / minKg - 100.0:0.0}");
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id};{area};{minKg};{sum};{sum - minKg};{sum * 100.0 / minKg - 100.0:0.0}");
                     }
                 }
 
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Lieferungen pro Mitglied und Sorte;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Sorte;Attribut;Geliefert;Fläche;Ertrag");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address,
+                           v.bucket, v.weight, v.area
+                    FROM (
+                            SELECT c.year AS year,
+                                   c.mgnr AS mgnr,
+                                   c.bucket AS bucket,
+                                   COALESCE(d.weight, 0) AS weight,
+                                   COALESCE(c.area, 0) AS area
+                            FROM v_area_commitment_bucket_strict c
+                                LEFT JOIN v_delivery_bucket_strict d ON (d.year, d.mgnr, d.bucket) = (c.year, c.mgnr, c.bucket)
+                            WHERE c.year = {year}
+                            UNION
+                            SELECT d.year,
+                                   d.mgnr,
+                                   d.bucket,
+                                   COALESCE(d.weight, 0),
+                                   COALESCE(c.area, 0)
+                            FROM v_delivery_bucket_strict d
+                                LEFT JOIN v_area_commitment_bucket_strict c ON (c.year, c.mgnr, c.bucket) = (d.year, d.mgnr, d.bucket)
+                            WHERE d.year = {year}
+                        ) v
+                        LEFT JOIN member m ON m.mgnr = v.mgnr
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                    ORDER BY m.mgnr, v.bucket
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4).Split(',')[0];
+                        var addr = reader.GetString(5);
+                        var id = reader.GetString(6);
+                        var sum = reader.GetInt32(7);
+                        var area = reader.GetInt32(8);
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id[..2]};{id[2..]};{sum};{area};{(area > 0 ? sum * 10000 / area : "")}");
+                    }
+                }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }

Installer/Package.wxs

@@ -3,7 +3,7 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
 	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resourcs\Images\Elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">

Setup/Bundle.wxs

@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico" >
 	<BootstrapperApplication>
-      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />   
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />
 	</BootstrapperApplication>
 	  
     <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle" />
@@ -9,7 +9,7 @@
     <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
 
     <Chain>
-      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes" 
+      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes"
 				  Permanent="yes" Vital="yes" SourceFile="$(TargetDir)VC_redist.x86.exe" InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86">
       </ExePackage>