Bump version to 0.3.6

Elwig/Documents/BusinessDocument.cshtml.cs

@@ -1,3 +1,4 @@
+using Elwig.Helpers;
 using Elwig.Models;
 
 namespace Elwig.Documents {
@@ -26,14 +27,9 @@ namespace Elwig.Documents {
 
         public string Address {
             get {
-                var b = Member.BillingAddress;
-                if (b != null && UseBillingAddress) {
-                    var plz = b.PostalDest.AtPlz;
-                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Ort.Name}\n{b.Country.Name}";
-                } else {
-                    var plz = Member.PostalDest.AtPlz;
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Ort.Name}\n{Member.PostalDest.Country.Name}";
-                }
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
+                var plz = addr.PostalDest.AtPlz;
+                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
             }
         }
     }

Elwig/Documents/DeliveryJournal.cshtml.cs

@@ -1,5 +1,6 @@
 using Elwig.Helpers;
 using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,11 +16,19 @@ namespace Elwig.Documents {
             Deliveries = deliveries;
         }
 
+        public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
+            this(filter, deliveries
+                .Include(p => p.Delivery)
+                .Include(p => p.Delivery.Member)
+                .Include(p => p.Variant)
+                .ToList()) { }
+
         public DeliveryJournal(AppDbContext ctx, DateOnly date) :
             this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts
                 .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd"))
-                .OrderBy(p => p.Delivery.LsNr)
-                .ThenBy(p => p.DPNr)
-                .ToList()) { }
+                .OrderBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr)) { }
     }
 }

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.3.3</Version>
+    <Version>0.3.6</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
@@ -19,6 +19,7 @@
     <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
     <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.2.4" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />

Elwig/Helpers/Utils.cs

@@ -24,7 +24,7 @@ namespace Elwig.Helpers {
 
         public static readonly Regex SerialRegex = GeneratedSerialRegex();
         public static readonly Regex TcpRegex = GeneratedTcpRegex();
-        public static readonly Regex PartialDateRegex = GeneratedPartialDateRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
         public static readonly Regex FromToRegex = GeneratedFromToRegex();
         public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
         public static readonly Regex AddressRegex = GeneratedAddressRegex();
@@ -35,8 +35,8 @@ namespace Elwig.Helpers {
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
 
-        [GeneratedRegex(@"^(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.$", RegexOptions.Compiled)]
-        private static partial Regex GeneratedPartialDateRegex();
+        [GeneratedRegex(@"^(-?(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();

Elwig/Helpers/Validator.cs

@@ -521,6 +521,36 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckTime(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            int v = 0;
+            for (int i = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (v >= 0 && v < 5 && v != 2 && char.IsAsciiDigit(ch)) {
+                    if ((v == 0 && ch <= '2') || (v == 1 && (text[0] < '2' || ch <= '3')) || (v == 3 && ch <= '5') || v == 4) {
+                        text += ch;
+                        v++;
+                    }
+                } else if (v == 2 && ch == ':') {
+                    text += ch;
+                    v++;
+                }
+                if (i == input.CaretIndex - 1)
+                    pos = text.Length;
+            }
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "Wert ist nicht optional") : new(true, null);
+            } else if (v != 5) {
+                return new(false, "Zeit ist ungültig");
+            } else {
+                return new(true, null);
+            }
+        }
+
         public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {

Elwig/Models/AT_PlzDest.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]

Elwig/Models/AreaComType.cs

@@ -1,6 +1,7 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]

Elwig/Models/Country.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]

Elwig/Models/Credit.cs

@@ -2,6 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]

Elwig/Models/Delivery.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]

Elwig/Models/WineOrigin.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]

Elwig/Windows/AdministrationWindow.cs

@@ -482,6 +482,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
+        protected void TimeInput_TextChanged(object sender, RoutedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void TimeInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckTime);
+        }
+
         protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000"
+        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -43,16 +43,13 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.625*"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" MinWidth="400"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2*" MinWidth="560"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -75,9 +72,13 @@
             <MenuItem Header="Exportieren">
                 <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
             </MenuItem>
