From 52702f3fa2908d5a0e11b1d84b28454eaf4c8e29 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Thu, 28 Sep 2023 21:28:31 +0200
Subject: [PATCH] DeliveryAdminWindow: Add GridSplitter
---
Elwig/Windows/DeliveryAdminWindow.xaml | 442 +++++++++++++------------
1 file changed, 227 insertions(+), 215 deletions(-)
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index d1d5939..d7896af 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/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">
@@ -77,7 +74,7 @@
</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="*"/>
@@ -182,237 +179,252 @@
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"/>
+
+ <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>
- <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>