From 27abf559e8cee4dfff0eb5d870dbeb52e85a0803 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 24 May 2023 22:30:16 +0200
Subject: [PATCH] Improved DeliveryAdminWindow

---
 Elwig/Windows/DeliveryAdminWindow.xaml    | 18 +++++++++---------
 Elwig/Windows/DeliveryAdminWindow.xaml.cs |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml
index ecc767a..a6cc01d 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -96,18 +96,18 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LsNrInput" Width="125" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
-                         IsEnabled="False"/>
+                <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+                         IsReadOnly="True"/>
 
                 <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="DateInput" Width="76" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
-                         IsEnabled="False"
+                <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
+                         IsReadOnly="True"
                          TextChanged="DateInput_TextChanged"/>
-                <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="81,40,0,0"
-                         IsEnabled="False"/>
+                <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
+                         IsReadOnly="True"/>
 
                 <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" Width="125" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
+                <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
                           DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
             </Grid>
         </GroupBox>
@@ -148,7 +148,7 @@
                     <Label Content="°Oe" Margin="0,2,3,0" HorizontalAlignment="Right"/>
                 </Grid>
                 <Label Content="=" Margin="62,10,10,10" Grid.Column="1"/>
-                <Grid Grid.Column="1" Width="72" Height="25" Margin="80,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+                <Grid Grid.Column="1" Width="73" Height="25" Margin="80,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
                     <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,39,2" SnapsToDevicePixels="True"
                              IsReadOnly="False" IsEnabled="True"
                              TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus"/>
@@ -156,7 +156,7 @@
                 </Grid>
 
                 <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
-                <ComboBox x:Name="WineQualityLevelInput" IsEnabled="True" Width="152" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
+                <ComboBox x:Name="WineQualityLevelInput" IsEnabled="True" Width="153" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
                           ItemTemplate="{StaticResource WineQualityLevelTemplate}"
                           SelectionChanged="WineQualityLevelInput_SelectionChanged"/>
             </Grid>
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index ee34b3d..e6422fb 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -26,6 +26,7 @@ namespace Elwig.Windows {
             };
             ExemptInputs = new Control[] {
                 MgNrInput, MemberInput,
+                LsNrInput, DateInput, TimeInput, BranchInput,
                 MemberAddressField
             };
 
@@ -38,7 +39,7 @@ namespace Elwig.Windows {
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
             MemberInput.ItemsSource = Context.Members.OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToList();
             BranchInput.ItemsSource = Context.Branches.OrderBy(b => b.Name).ToList();
-            BranchInput.SelectedItem = BranchInput.ItemsSource.Cast<Branch>().Where(b => b.ZwstId == App.ZwstId).First();
+            BranchInput.SelectedItem = BranchInput.ItemsSource.Cast<Branch>().First(b => b.ZwstId == App.ZwstId);
             WineVarietyInput.ItemsSource = Context.WineVarieties.OrderBy(v => v.Name).ToList();
             AttributesInput.ItemsSource = Context.WineAttributes.OrderBy(a => a.Name).ToList();
             WineQualityLevelInput.ItemsSource = Context.WineQualityLevels.ToList();