+            <MenuItem Header="Einstellungen">
+                <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
+                          IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/>
+            </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="42"/>
                 <RowDefinition Height="*"/>
@@ -90,7 +91,8 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"/>
+                     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"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>
@@ -105,17 +107,49 @@
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."   Binding="{Binding MgNr}" Width="70"/>
-                    <DataGridTextColumn Header="Datum"   Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70"/>
-                    <DataGridTextColumn Header="Zeit"    Binding="{Binding Time, StringFormat='HH:mm'}" Width="70"/>
-                    <DataGridTextColumn Header="Sorte"   Binding="{Binding SortIdString}" Width="60"/>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}"  Width="70">
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Zeit" Binding="{Binding Time, StringFormat='HH:mm'}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortIdString}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg '}" Width="75">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gradation" Binding="{Binding Kmw, StringFormat='{}{0:N1}° '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -156,237 +190,255 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
-                <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
-                          ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+        <Grid Grid.Row="1" Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.625*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
-                         IsReadOnly="True" IsTabStop="False"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Mitglied" Grid.Column="0" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Lieferung" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"
-                         TextChanged="DateInput_TextChanged"/>
-                <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
-                          IsEnabled="False"
-                          DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
-
-                <Label Content="Anmerkung:" Margin="10,100,0,10"/>
-                <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
-                         TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sorte" Grid.Column="2" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                <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" 
-                          SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-
-                <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-                <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
-                                    DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Gradation" Grid.Column="2" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <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"/>
+                    <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
+                             IsReadOnly="True" IsTabStop="False"/>
                 </Grid>
-                <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"/>
+            </GroupBox>
+
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+                             IsReadOnly="True" IsTabStop="False"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/>
+
+                    <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
+                              IsEnabled="False"
+                              SelectionChanged="BranchInput_SelectionChanged"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
+
+                    <Label Content="Anmerkung:" Margin="10,100,0,10"/>
+                    <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
+                             TextChanged="TextBox_TextChanged"/>
                 </Grid>
+            </GroupBox>
 
-                <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"
-                          ItemTemplate="{StaticResource WineQualityLevelTemplate}"
-                          SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+            <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <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" 
+                              SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-        <GroupBox Header="Gewicht" Grid.Column="2" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </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"/>
+                    <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
+                                        DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
+                                        ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+            <GroupBox Header="Gradation" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <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>
+                    <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>
 
-                <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                    <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"
+                              ItemTemplate="{StaticResource WineQualityLevelTemplate}"
+                              SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
-                        Click="WeighingManualButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
-                <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                                    ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
-
-                <Label Content="Anmerkung:" Margin="10,40,0,10"/>
-                <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
-                         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"/>
+                    <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
                 </Grid>
+            </GroupBox>
 
-                <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"/>
+            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </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>
+
+                    <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
+                            Click="WeighingManualButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
-                <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                         SelectionChanged="DeliveryPartList_SelectionChanged">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                <TextBlock Text="{Binding SortId}" Width="30"/>
-                                <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                <TextBlock Text="{Binding QualId}" Width="30"/>
-                                <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
+                    <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
+                    <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                                        ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
+                                        ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
 
-                <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                        ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                        Click="ExtractDeliveryPartButton_Click"/>
-                <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                        Click="DeleteDeliveryPartButton_Click"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Anmerkung:" Margin="10,40,0,10"/>
+                    <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-        <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <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>
 
-                <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
-                          ItemTemplate="{StaticResource WineOriginTemplate}"/>
+                    <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>
 
-                <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"
-                          SelectionChanged="WineKgInput_SelectionChanged"/>
+                    <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
+                    <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                </Grid>
+            </GroupBox>
 
