Merge pull request #110 from SSchulze1989/develop

v 0.8.3

src/iRLeagueManager.Web/Components/Settings/EditAutoPenaltiesModal.razor

@@ -61,6 +61,8 @@
 @code {
     [Parameter, EditorRequired]
     public IEnumerable<MemberModel> LeagueMembers { get; set; } = default!;
+    [Parameter, EditorRequired]
+    public IEnumerable<TeamModel> Teams { get; set; } = default!;
 
     private string Text { get; set; } = string.Empty;
 
@@ -69,6 +71,7 @@
         base.OnParametersSet();
         BlazorParameterNullException.ThrowIfNull(this, ModalService);
         BlazorParameterNullException.ThrowIfNull(this, LeagueMembers);
+        BlazorParameterNullException.ThrowIfNull(this, Teams);
     }
 
     private static ResultFilterModel MapToResultFilterModel(FilterConditionModel condition) => new ResultFilterModel()
@@ -96,6 +99,7 @@
         var parameters = new ModalParameters<EditResultFilterModal>()
             .Add(x => x.Model, conditions)
             .Add(x => x.LeagueMembers, LeagueMembers)
+            .Add(x => x.Teams, Teams)
             .Add(x => x.AllowForEach, true)
             .Add(x => x.Actions, new[] { MatchedValueAction.Keep });
         var result = await ModalService.Show<EditResultFilterModal>("Penalty Conditions", parameters).Result;

src/iRLeagueManager.Web/Components/Settings/EditResultConfigModal.razor

@@ -5,6 +5,7 @@
 @inject IJSRuntime JsRuntime
 
 <CascadingValue Value="@Bind(Vm, x => x.LeagueMembers).AsEnumerable()">
+<CascadingValue Value="@Bind(Vm, x => x.Teams).AsEnumerable()">
 <EditForm Model=Vm OnValidSubmit=Submit>
     <StatusResultValidator @ref=ResultValidator />
     <div class="accordion mb-3" id="resultConfigSections">
@@ -139,6 +140,7 @@
     <CancelSubmitButtons ModelState=Vm SubmitText="Save" OnCancel=Cancel/>
 </EditForm>
 </CascadingValue>
+</CascadingValue>
 
 @code {
     protected override async Task OnAfterRenderAsync(bool firstRender)

src/iRLeagueManager.Web/Components/Settings/EditScoring.razor

@@ -79,6 +79,8 @@
     public IModalService ModalService { get; set; } = default!;
     [CascadingParameter]
     public IEnumerable<MemberModel> LeagueMembers { get; set; } = default!;
+    [CascadingParameter]
+    public IEnumerable<TeamModel> Teams { get; set; } = default!;
 
     [Parameter]
     public ScoringViewModel Scoring { get; set; } = default!;
@@ -141,7 +143,8 @@
         var autoPenalties = Scoring.PointRule.CopyModel().AutoPenalties;
         var parameters = new ModalParameters<EditAutoPenaltiesModal>()
             .Add(x => x.Model, autoPenalties)
-            .Add(x => x.LeagueMembers, LeagueMembers);
+            .Add(x => x.LeagueMembers, LeagueMembers)
+            .Add(x => x.Teams, Teams);
         var result = await ModalService.Show<EditAutoPenaltiesModal>("Automatic Penalties", parameters).Result;
         if (result.Confirmed && result.Data is IEnumerable<AutoPenaltyConfiguration> model)
         {

src/iRLeagueManager.Web/Pages/Settings/ChampionShipSettings.razor

@@ -266,8 +266,8 @@ else
         ChampSeason.DefaultResultConfig = null;
     }
 
-    private ResultConfigModel CreateResultConfig()
+    private ResultConfigModel CreateResultConfig() => new ResultConfigModel()
     {
-        return new ResultConfigModel();
-    }
+        ChampSeasonId = ChampSeason.ChampSeasonId,
+    };
 }

src/iRLeagueManager.Web/iRLeagueManager.Web.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-	<Version>0.8.2</Version>
+	<Version>0.8.3</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3</UserSecretsId>