Bump version to 0.3.7

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.3.5</Version>
+    <Version>0.3.7</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 

Elwig/Models/DeliveryPart.cs

@@ -99,6 +99,9 @@ namespace Elwig.Models {
         [NotMapped]
         public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
 
+        [NotMapped]
+        public string AttributesString => string.Join("/", Attributes);
+
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -92,7 +92,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, ...&#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;)"/>
+                     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"/>
@@ -150,6 +150,7 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -401,7 +402,8 @@
                                     <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"/>
+                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding AttributesString}" Width="100"/>
                                 </StackPanel>
                             </DataTemplate>
                         </ListBox.ItemTemplate>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -294,6 +294,7 @@ namespace Elwig.Windows {
                 .ThenBy(p => p.DPNr);
 
             var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
             var filterQual = new List<string>();
             var filterMgNr = new List<int>();
             var filterZwst = new List<string>();
@@ -319,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--);
@@ -455,6 +460,7 @@ namespace Elwig.Windows {
                     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)

Elwig/Windows/MemberAdminWindow.xaml

@@ -4,7 +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"
-        Title="Mitglieder - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
+        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -36,16 +36,13 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="1*"/>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="24"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="1.3*"/>
-            <RowDefinition Height="0.8*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="370"/>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2.5*" MinWidth="800"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -71,7 +68,7 @@
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="5" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="39"/>
                 <RowDefinition Height="*"/>
@@ -93,15 +90,23 @@
                       SelectionChanged="MemberList_SelectionChanged"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
+                    <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="Nachname" Binding="{Binding FamilyName}" Width="140"/>
-                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}" Width="3*"/>
+                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Rechnungsadresse" Binding="{Binding BillingAddress.Name}" Width="200"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -126,256 +131,307 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Persönliche Daten" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="3*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+        <Grid Grid.Column="2" Grid.Row="1">
-                <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+            <Grid.RowDefinitions>
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1.3*"/>
+                <RowDefinition Height="0.8*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
+            <GroupBox Header="Persönliche Daten" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" Margin="5,5,5,5">
-                <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                <Grid>
-                         TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
+                    <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
 
-                <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
+                    <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
 
-                <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
+                    <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
+                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                    <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
-                         TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
-                <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
+                    <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
+                    <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
-                          Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,130,0,0"/>
+                    <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-                <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
+                    <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
-                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
-                <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                              Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
-                <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*" MinWidth="180"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Adresse:" Margin="10,130,0,0"/>
-                <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Kontaktdaten" Grid.Column="0" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="135"/>
+                        <ColumnDefinition Width="*" MinWidth="180"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
+                    <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
+                    <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="5" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
-                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
-                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-            </Grid>
+                    <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
-        </GroupBox>
+                             TextChanged="TextBox_TextChanged"/>
-        <GroupBox Header="Betrieb" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
+                </Grid>
-            <Grid>
+            </GroupBox>
-                <Grid.ColumnDefinitions>
+            <GroupBox Header="Bankverbindung" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
-                    <ColumnDefinition Width="90"/>
+                <Grid>
-                    <ColumnDefinition Width="150"/>
+                    <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
+                        <ColumnDefinition Width="65"/>
-                </Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
-                         TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+                             TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
-                <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
+                             TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Betrieb" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
-                <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                         TextChanged="TextBox_TextChanged"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,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">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                    <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                             TextChanged="TextBox_TextChanged"/>
-                <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,70,10,0" Grid.Column="1"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,70,10,0" Grid.Column="1"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Genossenschaft" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="IntegerInput_TextChanged"/>
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
+                    <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
+                    <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
-                <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
-                <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
+                    <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
-                <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                         TextChanged="TextBox_TextChanged"/>
+                              Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
-                <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
+                    <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
-                          HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-                <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/>
+                    <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
-                <TextBlock x:Name="AreaCommitment" Text="- m²"
+                    <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                           Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
+                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
-                        HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
-                <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                        HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-            </Grid>
+                    <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-        </GroupBox>
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+                    <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                </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="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusMembers" Text="Mitglieder: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusBusinessShares" Text="Geschäftsanteile: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusAreaCommitment" Text="Gebundene Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock Name="StatusDeliveriesLastSeason" Text="Lieferungen (letzte Saison): -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8">
+                <TextBlock Name="StatusDeliveriesThisSeason" Text="Lieferungen (aktuelle Saison): -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -140,6 +140,8 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(DefaultKgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
             await RefreshMemberList();
+            StatusMembers.Text = $"Mitglieder: {await Context.Members.CountAsync(m => m.IsActive):N0} ({await Context.Members.CountAsync():N0})";
+            StatusBusinessShares.Text = $"Geschäftsanteile: {await Context.Members.SumAsync(m => m.BusinessShares):N0}";
         }
 
         private void SetPhoneNrInput(int nr, string? type, string? number, string? comment) {
@@ -592,7 +594,11 @@ namespace Elwig.Windows {
             ContactPostalInput.IsChecked = m.ContactViaPost;
             ContactEmailInput.IsChecked = m.ContactViaEmail;
 
-            AreaCommitment.Text = $"{m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
+            var d1 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
+            var d2 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): {d2.Count():N0} ({d2.Sum(d => d.Parts.Count):N0}), {d2.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): {d1.Count():N0} ({d1.Sum(d => d.Parts.Count):N0}), {d1.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
 
             Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
 
@@ -601,7 +607,9 @@ namespace Elwig.Windows {
 
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
-            AreaCommitment.Text = "- m²";
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
+            StatusAreaCommitment.Text = "Gebundene Fläche: -";
             Age.Text = "-";
             base.ClearInputs(validate);
         }