-                <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                             SelectionChanged="DeliveryPartList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding QualId}" Width="30"/>
+                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                            Click="ExtractDeliveryPartButton_Click"/>
+                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                            Click="DeleteDeliveryPartButton_Click"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
+                              ItemTemplate="{StaticResource WineOriginTemplate}"/>
+
+                    <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"
+                              SelectionChanged="WineKgInput_SelectionChanged"/>
+
+                    <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
 
         <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
             <StatusBar.ItemsPanel>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -2,6 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
 using Elwig.Models;
+using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Win32;
@@ -180,11 +181,30 @@ namespace Elwig.Windows {
             doc.Show();
         }
 
+        private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
+            if (IsEditing || IsCreating) {
+                DateInput.IsReadOnly = false;
+                TimeInput.IsReadOnly = false;
+                BranchInput.IsEnabled = true;
+                if (IsCreating) TimeInput.Text = "";
+                OnSecondPassed(null, null);
+            }
+        }
+
+        private void Menu_Settings_EnableFreeEditing_Unchecked(object sender, RoutedEventArgs evt) {
+            DateInput.IsReadOnly = true;
+            TimeInput.IsReadOnly = true;
+            BranchInput.IsEnabled = false;
+            OnSecondPassed(null, null);
+        }
+
         private void OnSecondPassed(object? sender, EventArgs? evt) {
-            if (IsReceipt && IsCreating) {
+            if (IsReceipt && IsCreating && !Menu_Settings_EnableFreeEditing.IsChecked) {
                 var now = DateTime.Now;
                 TimeInput.Text = now.ToString("HH:mm");
                 DateInput.Text = now.ToString("dd.MM.yyyy");
+                SetDefaultValue(TimeInput);
+                SetDefaultValue(DateInput);
             }
         }
 
@@ -259,38 +279,40 @@ namespace Elwig.Windows {
             }
             if (TodayOnlyInput.IsChecked == true) {
                 deliveryQuery = deliveryQuery
-                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||
-                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0));
+                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) ||
+                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0)));
                 filterNames.Add(Utils.Today.ToString("dd.MM.yyyy"));
             } else if (AllSeasonsInput.IsChecked == false) {
                 deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value);
                 filterNames.Add(SeasonInput.Value.ToString() ?? "");
             }
-            deliveryQuery = deliveryQuery.OrderBy(d => d.DateString).ThenBy(d => d.TimeString);
-            IQueryable<DeliveryPart> dpq = deliveryQuery.SelectMany(d => d.Parts);
+            IQueryable<DeliveryPart> dpq = deliveryQuery
+                .SelectMany(d => d.Parts)
+                .OrderBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr);
 
-            // TODO add filter for:
-            //      attributes
-            //      branches
             var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
             var filterQual = new List<string>();
             var filterMgNr = new List<int>();
-            var filterDate = new List<string>();
-            var filterPartDate = new List<string>();
-            string? filterTimeGt = null;
-            string? filterTimeLt = null;
-            int filterYearGt = 0;
-            int filterYearLt = 0;
-            double filterKmwGt = 0;
-            double filterKmwLt = 0;
-            double filterOeGt = 0;
-            double filterOeLt = 0;
+            var filterZwst = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+            var filterTime = new List<(string?, string?)>();
+            int filterYearGt = 0, filterYearLt = 0;
+            double filterKmwGt = 0, filterKmwLt = 0;
+            double filterOeGt = 0, filterOeLt = 0;
 
             var filter = TextFilter.ToList();
             if (filter.Count > 0) {
                 var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                 var qual = await Context.WineQualityLevels.ToDictionaryAsync(q => q.QualId, q => q);
                 var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var zwst = await Context.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                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];
@@ -298,6 +320,10 @@ namespace Elwig.Windows {
                         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--);
