Remove Team.Number
Add Team.Identifier
This commit is contained in:
@@ -236,7 +236,7 @@
|
||||
.Include(e => e.Event)
|
||||
.Include(e => e.Students)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Number)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.ToArrayAsync();
|
||||
|
||||
_students =
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<MudSelectItem T="EventDefinition" Value="@(evt)"></MudSelectItem>
|
||||
}
|
||||
</MudSelect>
|
||||
<MudTextField T="int?" Label="Number" @bind-Value="Team.Number" For="@(() => Team.Number)"></MudTextField>
|
||||
<MudTextField T="string?" Label="Number" @bind-Value="Team.Identifier" For="@(() => Team.Identifier)"></MudTextField>
|
||||
|
||||
</MudPaper>
|
||||
</MudItem>
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
private async Task AddTeam()
|
||||
{
|
||||
Team.TeamId = Team.Event.Name;
|
||||
Team.Identifier = Team.Event.Name;
|
||||
Context.Teams.Add(Team);
|
||||
|
||||
await Context.SaveChangesAsync();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<PageTitle>Edit Team - TSA Chapter Organizer</PageTitle>
|
||||
|
||||
<MudText Typo="Typo.h3">Edit</MudText>
|
||||
<MudText Typo="Typo.h4">Team@(Team == null ? "" : $" ({Team.Event.Name} #{Team.Number})")</MudText>
|
||||
<MudText Typo="Typo.h4">Team @(Team.ToString())</MudText>
|
||||
|
||||
@if (Team is null)
|
||||
{
|
||||
@@ -32,8 +32,8 @@ else
|
||||
}
|
||||
</MudSelect>
|
||||
<MudTextField T="Student" Label="Captain" @bind-Value="Team.Captain" For="@(() => Team.Captain)" Required="false" Clearable="true"></MudTextField>
|
||||
<MudNumericField T="int?" Label="Number" @bind-Value="Team.Number" For="@(() => Team.Number)" Required="false" Clearable="true"></MudNumericField>
|
||||
<MudTextField T="string?" Label="TeamId" @bind-Value="Team.TeamId" For="@(() => Team.TeamId)" Required="false" Clearable="true"></MudTextField>
|
||||
<MudNumericField T="string?" Label="Number" @bind-Value="Team.Identifier" For="@(() => Team.Identifier)" Required="false" Clearable="true"></MudNumericField>
|
||||
<MudTextField T="string?" Label="Identifier" @bind-Value="Team.Identifier" For="@(() => Team.Identifier)" Required="false" Clearable="true"></MudTextField>
|
||||
</MudPaper>
|
||||
</MudItem>
|
||||
</MudGrid>
|
||||
@@ -73,10 +73,7 @@ else
|
||||
{
|
||||
case EventFormat.Individual when Team.Students.Count == 1:
|
||||
Team.Captain ??= Team.Students[0];
|
||||
Team.TeamId ??= Team.Captain.FirstName;
|
||||
break;
|
||||
case EventFormat.Team when Team.Number != null && Team.TeamId == null:
|
||||
Team.TeamId = Team.Number.ToString();
|
||||
Team.Identifier ??= Team.Captain.FirstName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ else
|
||||
.Include(e => e.Event)
|
||||
.Include(e => e.Students)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Number)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.ToArrayAsync();
|
||||
|
||||
_maxTeamSize = _teams.Max(t => t.Students.Count);
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
.Include(e => e.Students)
|
||||
.ThenInclude(e => e.EventRankings)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Number)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.Where(state.FilterDefinitions)
|
||||
.OrderBy(state.SortDefinitions);
|
||||
|
||||
|
||||
@@ -213,7 +213,7 @@ else
|
||||
.Include(e => e.Event)
|
||||
.Include(e => e.Students)
|
||||
.OrderBy(e => e.Event.Name)
|
||||
.ThenBy(e => e.Number)
|
||||
.ThenBy(e => e.Identifier)
|
||||
.ToArrayAsync();
|
||||
|
||||
_maxTeamSize = _teams.Max(t => t.Students.Count);
|
||||
|
||||
Reference in New Issue
Block a user