From 66a1185dc3c28fa338cb7f0fdfb5a65a6c1458ff Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 30 Sep 2026 15:41:47 +0200
Subject: [PATCH] MemberAdminWindow: Swap postal dest and Ort.Name

---
 Elwig/App.xaml                       | 6 ------
 Elwig/Models/Entities/AT_PlzDest.cs  | 3 +++
 Elwig/Windows/BaseDataWindow.xaml    | 2 +-
 Elwig/Windows/MemberAdminWindow.xaml | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Elwig/App.xaml b/Elwig/App.xaml
index 844561d..b19f63f 100644
--- a/Elwig/App.xaml
+++ b/Elwig/App.xaml
@@ -7,12 +7,6 @@
         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
         <ctrl:WidthToMarginConverter x:Key="WidthToMarginConverter"/>
 
-        <DataTemplate x:Key="PostalDestTemplate">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Dest}"/>
-                <TextBlock Text="{Binding Ort.Name, StringFormat='{} ({0})'}"/>
-            </StackPanel>
-        </DataTemplate>
         <DataTemplate x:Key="KgNrTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
diff --git a/Elwig/Models/Entities/AT_PlzDest.cs b/Elwig/Models/Entities/AT_PlzDest.cs
index 00bf8e6..fa1cd08 100644
--- a/Elwig/Models/Entities/AT_PlzDest.cs
+++ b/Elwig/Models/Entities/AT_PlzDest.cs
@@ -20,6 +20,9 @@ namespace Elwig.Models.Entities {
         [Column("dest")]
         public string Dest { get; private set; } = null!;
 
+        [NotMapped]
+        public string FullDest => $"{Ort.Name} ({Dest})";
+
         [ForeignKey("Plz")]
         public virtual AT_Plz AtPlz { get; private set; } = null!;
 
diff --git a/Elwig/Windows/BaseDataWindow.xaml b/Elwig/Windows/BaseDataWindow.xaml
index 3d3cdd3..d0ca642 100644
--- a/Elwig/Windows/BaseDataWindow.xaml
+++ b/Elwig/Windows/BaseDataWindow.xaml
@@ -195,7 +195,7 @@
                         <Label Content="PLZ/Ort:" Margin="10,70,0,10"/>
                         <TextBox x:Name="BranchPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
                                  TextChanged="BranchPlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
-                        <ComboBox x:Name="BranchOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                        <ComboBox x:Name="BranchOrtInput" DisplayMemberPath="FullDest" TextSearch.TextPath="Ort.Name"
                                   Margin="47,70,10,0" Grid.Column="1" Grid.ColumnSpan="3" Width="253" HorizontalAlignment="Left"
                                   SelectionChanged="Branch_Changed"/>
 
diff --git a/Elwig/Windows/MemberAdminWindow.xaml b/Elwig/Windows/MemberAdminWindow.xaml
index 19495ef..3114da3 100644
--- a/Elwig/Windows/MemberAdminWindow.xaml
+++ b/Elwig/Windows/MemberAdminWindow.xaml
@@ -378,7 +378,7 @@
                              Width="42" Grid.Column="1" HorizontalAlignment="Left"
                              TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
                     <ComboBox x:Name="OrtInput" SelectedItem="{Binding Ort, Mode=TwoWay}" ItemsSource="{Binding OrtSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              DisplayMemberPath="FullDest" TextSearch.TextPath="Ort.Name"
                               SelectionChanged="OrtInput_SelectionChanged"
                               Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
                 </Grid>
@@ -611,7 +611,7 @@
                              Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
                              TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
                     <ComboBox x:Name="BillingOrtInput" SelectedItem="{Binding BillingOrt, Mode=TwoWay}" ItemsSource="{Binding BillingOrtSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              DisplayMemberPath="FullDest" TextSearch.TextPath="Ort.Name"
                               SelectionChanged="OrtInput_SelectionChanged"
                               Margin="47,70,10,0" Grid.Column="1"/>
                 </Grid>