Merge pull request #145 from SSchulze1989/develop

v 0.11.8
SSchulze1989 · Feb 29, 2024 · b4b3018 · b4b3018
2 parents 5039ce8 + dde90f8
commit b4b3018
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/src/iRLeagueManager.Web/Components/Dialogs/SelectPromptDialog.razor b/src/iRLeagueManager.Web/Components/Dialogs/SelectPromptDialog.razor
@@ -7,9 +7,11 @@
         <MudSelect @bind-Value="Value"
                    Label="@Label"
                    HelperText="@HelperText"
+                   Placeholder="@Placeholder"
                    Variant="Variant"
                    AnchorOrigin="Origin.BottomCenter"
-                   ToStringFunc="ToStringFunc">
+                   ToStringFunc="ToStringFunc"
+                   Clearable="Clearable">
             @if (ItemTemplate is not null)
             {
                 @foreach (var item in Items)
@@ -39,6 +41,8 @@
     [Parameter] public IEnumerable<T> Items { get; set; } = Array.Empty<T>();
     [Parameter] public Func<T, string> ToStringFunc { get; set; } = x => x?.ToString() ?? string.Empty;
     [Parameter] public RenderFragment<T>? ItemTemplate { get; set; }
+    [Parameter] public bool Clearable { get; set; } = false;
+    [Parameter] public string Placeholder { get; set; } = string.Empty;
 
     protected override void OnParametersSet()
     {

diff --git a/src/iRLeagueManager.Web/Components/Settings/ResultConfigSettings.razor b/src/iRLeagueManager.Web/Components/Settings/ResultConfigSettings.razor
@@ -24,13 +24,15 @@
             }
         }
         @{
-            var sourceHelperText = Config.SourceResultConfig != null ? $"Reuse results calculated in {Config.SourceResultConfig.ChampionshipName} - {Config.SourceResultConfig.Name}" : "Use uploaded result data";
+            var sourceHelperText = Config.SourceResultConfig != null ? $"Use points and final order calculated in {Config.SourceResultConfig.ChampionshipName} - {Config.SourceResultConfig.Name}" : "Use uploaded result data";
         }
         <SettingsSelectPrompt Label="Source"
                               HelperText="@sourceHelperText"
                               @bind-Value="Config.SourceResultConfig"
                               Items="Config.AvailableResultConfigs"
-                              ToStringFunc="@(config => config != null ? $"{config.ChampionshipName} - {config.Name}" : "Raw Result")">
+                              Placeholder="Raw Results"
+                              ToStringFunc="@(config => config != null ? $"{config.ChampionshipName} - {config.Name}" : null)"
+                              Clearable="true">
             <ItemTemplate Context="sourceConfig">
                 @sourceConfig?.ChampionshipName - @sourceConfig?.Name
             </ItemTemplate>

diff --git a/src/iRLeagueManager.Web/Components/Settings/SettingsSelectPrompt.razor b/src/iRLeagueManager.Web/Components/Settings/SettingsSelectPrompt.razor
@@ -23,8 +23,10 @@
     [Parameter] public Func<T, string> ToStringFunc { get; set; } = value => value?.ToString() ?? string.Empty;
     [Parameter] public IEnumerable<T> Items { get; set; } = Array.Empty<T>();
     [Parameter] public RenderFragment<T> ItemTemplate { get; set; } = default!;
+    [Parameter] public bool Clearable { get; set; } = false;
+    [Parameter] public string Placeholder { get; set; } = string.Empty;
 
-    private string ValueString => ToStringFunc(Value);
+    private string ValueString => ToStringFunc(Value) ?? Placeholder;
 
     protected override void OnParametersSet()
     {
@@ -41,6 +43,8 @@
             { x => x.Items, Items },
             { x => x.ItemTemplate, ItemTemplate },
             { x => x.ToStringFunc, ToStringFunc },
+            { x => x.Clearable, Clearable },
+            { x => x.Placeholder, Placeholder },
         };
 
         var options = new DialogOptions()

diff --git a/src/iRLeagueManager.Web/ViewModels/ResultConfigViewModel.cs b/src/iRLeagueManager.Web/ViewModels/ResultConfigViewModel.cs
@@ -162,7 +162,10 @@ public async Task<StatusResult> LoadAvailableResultConfigs(CancellationToken can
         var result = await request;
         if (result.Success && result.Content is not null)
         {
-            AvailableResultConfigs = new(result.Content.Select(GetConfigInfoModel).NotNull());
+            AvailableResultConfigs = new(result.Content
+                .Select(GetConfigInfoModel)
+                .NotNull()
+                .Where(x => x.ChampSeasonId != ChampSeasonId));
         }
 
         return result.ToStatusResult();

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.7</Version>
+	<Version>0.11.8</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3</UserSecretsId>