+                        filterNames.Add("außer " + var[e[1..].ToUpper()].Name);
                     } else if (e.Length == 3 && qual.ContainsKey(e.ToUpper())) {
                         filterQual.Add(e.ToUpper());
                         filter.RemoveAt(i--);
@@ -306,6 +332,21 @@ namespace Elwig.Windows {
                         filterMgNr.Add(int.Parse(e));
                         filter.RemoveAt(i--);
                         filterNames.Add(mgnr[e].AdministrativeName);
+                    } 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}");
+                    } else if (zwst.ContainsKey(e.ToLower())) {
+                        var b = zwst[e.ToLower()];
+                        filterZwst.Add(b.ZwstId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Zweigstelle {b.Name}");
                     } else if (e.StartsWith(">") || e.StartsWith("<")) {
                         if (double.TryParse(e[1..], out var num)) {
                             switch ((e[0], num)) {
@@ -317,12 +358,6 @@ namespace Elwig.Windows {
                                 case ('<', _): filterOeLt = num; break;
                             }
                             filter.RemoveAt(i--);
-                        } else if (TimeOnly.TryParse(e[1..], out var time)) {
-                            switch ((e[0], time)) {
-                                case ('>', _): filterTimeGt = $"{time:HH:mm}"; break;
-                                case ('<', _): filterTimeLt = $"{time:HH:mm}"; break;
-                            }
-                            filter.RemoveAt(i--);
                         }
                         if (e.Length == 1) filter.RemoveAt(i--);
                     } else if (e.Length > 1 && Utils.FromToRegex.IsMatch(e)) {
@@ -330,14 +365,14 @@ namespace Elwig.Windows {
                         double? from = (parts[0].Length > 0) ? double.Parse(parts[0].Replace(".", ",")) : null;
                         double? to = (parts[1].Length > 0) ? double.Parse(parts[1].Replace(".", ",")) : null;
                         switch ((from, to)) {
-                            case (<= 30, <= 30):
-                            case (<= 30, null):
+                            case ( <= 30, <= 30):
+                            case ( <= 30, null):
                             case (null, <= 30):
                                 filterKmwGt = from ?? 0;
                                 filterKmwLt = to ?? 0;
                                 break;
-                            case (>= 1900, >= 1900):
-                            case (>= 1900, null):
+                            case ( >= 1900, >= 1900):
+                            case ( >= 1900, null):
                             case (null, >= 1900):
                                 filterYearGt = (int)(from ?? 0);
                                 filterYearLt = (int)(to ?? -1) + 1;
@@ -350,26 +385,57 @@ namespace Elwig.Windows {
                         filter.RemoveAt(i--);
                     } else if (e.Length > 1 && Utils.FromToTimeRegex.IsMatch(e)) {
                         var parts = e.Split("-");
-                        filterTimeGt = TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null;
-                        filterTimeLt = TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null;
+                        filterTime.Add((TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null, TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null));
                         filter.RemoveAt(i--);
+                        var t = filterTime.Last();
+                        if (t.Item1 != null && t.Item2 != null) {
+                            filterNames.Add($"{t.Item1}–{t.Item2}");
+                        } else if (t.Item1 != null) {
+                            filterNames.Add($"ab {t.Item1}");
+                        } else if (t.Item2 != null) {
+                            filterNames.Add($"bis {t.Item2}");
+                        }
                     } else if (DateOnly.TryParse(e, out var date)) {
-                        // TODO allow date ranges
-                        filterDate.Add(date.ToString("yyyy-MM-dd"));
+                        var s = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((s, s));
                         filter.RemoveAt(i--);
-                        filterNames.Add(date.ToString("dd.MM.yyyy"));
-                    } else if (Utils.PartialDateRegex.IsMatch(e)) {
-                        // TODO allow date ranges
-                        var parts = e.Split(".");
-                        var p0 = int.Parse(parts[0]);
-                        var p1 = int.Parse(parts[1]);
-                        filterPartDate.Add($"-{p1:00}-{p0:00}");
-                        filter.RemoveAt(i--);
-                        if (filterNames.Contains(SeasonInput.Value.ToString())) {
+                        if (filterNames.Contains(SeasonInput.Value.ToString()) && SeasonInput.Value == date.Year)
                             filterNames.Remove(SeasonInput.Value.ToString());
-                            filterNames.Add($"{p0:00}.{p1:00}.{SeasonInput.Value:0000}");
-                        } else {
-                            filterNames.Add($"{p0:00}.{p1:00}.");
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
+                    } else if (Utils.DateFromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        if (parts.Length == 1) {
+                            // single date
+                            var dParts = parts[0].Split('.');
+                            var s = $"{dParts[2]}-{dParts[1].PadLeft(2, '0')}-{dParts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s, s));
+                            filter.RemoveAt(i--);
+                            var n = string.Join('.', s.Split('-').Reverse());
+                            if (dParts[2] == "") {
+                                filterNames.Remove(SeasonInput.Value.ToString());
+                                filterNames.Add(n + SeasonInput.Value.ToString());
+                            } else {
+                                if (SeasonInput.Value.ToString() == dParts[2])
+                                    filterNames.Remove(SeasonInput.Value.ToString());
+                                filterNames.Add(n);
+                            }
+                        } else if (parts.Length == 2) {
+                            // from/to date
+                            var d1Parts = parts[0].Split('.');
+                            var d2Parts = parts[1].Split('.');
+                            var s1 = d1Parts.Length < 2 ? null : $"{d1Parts.ElementAtOrDefault(2)}-{d1Parts[1].PadLeft(2, '0')}-{d1Parts[0].PadLeft(2, '0')}";
+                            var s2 = d2Parts.Length < 2 ? null : $"{d2Parts.ElementAtOrDefault(2)}-{d2Parts[1].PadLeft(2, '0')}-{d2Parts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s1, s2));
+                            filter.RemoveAt(i--);
+                            var n1 = s1 == null ? null : string.Join('.', s1.Split('-').Reverse());
+                            var n2 = s2 == null ? null : string.Join('.', s2.Split('-').Reverse());
+                            if (n1 != null && n2 != null) {
+                                filterNames.Add($"{n1}–{n2}");
+                            } else if (n1 != null) {
+                                filterNames.Add($"ab dem {n1}");
+                            } else if (n2 != null) {
+                                filterNames.Add($"bis zum {n2}");
+                            }
                         }
                     } else if (e.Length > 2 && e.StartsWith("\"") && e.EndsWith("\"")) {
                         filter[i] = e[1..^1];
@@ -378,15 +444,31 @@ namespace Elwig.Windows {
                     }
                 }
 
-                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
-                if (filterDate.Count > 0) dpq = dpq.Where(p => filterDate.Contains(p.Delivery.DateString));
-                if (filterPartDate.Count > 0) dpq = dpq.Where(p => filterPartDate.Contains(p.Delivery.DateString.Substring(4)));
                 if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt);
                 if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt);
-                if (filterTimeGt != null) dpq = dpq.Where(p => filterTimeGt.CompareTo(p.Delivery.TimeString) <= 0);
-                if (filterTimeLt != null) dpq = dpq.Where(p => filterTimeLt.CompareTo(p.Delivery.TimeString) > 0);
+                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(p => (d1 == null || d1.CompareTo(p.Delivery.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(p.Delivery.DateString.Substring(10 - d2.Length)) >= 0));
+                    dpq = dpq.Where(pr);
+                }
+                if (filterTime.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
+                    foreach (var (t1, t2) in filterTime)
+                        pr.Or(p => (t1 == null || t1.CompareTo(p.Delivery.TimeString) <= 0) && (t2 == null || t2.CompareTo(p.Delivery.TimeString) > 0));
+                    dpq = dpq.Where(p => p.Delivery.TimeString != null).Where(pr);
+                }
                 if (filterVar.Count > 0) dpq = dpq.Where(p => filterVar.Contains(p.SortId));
+                if (filterNotVar.Count > 0) dpq = dpq.Where(p => !filterNotVar.Contains(p.SortId));
                 if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId));
+                if (filterZwst.Count > 0) dpq = dpq.Where(p => filterZwst.Contains(p.Delivery.ZwstId));
+                if (filterAttr.Count > 0)
+                    foreach (var a in filterAttr)
+                        dpq = dpq.Where(p => p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
+                if (filterNotAttr.Count > 0)
+                    foreach (var a in filterNotAttr)
+                        dpq = dpq.Where(p => !p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
                 if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt);
                 if (filterKmwLt > 0) dpq = dpq.Where(p => p.Kmw < filterKmwLt);
                 if (filterOeGt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
@@ -404,25 +486,18 @@ namespace Elwig.Windows {
                 } else if (filterKmwGt > 0) {
                     filterNames.Add($"ab {filterKmwGt:N1} °KMW");
                 } else if (filterKmwLt > 0) {
-                    filterNames.Add($"bis {filterKmwLt:N1} °KMW");
+                    filterNames.Add($"unter {filterKmwLt:N1} °KMW");
                 }
                 if (filterOeGt > 0 && filterOeLt > 0) {
                     filterNames.Add($"{filterOeGt:N1}–{filterOeLt:N1} °Oe");
                 } else if (filterOeGt > 0) {
                     filterNames.Add($"ab {filterOeGt:N1} °Oe");
                 } else if (filterOeLt > 0) {
-                    filterNames.Add($"bis {filterOeLt:N1} °Oe");
-                }
-                if (filterTimeGt != null && filterTimeLt != null) {
-                    filterNames.Add($"{filterTimeGt}–{filterTimeLt}");
-                } else if (filterTimeGt != null) {
-                    filterNames.Add($"ab {filterTimeGt}");
-                } else if (filterTimeLt != null) {
-                    filterNames.Add($"bis {filterTimeLt}");
+                    filterNames.Add($"unter {filterOeLt:N1} °Oe");
                 }
             }
 
-            return (filterNames, dpq.Select(p => p.Delivery).Distinct(), dpq, filter);
+            return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter);
         }
 
         private async Task RefreshDeliveryListQuery(bool updateSort = false) {
@@ -447,6 +522,7 @@ namespace Elwig.Windows {
 
             var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
             StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
+            StatusMembers.ToolTip = StatusMembers.Text;
             StatusDeliveries.Text = $"Lieferungen: {deliveries.Count}";
 
             if (filter.Count == 0) {
@@ -479,8 +555,8 @@ namespace Elwig.Windows {
                     if (groups.Count == 1) {
                         var g = groups.First().Key;
                         if (g != "") {
-                            StatusWeight.Text += $" ({g})";
-                            StatusGradation.Text += $" ({g})";
+                            StatusWeight.Text += $" [{g}]";
+                            StatusGradation.Text += $" [{g}]";
                         }
 
                         var sortGroups = parts
@@ -490,12 +566,12 @@ namespace Elwig.Windows {
                             .ToList();
 
                         if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
-                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg" + (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.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}]")))}";
                         }
                     } else if (groups.Count <= 4) {
-                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
-                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                        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 {
@@ -503,6 +579,10 @@ namespace Elwig.Windows {
                 StatusWeight.Text = "Gewicht: -";
                 StatusGradation.Text = "Gradation: -";
             }
+
+            StatusVarieties.ToolTip = StatusVarieties.Text;
+            StatusWeight.ToolTip = StatusWeight.Text;
+            StatusGradation.ToolTip = StatusGradation.Text;
         }
 
         protected override async Task OnRenewContext() {
@@ -532,7 +612,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsCreating).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => !IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await Context.WineQualityLevels.ToListAsync(), i => (i as WineQualLevel)?.QualId);
             ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
             ControlUtils.RenewItemsSource(WineOriginInput, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId);
@@ -658,10 +738,10 @@ namespace Elwig.Windows {
             if (deliveryNew || InputHasChanged(DateInput)) {
                 d.LNr = await Context.NextLNr(d.Date);
             }
-            if (IsCreating) {
+            if (IsCreating && !InputIsNotDefault(TimeInput)) {
                 d.TimeString = DateTime.Now.ToString("HH:mm:ss");
-            } else if (InputHasChanged(TimeInput)) {
-                d.TimeString = TimeInput.Text + ":00";
+            } else if (IsCreating || InputHasChanged(TimeInput)) {
+                d.TimeString = (TimeInput.Text != "") ? TimeInput.Text + ":00" : null;
             }
             d.ZwstId = (BranchInput.SelectedItem as Branch)?.ZwstId;
             d.LsNr = LsNrInput.Text;
@@ -890,7 +970,7 @@ namespace Elwig.Windows {
                 if (App.Config.Debug) {
                     doc.Show();
                 } else {
-                    doc.Print(2);
+                    await doc.Print(2);
                 }
             }
             FinishButton.Cursor = null;
@@ -1111,8 +1191,8 @@ namespace Elwig.Windows {
                 day = day.AddDays(-1);
             var lsnrs = await Context.Deliveries
                 .Where(d => d.ZwstId == delivery.ZwstId)
-                .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||
-                            (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0))
+                .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) ||
+                            (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0)))
                 .Where(d => d.LsNr != delivery.LsNr)
                 .OrderBy(d => d.LsNr)
                 .Select(d => d.LsNr)
