diff --git a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml index a1d6246..d0b9e7f 100644 --- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml @@ -8,7 +8,7 @@ xmlns:local="clr-namespace:Elwig.Windows" xmlns:vm="clr-namespace:Elwig.ViewModels" xmlns:ctrl="clr-namespace:Elwig.Controls" - Title="Traubenanmeldungen - Elwig" Height="700" Width="940" MinWidth="600" MinHeight="400" + Title="Traubenanmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400" Loaded="Window_Loaded"> <Window.DataContext> <vm:DeliveryAncmtAdminViewModel/> @@ -148,6 +148,13 @@ SelectionChanged="DeliveryAncmtList_SelectionChanged" Margin="5,5,5,0" Grid.Row="3" FontSize="14" Grid.ColumnSpan="3"> <DataGrid.Columns> + <DataGridTextColumn Header="Datum" Binding="{Binding Schedule.Date, StringFormat='{}{0:dd.MM.yy}'}" Width="60"> + <DataGridTextColumn.CellStyle> + <Style> + <Setter Property="TextBlock.TextAlignment" Value="Center"/> + </Style> + </DataGridTextColumn.CellStyle> + </DataGridTextColumn> <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50"> <DataGridTextColumn.CellStyle> <Style> @@ -155,7 +162,7 @@ </Style> </DataGridTextColumn.CellStyle> </DataGridTextColumn> - <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/> + <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="160"/> <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50"> <DataGridTextColumn.CellStyle> <Style> diff --git a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs index d25ae69..6fcd77c 100644 --- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs @@ -110,6 +110,7 @@ namespace Elwig.Windows { var dict = deliveryAncmts.AsParallel() .ToDictionary(a => a, a => a.SearchScore(filter)) .OrderByDescending(a => a.Value) + .ThenBy(a => a.Key.Schedule.DateString) .ThenBy(a => a.Key.Member.Name) .ThenBy(a => a.Key.Member.GivenName) .ThenBy(a => a.Key.Member.MgNr); @@ -120,7 +121,8 @@ namespace Elwig.Windows { .ToList(); } else { deliveryAncmts = deliveryAncmts - .OrderBy(a => a.Member.Name) + .OrderBy(a => a.Schedule.DateString) + .ThenBy(a => a.Member.Name) .ThenBy(a => a.Member.GivenName) .ThenBy(a => a.Member.MgNr) .ToList();