From 9584f12fc553f7d1b676cdd4860146692d31fb78 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 18 Jul 2023 17:39:59 +0200
Subject: [PATCH] Fix delivery part selection in DeliveryAdminWindow
---
Elwig/Windows/DeliveryAdminWindow.xaml.cs | 2 +-
Elwig/Windows/TestWindow.xaml | 1 +
Elwig/Windows/TestWindow.xaml.cs | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 4ab0a9f..c6cdb53 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -173,7 +173,7 @@ namespace Elwig.Windows {
DateInput.Text = d.Date.ToString("dd.MM.yyyy");
TimeInput.Text = d.Time?.ToString("HH:mm") ?? "";
CommentInput.Text = d.Comment ?? "";
- Utils.RenewItemsSource(DeliveryPartList, d.Parts, i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId));
+ Utils.RenewItemsSource(DeliveryPartList, d.Parts, i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId, (i as DeliveryPart)?.DPNr));
if (DeliveryPartList.SelectedItem == null && DeliveryPartList.ItemsSource != null) {
DeliveryPartList.SelectedIndex = 0;
}
diff --git a/Elwig/Windows/TestWindow.xaml b/Elwig/Windows/TestWindow.xaml
index e7f7a8a..73f3a16 100644
--- a/Elwig/Windows/TestWindow.xaml
+++ b/Elwig/Windows/TestWindow.xaml
@@ -12,5 +12,6 @@
SelectedItemsOverride="{Binding SelectedItems}"
ItemSelectionChanged="OnItemSelectionChanged"/>
<TextBlock x:Name="MyText" HorizontalAlignment="Left" Margin="318,246,0,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top"/>
+ <ListBox x:Name="MyListBox" HorizontalAlignment="Left" Margin="492,125,0,0" VerticalAlignment="Top"/>
</Grid>
</Window>
diff --git a/Elwig/Windows/TestWindow.xaml.cs b/Elwig/Windows/TestWindow.xaml.cs
index baa2fde..db71df3 100644
--- a/Elwig/Windows/TestWindow.xaml.cs
+++ b/Elwig/Windows/TestWindow.xaml.cs
@@ -7,6 +7,7 @@ namespace Elwig.Windows {
public TestWindow() {
InitializeComponent();
MyComboBox.ItemsSource = new string[] { "Klasse A" , "Klasse B", "Klasse C", "Klasse D", "Klasse E", "Klasse F" };
+ MyListBox.ItemsSource = new string[] { "Test 1", "Test 2", "Test 3", "Test 4" };
}
private void OnItemSelectionChanged(object sender, ItemSelectionChangedEventArgs e) {