Merge pull request #35 from #6-datagrid-initial-sorting

Added working default sorts to all datagrids
opensky-to · Nov 25, 2021 · 63bdf35 · 63bdf35
2 parents cc2e4b6 + 29db209
commit 63bdf35
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 16 deletions.
diff --git a/OpenSky.Client/Pages/AircraftMarket.xaml b/OpenSky.Client/Pages/AircraftMarket.xaml
@@ -20,10 +20,11 @@
                       xmlns:ui="http://schemas.modernwpf.com/2019"
                       xmlns:openSkyApi="clr-namespace:OpenSkyApi"
                       xmlns:tools="clr-namespace:OpenSky.Client.Tools"
+                      xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                       mc:Ignorable="d"
                       LoadingText="{Binding LoadingText}"
                       VerticalScrollBar="False" HorizontalScrollBar="False"
-                      d:DesignHeight="700" d:DesignWidth="800">
+                      d:DesignHeight="700" d:DesignWidth="1500">
     <UserControl.DataContext>
         <models:AircraftMarketViewModel />
     </UserControl.DataContext>
@@ -45,6 +46,11 @@
                 </DrawingGroup>
             </DrawingBrush.Drawing>
         </DrawingBrush>
+        <CollectionViewSource Source="{Binding Aircraft}" x:Key="AircraftViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="PurchasePrice" Direction="Ascending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
     </UserControl.Resources>
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding SearchCommand}" />
@@ -174,7 +180,7 @@
                 <FrameworkElement Grid.Row="1" x:Name="LocationVisibilityProxy" Visibility="{Binding LocationColumnVisibility}" />
                 <DataGrid
                     Grid.Row="1"
-                    ItemsSource="{Binding Aircraft}"
+                    ItemsSource="{Binding Source={StaticResource AircraftViewSource}}"
                     SelectedItem="{Binding SelectedAircraft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                     HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
@@ -202,7 +208,7 @@
                         <DataGridTextColumn Header="Location" Binding="{Binding AirportICAO}" Visibility="{Binding Source={x:Reference LocationVisibilityProxy}, Path=Visibility}" FontFamily="Consolas" FontSize="16" />
                         <DataGridTemplateColumn Header="Type" CellTemplate="{StaticResource AircraftTypeCellTemplate}" SortMemberPath="Type.Name" CanUserSort="True" />
                         <DataGridTemplateColumn Header="Fuel" CellTemplate="{StaticResource FuelCellTemplate}" SortMemberPath="Fuel" CanUserSort="True" />
-                        <DataGridTemplateColumn Header="Purchase Price" CellTemplate="{StaticResource PurchasePriceCellTemplate}" SortMemberPath="PurchasePrice" CanUserSort="True" />
+                        <DataGridTemplateColumn Header="Purchase Price" CellTemplate="{StaticResource PurchasePriceCellTemplate}" SortMemberPath="PurchasePrice" CanUserSort="True" SortDirection="Ascending" />
                         <DataGridTemplateColumn Header="Rental Price" CellTemplate="{StaticResource RentPriceCellTemplate}" SortMemberPath="RentPrice" CanUserSort="True" />
                         <DataGridTextColumn Header="Owner" Binding="{Binding OwnerName}" />
                     </DataGrid.Columns>

diff --git a/OpenSky.Client/Pages/DataImport.xaml b/OpenSky.Client/Pages/DataImport.xaml
@@ -19,6 +19,7 @@
                  xmlns:ui="http://schemas.modernwpf.com/2019"
                  xmlns:dgx="urn:tom-englert.de/DataGridExtensions"
                  xmlns:converters="clr-namespace:OpenSky.Client.Converters"
+                 xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                  mc:Ignorable="d" 
                  LoadingText="{Binding LoadingText}" HorizontalScrollBar="False" VerticalScrollBar="False"
                  d:DesignHeight="450" d:DesignWidth="800">
