Event definiteion updates

WebApp/Components/Pages/EventDefinitionPages/Index.razor

@@ -1,5 +1,6 @@
 @page "/events"
 @using Microsoft.EntityFrameworkCore
+@using WebApp.Models
 @inject AppDbContext Context
 
 <PageTitle>Events - TSA Chapter Organizer</PageTitle>
@@ -13,18 +14,27 @@
     <Columns>
         <PropertyColumn Property="@(e => e.Name)" Title="Event Name" Sortable="true" />
         <PropertyColumn Property="@(e => e.EventFormat)" Title="Event Format" />
-        <PropertyColumn Property="@(e => e.LevelOfEffort)" Title="Level of Effort"  />
-        <PropertyColumn Property="@(e => e.Eligibility)" Title="Eligibility" />
+
         <TemplateColumn Title="Team Size" CellStyle="white-space:nowrap">
             <CellTemplate>
+                <MudTooltip Text="@context.Item.Eligibility">
                 [@context.Item.MinTeamSize&nbsp;-&nbsp;@context.Item.MaxTeamSize]
+                </MudTooltip>
             </CellTemplate>
         </TemplateColumn>
-        <TemplateColumn Title="TimeSlots State #">
+        <PropertyColumn Property="@(e => e.ChapterEligibilityCountState)" Title="State#" />
+        <TemplateColumn Title="Regionals" Sortable="true" SortBy="e => e.ChapterEligibilityCountRegionals">
             <CellTemplate>
-                @context.Item.MaxTeamCountState
+                @if (context.Item.RegionalEvent) { @AppIcons.RegionalEvent }
             </CellTemplate>
         </TemplateColumn>
+        <TemplateColumn Title="Pre-submission" Sortable="true" SortBy="e => e.Presubmission">
+            <CellTemplate>
+                @if (context.Item.Presubmission) { @AppIcons.PresubmissionEvent }
+            </CellTemplate>
+        </TemplateColumn>
+        
+        <PropertyColumn Property="@(e => e.LevelOfEffort)" Title="Level of Effort" />
         <TemplateColumn>
             <CellTemplate>
                 <MudStack Row>
@@ -54,7 +64,7 @@
     private async Task<GridData<EventDefinition>> ServerReload(GridState<EventDefinition> state)
     {
 
-        var query = Context.Events.Where(state.FilterDefinitions).OrderBy(state.SortDefinitions);
+        var query = Context.Events.OrderBy(e => e.Name).Where(state.FilterDefinitions).OrderBy(state.SortDefinitions);
 
         var totalItems = await query.CountAsync();
         var pagedData = await query.Skip(state.Page * state.PageSize).Take(state.PageSize).ToArrayAsync();