Merge pull request #160 from SSchulze1989/develop

v 0.12.4
SSchulze1989 · Oct 4, 2024 · 204e8a4 · 204e8a4
2 parents cc028ee + fa4b0ab
commit 204e8a4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/iRLeagueManager.Web/Components/Standings/DisplayStanding.razor b/src/iRLeagueManager.Web/Components/Standings/DisplayStanding.razor
@@ -16,7 +16,7 @@
 
     @if (showRaceByRace)
     {
-        <RaceByRacePoints StandingRows="Standing.StandingRows" Events="raceEvents"/>
+        <RaceByRacePoints Standing="Standing" Events="raceEvents"/>
     }
     else
     {

diff --git a/src/iRLeagueManager.Web/Components/Standings/RaceByRacePoints.razor b/src/iRLeagueManager.Web/Components/Standings/RaceByRacePoints.razor
@@ -92,7 +92,14 @@
                     @(row.Position).
                 </td>
                 <td rowspan="2" class="py-0">
-                    @row.Firstname @row.Lastname
+                    @if (Standing.IsTeamStanding)
+                    {
+                        <span style="@($"color: {row.TeamColor}")">@row.TeamName</span>
+                    }
+                    else
+                    {
+                        @row.Firstname @row.Lastname
+                    }
                 </td>
                 @foreach (var race in columns)
                 {
@@ -121,13 +128,15 @@
 
 @code {
     [Parameter] public IEnumerable<EventModel> Events { get; set; } = default!;
-    [Parameter] public IEnumerable<StandingRowModel> StandingRows { get; set; } = default!;
+    [Parameter] public StandingsModel Standing { get; set; } = default!;
     [Parameter] public int? RaceColumns { get; set; }
 
+    private IEnumerable<StandingRowModel> StandingRows => Standing.StandingRows;
+
     protected override void OnParametersSet()
     {
         base.OnParametersSet();
         BlazorParameterNullException.ThrowIfNull(this, Events);
-        BlazorParameterNullException.ThrowIfNull(this, StandingRows);
+        BlazorParameterNullException.ThrowIfNull(this, Standing);
     }
 }
diff --git a/src/iRLeagueManager.Web/appsettings.json b/src/iRLeagueManager.Web/appsettings.json
@@ -9,8 +9,8 @@
     }
   },
   "AllowedHosts": "*",
-  "APIServer": "http://localhost:5000",
-  //"APIServer": "https://irleaguemanager.net/api/",
+  //"APIServer": "http://localhost:5000",
+  "APIServer": "https://irleaguemanager.net/api/",
   "DefaultUser": "testuser",
   "DefaultPassword": "TestPass123!"
 }
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.12.3</Version>
+	<Version>0.12.4</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-iRLeagueManager.Web-2B05F9DC-55A3-49D1-BD64-31507000EDF3</UserSecretsId>