@@ -27,6 +28,11 @@
     </UserControl.DataContext>
     <UserControl.Resources>
         <converters:UtcTimeStampConverter x:Key="UtcTimeStampConverter" />
+        <CollectionViewSource Source="{Binding DataImports}" x:Key="DataImportsViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="Started" Direction="Descending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
     </UserControl.Resources>
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshDataImportsCommand}" />
@@ -57,7 +63,7 @@
                 <DataGrid 
                     x:Name="DataImportsGrid"
                     Grid.Row="1"
-                    ItemsSource="{Binding DataImports}"
+                    ItemsSource="{Binding Source={StaticResource DataImportsViewSource}}"
                     SelectedItem="{Binding SelectedImport, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                     HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"

diff --git a/OpenSky.Client/Pages/FlightLogs.xaml b/OpenSky.Client/Pages/FlightLogs.xaml
@@ -18,6 +18,7 @@
                       xmlns:models="clr-namespace:OpenSky.Client.Pages.Models"
                       xmlns:ui="http://schemas.modernwpf.com/2019"
                       xmlns:converters="clr-namespace:OpenSky.Client.Converters"
+                      xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                       LoadingText="{Binding LoadingText}"
                       HorizontalScrollBar="False" Loaded="FlightLogsOnLoaded"
                       mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
@@ -27,6 +28,13 @@
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshFlightLogsCommand}" />
     </UserControl.InputBindings>
+    <UserControl.Resources>
+        <CollectionViewSource Source="{Binding FlightLogs}" x:Key="FlightLogsViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="PlannedDepartureTime.UtcDateTime" Direction="Descending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+    </UserControl.Resources>
     <GroupBox>
         <GroupBox.Header>
             <TextBlock FontSize="15" FontWeight="DemiBold">Flight Logs</TextBlock>
@@ -48,7 +56,7 @@
             </ui:CommandBar>
             <DataGrid
                 Grid.Row="1"
-                ItemsSource="{Binding FlightLogs}"
+                ItemsSource="{Binding Source={StaticResource FlightLogsViewSource}}"
                 SelectedItem="{Binding SelectedFlightLog, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                 AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                 HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
@@ -60,7 +68,7 @@
                     <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding OpenLogCommand}" />
                 </DataGrid.InputBindings>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" />
+                    <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" SortDirection="Descending" />
                     <DataGridTextColumn Header="Flight#" Binding="{Binding FullFlightNumber}" />
                     <DataGridTextColumn Header="Origin" Binding="{Binding OriginICAO}" FontFamily="Consolas" FontSize="16" />
                     <DataGridTextColumn Header="Destination" Binding="{Binding DestinationICAO}" FontFamily="Consolas" FontSize="16" />

diff --git a/OpenSky.Client/Pages/FlightPlans.xaml b/OpenSky.Client/Pages/FlightPlans.xaml
@@ -17,6 +17,7 @@
                           xmlns:controls="clr-namespace:OpenSky.Client.Controls"
                           xmlns:ui="http://schemas.modernwpf.com/2019"
                           xmlns:models="clr-namespace:OpenSky.Client.Pages.Models"
+                          xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                           LoadingText="{Binding LoadingText}"
                           HorizontalScrollBar="False"
                           Loaded="FlightPlansOnLoaded"
@@ -28,6 +29,13 @@
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshPlansCommand}" />
     </UserControl.InputBindings>
+    <UserControl.Resources>
+        <CollectionViewSource Source="{Binding Plans}" x:Key="PlansViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="PlannedDepartureTime.UtcDateTime" Direction="Descending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+    </UserControl.Resources>
     <Grid>
          <GroupBox>
              <GroupBox.Header>
@@ -53,7 +61,7 @@
                  </ui:CommandBar>
                 <DataGrid
                     Grid.Row="1"
-                    ItemsSource="{Binding Plans}"
+                    ItemsSource="{Binding Source={StaticResource PlansViewSource}}"
                     SelectedItem="{Binding SelectedFlightPlan, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                     HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