@@ -1264,9 +1344,9 @@ namespace Elwig.Windows {
             AbgewertetInput.IsEnabled = false;
             ManualWeighingInput.IsEnabled = false;
             LsNrInput.IsReadOnly = true;
-            DateInput.IsReadOnly = true;
-            TimeInput.IsReadOnly = true;
-            BranchInput.IsEnabled = false;
+            DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
+            TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
+            BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
         }
 
         private void DisableWeighingButtons() {
@@ -1290,15 +1370,25 @@ namespace Elwig.Windows {
             if (DateInput.Text == "" || BranchInput.SelectedItem == null) {
                 LsNrInput.Text = "";
             } else {
-                var branch = (Branch)BranchInput.SelectedItem;
-                var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
-                var lnr = await Context.NextLNr(date);
-                LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
+                try {
+                    var branch = (Branch)BranchInput.SelectedItem;
+                    var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
+                    var lnr = await Context.NextLNr(date);
+                    LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
+                } catch {
+                    LsNrInput.Text = "";
+                }
             }
         }
 
         private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+            base.DateInput_TextChanged(sender, evt);
+            if (IsEditing ||  IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+        }
+
+        private void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+            base.ComboBox_SelectionChanged(sender, evt);
+            if (IsEditing || IsCreating) UpdateLsNr().GetAwaiter().GetResult();
         }
 
         private void UpdateWineVariety(bool valid) {

Elwig/Windows/MemberAdminWindow.xaml

@@ -93,9 +93,15 @@
                       SelectionChanged="MemberList_SelectionChanged"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr}"       Width="70"/>
