Merge pull request #147 from SSchulze1989/develop

v 0.11.9
SSchulze1989 · Mar 3, 2024 · fe3ab8d · fe3ab8d
2 parents b4b3018 + 49d5ae2
commit fe3ab8d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 10 deletions.
diff --git a/src/iRLeagueManager.Web/Components/Settings/ChampionshipSettings.razor b/src/iRLeagueManager.Web/Components/Settings/ChampionshipSettings.razor
@@ -25,7 +25,7 @@
                                     @bind-Value="maxResultsPerTeam"
                                     ToStringFunc="@(value => (value <= 0) ? "All" : value.ToString())"
                                     Placeholder="All"
-                                    Clearable="true"/>
+                                    Clearable="true" />
             }
         </SettingsTopSection>
 
@@ -68,7 +68,10 @@
                                     T="IList<SortOptions>"
                                     TDialog="SortOptionsDialog"
                                     @bind-Value="standingConfig.SortOptions"
-                                    Text="@GetSortingHelperText(standingConfig.SortOptions)" />
+                                    Text="@GetSortingHelperText(standingConfig.SortOptions)"
+                                    Parameters="@(new() {
+                                      { x => x.AvailableOptions, standingSortOptions },
+                                    })" />
                 @if (ChampSeason.ResultConfigViewModels.Any(x => x.Scorings.Count > 1))
                 {
                     var switchHeatsAsSingleHelperText = standingConfig.UseCombinedResult
@@ -112,6 +115,22 @@
 
     private bool multiplePointconfigs = false;
 
+    private static IEnumerable<SortOptions> standingSortOptions = [
+        SortOptions.TotalPtsDesc,
+    SortOptions.WinsDesc,
+    SortOptions.PenPtsAsc,
+    SortOptions.Top3Desc,
+    SortOptions.Top5Desc,
+    SortOptions.Top10Desc,
+    SortOptions.IncsAsc,
+    SortOptions.LeadLapsDesc,
+    SortOptions.LastRaceOrderDesc,
+    SortOptions.RacesDesc,
+    SortOptions.RacesCountedDesc,
+    SortOptions.RacesInPointsDesc,
+    SortOptions.RacesScoredDesc,
+    ];
+
     private int maxResultsPerTeam
     {
         get => ChampSeason.ResultConfigViewModels.FirstOrDefault()?.ResultsPerTeam ?? 0;
@@ -172,10 +191,10 @@
     private async Task AddPointConfigurationClick()
     {
         var pointConfig = new ResultConfigModel()
-        {
-            ResultsPerTeam = maxResultsPerTeam,
-            ChampionshipName = ChampSeason.ChampionshipName,
-        };
+            {
+                ResultsPerTeam = maxResultsPerTeam,
+                ChampionshipName = ChampSeason.ChampionshipName,
+            };
         var parameters = new DialogParameters<DisplayNameDialog>()
         {
             { x => x.Value, (pointConfig.Name, pointConfig.DisplayName)},

diff --git a/src/iRLeagueManager.Web/Components/Settings/Dialogs/FilterConditionDialog.razor b/src/iRLeagueManager.Web/Components/Settings/Dialogs/FilterConditionDialog.razor
@@ -125,6 +125,7 @@
     public static string[] DefaultColumnNames { get; } = new[]
     {
         nameof(ResultRowModel.Car),
+        nameof(ResultRowModel.CarId),
         nameof(ResultRowModel.CarClass),
         nameof(ResultRowModel.ClassId),
         nameof(ResultRowModel.CompletedLaps),

diff --git a/src/iRLeagueManager.Web/Components/Settings/Dialogs/SortOptionsDialog.razor b/src/iRLeagueManager.Web/Components/Settings/Dialogs/SortOptionsDialog.razor
@@ -22,7 +22,7 @@
                            ToStringFunc="@((SortOptions option) => option.GetText().Capitalize())"
                            Variant="Variant.Outlined"
                            AnchorOrigin="Origin.BottomCenter">
-                    @foreach (var availableOption in availableOptions)
+                    @foreach (var availableOption in AvailableOptions)
                     {
                         <MudSelectItem Value="availableOption" />
                     }
@@ -35,7 +35,7 @@
                        Variant="Variant.Outlined"
                        AnchorOrigin="Origin.BottomCenter"
                        Class="mt-4">
-                @foreach (var availableOption in availableOptions.Cast<SortOptions?>())
+                @foreach (var availableOption in AvailableOptions.Cast<SortOptions?>())
                 {
                     <MudSelectItem Value="availableOption" />
                 }
@@ -53,7 +53,23 @@
     private SortOptions? newSelectionValue = null;
 
     private IList<SortOptions> options => Value;
-    private IEnumerable<SortOptions> availableOptions = Enum.GetValues<SortOptions>();
+    [Parameter] public IEnumerable<SortOptions> AvailableOptions { get; set; } = [
+        SortOptions.PosAsc,
+        SortOptions.FinPosAsc,
+        SortOptions.TotalPtsDesc,
+        SortOptions.TotalPtsWoBonusDesc,
+        SortOptions.TotalPtsWoPenaltyDesc,
+        SortOptions.StartPosAsc,
+        SortOptions.RacePtsDesc,
+        SortOptions.PenPtsAsc,
+        SortOptions.BonusPtsDesc,
+        SortOptions.IntvlDesc,
+        SortOptions.ComplLapsDesc,
+        SortOptions.LeadLapsDesc,
+        SortOptions.IncsAsc,
+        SortOptions.FastLapAsc,
+        SortOptions.QualLapAsc,
+    ];
 
     private void MoveUp(int index)
     {

diff --git a/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj b/src/iRLeagueManager.Web/iRLeagueManager.Web.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-	<Version>0.11.8</Version>
+	<Version>0.11.9</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3</UserSecretsId>