@@ -62,7 +70,7 @@
                         <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditPlanCommand}" />
                     </DataGrid.InputBindings>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" />
+                        <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" SortDirection="Descending" />
                         <DataGridTextColumn Header="Flight#" Binding="{Binding FullFlightNumber}" />
                         <DataGridTextColumn Header="Origin" Binding="{Binding OriginICAO}" FontFamily="Consolas" FontSize="16" />
                         <DataGridTextColumn Header="Destination" Binding="{Binding DestinationICAO}" FontFamily="Consolas" FontSize="16" />

diff --git a/OpenSky.Client/Pages/MyFleet.xaml b/OpenSky.Client/Pages/MyFleet.xaml
@@ -20,6 +20,7 @@
                       xmlns:models="clr-namespace:OpenSky.Client.Pages.Models"
                       xmlns:tools="clr-namespace:OpenSky.Client.Tools"
                       xmlns:converters="clr-namespace:OpenSky.Client.Converters"
+                      xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                       mc:Ignorable="d" 
                       HorizontalScrollBar="False"
                       LoadingText="{Binding LoadingText}"
@@ -33,6 +34,11 @@
     </UserControl.InputBindings>
     <UserControl.Resources>
         <converters:VisibilityInverterConverter x:Key="VisibilityInverterConverter" />
+        <CollectionViewSource Source="{Binding Aircraft}" x:Key="AircraftViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="Registry" Direction="Ascending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -61,7 +67,7 @@
                 </ui:CommandBar>
                 <DataGrid
                     Grid.Row="1"
-                    ItemsSource="{Binding Aircraft}"
+                    ItemsSource="{Binding Source={StaticResource AircraftViewSource}}"
                     SelectedItem="{Binding SelectedAircraft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                     AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                     HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
@@ -79,7 +85,7 @@
                         </DataTemplate>
                     </DataGrid.Resources>
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="Registry" Binding="{Binding Registry}" FontFamily="Consolas" FontSize="16" />
+                        <DataGridTextColumn Header="Registry" Binding="{Binding Registry}" FontFamily="Consolas" FontSize="16" SortDirection="Ascending" />
                         <DataGridTextColumn Header="Name" Binding="{Binding Name}" />
                         <DataGridTextColumn Header="Location" Binding="{Binding AirportICAO}" FontFamily="Consolas" FontSize="16" />
                         <DataGridTextColumn Header="Type" Binding="{Binding Type.Name}" />

diff --git a/OpenSky.Client/Pages/MyFlights.xaml b/OpenSky.Client/Pages/MyFlights.xaml
@@ -18,6 +18,7 @@
                       xmlns:ui="http://schemas.modernwpf.com/2019"
                       xmlns:models="clr-namespace:OpenSky.Client.Pages.Models"
                       xmlns:openSkyApi="clr-namespace:OpenSkyApi"
+                      xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
                       LoadingText="{Binding LoadingText}"
                       HorizontalScrollBar="False" Loaded="MyFlightsOnLoaded"
                       mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
@@ -27,6 +28,13 @@
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshFlightsCommand}" />
     </UserControl.InputBindings>
+    <UserControl.Resources>
+        <CollectionViewSource Source="{Binding Flights}" x:Key="FlightsViewSource">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="PlannedDepartureTime.UtcDateTime" Direction="Descending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+    </UserControl.Resources>
     <GroupBox>
         <GroupBox.Header>
             <TextBlock FontSize="15" FontWeight="DemiBold">Manage Flights</TextBlock>
@@ -49,7 +57,7 @@
             </ui:CommandBar>
             <DataGrid
                 Grid.Row="1"
-                ItemsSource="{Binding Flights}"
+                ItemsSource="{Binding Source={StaticResource FlightsViewSource}}"
                 SelectedItem="{Binding SelectedFlight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                 AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                 HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
@@ -69,7 +77,7 @@
                     <DataGridTemplateColumn Header="" CellTemplate="{StaticResource FlightPausedCellTemplate}" Width="20" MinWidth="20" />
                     <DataGridTemplateColumn Header="" CellTemplate="{StaticResource FlightPositionCellTemplate}" Width="20" MinWidth="20" />
                     <DataGridTemplateColumn Header="" CellTemplate="{StaticResource FlightSavedCellTemplate}" Width="20" MinWidth="20" />
-                    <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" />
+                    <DataGridTextColumn Header="Planned departure" Binding="{Binding PlannedDepartureTime.UtcDateTime, StringFormat=dd/MM/yyyy HH:mmZ}" SortDirection="Descending" />
                     <DataGridTextColumn Header="Flight#" Binding="{Binding FullFlightNumber}" />
                     <DataGridTextColumn Header="Phase" Binding="{Binding FlightPhase}" />
                     <DataGridTextColumn Header="Origin" Binding="{Binding Origin.Icao}" FontFamily="Consolas" FontSize="16" />

diff --git a/OpenSky.Client/Pages/WorldPopulation.xaml b/OpenSky.Client/Pages/WorldPopulation.xaml
@@ -7,11 +7,24 @@
              xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
              xmlns:models="clr-namespace:OpenSky.Client.Pages.Models"
              xmlns:ui="http://schemas.modernwpf.com/2019"
+             xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              mc:Ignorable="d" 
              d:DesignHeight="1500" d:DesignWidth="1500" HorizontalScrollBar="True" LoadingText="{Binding LoadingText}">
     <UserControl.DataContext>
         <models:WorldPopulationViewModel />
     </UserControl.DataContext>
+    <UserControl.Resources>
+        <CollectionViewSource x:Key="FailedAirportsViewSource" Source="{Binding FailedAirports}">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="Icao" Direction="Ascending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+        <CollectionViewSource x:Key="UnprocessedAirportsViewSource" Source="{Binding UnprocessedAirports}">
+            <CollectionViewSource.SortDescriptions>
+                <componentModel:SortDescription PropertyName="Icao" Direction="Ascending" />
+            </CollectionViewSource.SortDescriptions>
+        </CollectionViewSource>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -250,13 +263,13 @@
                 </GroupBox.Header>
                 <DataGrid 
                         x:Name="FailedGrid" Margin="5"
-                        ItemsSource="{Binding FailedAirports}"
+                        ItemsSource="{Binding Source={StaticResource FailedAirportsViewSource}}"
                         SelectedItem="{Binding SelectedFailedAirport, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
                         ColumnHeaderStyle="{StaticResource FilteredDataGridColumnHeaderStyle}" CellStyle="{StaticResource FullRowSelectDataGridCellStyle}">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="ICAO" Binding="{Binding Icao}" />
+                        <DataGridTextColumn Header="ICAO" Binding="{Binding Icao}" SortDirection="Ascending" />
                         <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*" />
                         <DataGridTextColumn Header="Size" Binding="{Binding Size}" />
                         <DataGridTextColumn Header="GA ramps" Binding="{Binding GaRamps}" />
@@ -273,12 +286,12 @@
                 <StackPanel Orientation="Vertical">
                     <DataGrid 
                         x:Name="UnprocessedGrid" Margin="5"
-                        ItemsSource="{Binding UnprocessedAirports}"
+                        ItemsSource="{Binding Source={StaticResource UnprocessedAirportsViewSource}}"
                         AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow"
                         HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" MinColumnWidth="120" HeadersVisibility="Column"
                         ColumnHeaderStyle="{StaticResource FilteredDataGridColumnHeaderStyle}" CellStyle="{StaticResource FullRowSelectDataGridCellStyle}">
                         <DataGrid.Columns>
-                            <DataGridTextColumn Header="ICAO" Binding="{Binding Icao}" />
+                            <DataGridTextColumn Header="ICAO" Binding="{Binding Icao}" SortDirection="Ascending" />
                             <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*" />
                             <DataGridTextColumn Header="Size" Binding="{Binding Size}" />
                             <DataGridTextColumn Header="GA ramps" Binding="{Binding GaRamps}" />