+                    <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                     <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="4*"/>
-                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}"  Width="3*"/>
+                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}" Width="3*"/>
                 </DataGrid.Columns>
             </DataGrid>
 

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -274,22 +274,46 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
-            using var d = await Document.Merge(Context.Members
-                .Where(m => m.IsActive)
+            var n = await Context.Members.CountAsync(m => m.IsActive);
+            var res = MessageBox.Show(
+                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
+                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = await Document.Merge(Context.Members
+                .Where(m => m.IsActive && m.ContactViaPost)
                 .OrderBy(m => m.MgNr)
                 .Select(m => new Letterhead(m)));
-            await d.Generate();
-            d.Show();
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
         }
 
         private async void Menu_Print_Letterheads_Name_Click(object sender, RoutedEventArgs evt) {
-            using var d = await Document.Merge(Context.Members
-                .Where(m => m.IsActive)
+            var n = await Context.Members.CountAsync(m => m.IsActive);
+            var res = MessageBox.Show(
+                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
+                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = await Document.Merge(Context.Members
+                .Where(m => m.IsActive && m.ContactViaPost)
                 .OrderBy(m => m.FamilyName)
                 .ThenBy(m => m.GivenName)
                 .Select(m => new Letterhead(m)));
-            await d.Generate();
-            d.Show();
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {