Add Blazor WebApp and rework data handling to utilize Entity Framework
This commit is contained in:
@@ -5,21 +5,21 @@
|
||||
}
|
||||
|
||||
<table>
|
||||
@foreach (var team in Model.Item1.Where(t => t.Event.Documentation.Contains("Port")))
|
||||
@foreach (var team in Model.Item1.Where(t => t.EventDefinition.Documentation.Contains("Port")))
|
||||
{
|
||||
<tr>
|
||||
<td>@team.Name @if (team.Event.Format is EventFormat.Individual)
|
||||
<td>@team.Name @if (team.EventDefinition.EventFormat is EventFormat.Individual)
|
||||
{
|
||||
<text>(ind)</text>
|
||||
}
|
||||
</td><td>@team.Event.Documentation</td>
|
||||
</td><td>@team.EventDefinition.Documentation</td>
|
||||
@foreach(var student in @team.Students.OrderByDescending(s => s.TsaYear + s.Grade))
|
||||
{
|
||||
<td>@student.FirstName</td>
|
||||
}
|
||||
</tr>
|
||||
}
|
||||
@foreach (var student in Model.Item1.SelectMany(t => t.Students).Distinct().Where(s => s.Teams.Any(t => t.Event.Name.Contains("Port"))))
|
||||
@foreach (var student in Model.Item1.SelectMany(t => t.Students).Distinct().Where(s => s.Teams.Any(t => t.EventDefinition.Name.Contains("Port"))))
|
||||
{
|
||||
<tr>
|
||||
<td>@student.FirstName</td>
|
||||
@@ -34,9 +34,9 @@
|
||||
@{
|
||||
var ind = false;
|
||||
}
|
||||
@foreach (var team in Model.Item1.OrderByDescending(t => t.Event.Format is EventFormat.Team))
|
||||
@foreach (var team in Model.Item1.OrderByDescending(t => t.EventDefinition.EventFormat is EventFormat.Team))
|
||||
{
|
||||
@if (!ind && team.Event.Format is EventFormat.Individual)
|
||||
@if (!ind && team.EventDefinition.EventFormat is EventFormat.Individual)
|
||||
{
|
||||
<tr>
|
||||
<td><hr/></td><td>Individual</td><td><hr/></td>
|
||||
@@ -46,17 +46,17 @@
|
||||
<tr class="table-primary">
|
||||
<td class="table-primary"><strong>@team.Name</strong></td>
|
||||
<td colspan="1">
|
||||
@* @Html.Partial("EffortStarsPartial", team.Event.LevelOfEffort) *@
|
||||
@* @if (team.Event.RegionalEvent)
|
||||
@* @Html.Partial("EffortStarsPartial", team.EventDefinition.LevelOfEffort) *@
|
||||
@* @if (team.EventDefinition.RegionalEventDefinition)
|
||||
{
|
||||
<text>(reg)</text>
|
||||
}
|
||||
|
||||
@if (team.Event.OnSiteActivity)
|
||||
@if (team.EventDefinition.OnSiteActivity)
|
||||
{
|
||||
<text>(act)</text>
|
||||
} *@
|
||||
@team.Event.TeamSize
|
||||
@team.EventDefinition.TeamSize
|
||||
</td>
|
||||
@*<td style="nowrap">@evt.MaxTeamCountState</td>*@
|
||||
@foreach (var student in team.Students.OrderByDescending(s => (s.Grade + s.TsaYear) * (team.Captain == s ? 2 : 1)).ThenBy(s => s.FirstNameLastName))
|
||||
@@ -71,9 +71,9 @@
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Event</td>
|
||||
<td>EventDefinition</td>
|
||||
<td>Pre-submission</td>
|
||||
<td>RegionalNotes</td>
|
||||
<td>Notes</td>
|
||||
<td>Team Members</td>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -87,19 +87,19 @@
|
||||
|
||||
</tr>
|
||||
|
||||
@foreach (var student in students.OrderByDescending(s => (s.Grade + s.TsaYear) * (team.Captain == s ? 2 : 1)).ThenBy(s => s.FirstNameLastName))
|
||||
@foreach (var student in students.RankByDescending(s => (s.Grade + s.TsaYear) * (team.Captain == s ? 2 : 1)).ThenBy(s => s.FirstNameLastName))
|
||||
{
|
||||
<td>@student.FirstNameLastName @if (team.Captain == student) { <text>(Cpt.)</text>}</td>
|
||||
}
|
||||
|
||||
<tr>
|
||||
<td class="event-desc" colspan="4">Team Size: @team.Event.TeamSize, Max Teams: @team.Event.MaxTeamCountState
|
||||
<td class="eventDefinition-desc" colspan="4">Team Size: @team.EventDefinition.TeamSize, Max Teams: @team.EventDefinition.MaxTeamCountState
|
||||
@{
|
||||
if (!team.Event.InterviewOrPresentation)
|
||||
if (!team.EventDefinition.InterviewOrPresentation)
|
||||
{
|
||||
<span class="activity"> (a)</span>
|
||||
}
|
||||
if (team.Event.Format is EventFormat.Individual)
|
||||
if (team.EventDefinition.EventDefinitionFormat is EventDefinitionEventDefinitionFormat.Individual)
|
||||
{
|
||||
<span class="activity"> (i)</span>
|
||||
}
|
||||
@@ -109,9 +109,9 @@
|
||||
}
|
||||
</table>
|
||||
<p>
|
||||
(a) denotes an event that has activity other than interview or presentation at state
|
||||
(a) denotes an eventDefinition that has activity other than interview or presentation at state
|
||||
<br />
|
||||
(i) denotes an individual event
|
||||
(i) denotes an individual eventDefinition
|
||||
</p>
|
||||
*@
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
private void GetTeamClass(Team team)
|
||||
{
|
||||
// if (team.Event.RegionalEvent)
|
||||
// if (team.EventDefinition.RegionalEvent)
|
||||
// {
|
||||
// @Html.Raw("regional");
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user