Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Finalize Swag #449

Merged
merged 2 commits into from
May 16, 2019
Merged

Finalize Swag #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e3bc1e
Finalize Swag
kenny-young May 15, 2019
acb3411
typos, highlighting, time merge
kenny-young May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Data/DataModel/Swag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class Swag
[Display(Name ="Lunch Selection")]
public string Lunch { get; set; }

[Display(Name = "Modifications (e.g. no pickles, etc.)")]
[Display(Name = "Dietary Modifications (e.g. no cheese)")]
public string LunchModifications { get; set; }

[Display(Name = "T-Shirt Size")]
Expand Down
5 changes: 5 additions & 0 deletions ServerCore/ModelBases/EventSpecificPageModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ public async Task<bool> IsEventAdmin()
return isEventAdmin.Value;
}

public async Task<bool> HasSwag()
{
return Event.IsInternEvent && await _context.Swag.Where(m => m.Event == Event && m.Player == LoggedInUser).AnyAsync();
}

public async Task<int> GetTeamId()
{
if (EventRole == ModelBases.EventRole.play)
Expand Down
11 changes: 9 additions & 2 deletions ServerCore/Pages/Shared/_EventNavigationPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,14 @@
<li><a asp-page="/Teams/Play" asp-route-teamId="@teamId">Puzzles</a></li>
@if (Event.IsInternEvent)
{
<li><a asp-page="/Swag/Register">Lunch/T-Shirt</a></li>
if (DateTime.UtcNow > Event.TeamMiscDataChangeEnd || await Model.HasSwag())
{
<li><a asp-page="/Swag/Register">Lunch/T-Shirt</a></li>
}
else
{
<li><a style="color:yellow" asp-page="/Swag/Register"> Order Lunch/T-Shirt by @(Event.TeamMiscDataChangeEnd.ToString("M/dd"))!</a></li>
}
}
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
Expand Down Expand Up @@ -223,7 +230,7 @@
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-page="/EventSpecific/Index">Event</a></li>
<li><a asp-page="/Teams/List">Register</a></li>
<li><a style="color:yellow" asp-page="/Teams/List">Register</a></li>
<li><a asp-page="/Teams/AllTeams">View all teams</a></li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
Expand Down
40 changes: 21 additions & 19 deletions ServerCore/Pages/Swag/Register.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@if (isEditable)
{
<div class="alert alert-danger" role="alert">
Please make your selections by <time>@Model.Event.TeamMiscDataChangeEnd</time>.
Please make your selections by @Html.Raw(Model.LocalTime(Model.Event.TeamMiscDataChangeEnd)).
</div>
}
else
Expand All @@ -31,9 +31,13 @@ else
<div class="form-group">
<label asp-for="Swag.Lunch" class="control-label"></label>
<select asp-for="Swag.Lunch" class="form-control">
<option value="turkey">Thinly sliced turkey extravaganza</option>
<option value="beef">Big ol' block o' beef</option>
<option value="salad">green things in a bowl</option>
<option value="smoked-turkey">Smoked Turkey and Havarti Cheese</option>
<option value="chipotle-chicken">Chipotle Chicken Sandwich</option>
<option value="chicken-club">Honey Mustard Chicken Club</option>
<option value="loaded-sub">Fully Loaded Sub</option>
<option value="tom-mozz-avo">Tomato-Mozzarella-Avocado Sandwich (Vegetarian)</option>
<option value="cobb-salad">Cobb Salad (chicken, egg, avocado, cheese)</option>
<option value="none-of-the-above">None of the bove (explain in dietary modifications)</option>
</select>
<span asp-validation-for="Swag.Lunch" class="text-danger"></span>
</div>
Expand All @@ -45,21 +49,19 @@ else
<div class="form-group">
<label asp-for="Swag.ShirtSize" class="control-label"></label>
<select asp-for="Swag.ShirtSize" class="form-control">
<option value="MS">Mens' S</option>
<option value="MM">Mens' M</option>
<option value="ML">Mens' L</option>
<option value="MXL">Mens' XL</option>
<option value="M2XL">Mens' 2XL</option>
<option value="M3XL">Mens' 3XL</option>
<option value="M4XL">Mens' 4XL</option>
<option value="WXS">Womens' XS</option>
<option value="WS">Womens' S</option>
<option value="WM">Womens' M</option>
<option value="WL">Womens' L</option>
<option value="WXL">Womens' XL</option>
<option value="W2XL">Womens' 2XL</option>
<option value="W3XL">Womens' 3XL</option>
<option value="W4XL">Womens' 4XL</option>
<option value="MS">Mens' Small</option>
<option value="MM">Mens' Medium</option>
<option value="ML">Mens' Large</option>
<option value="MXL">Mens' X-Large</option>
<option value="M2XL">Mens' XX-Large</option>
<option value="M3XL">Mens' XXX-Large</option>
<option value="WXS">Womens' X-Small</option>
<option value="WS">Womens' Small</option>
<option value="WM">Womens' Medium</option>
<option value="WL">Womens' Large</option>
<option value="WXL">Womens' X-Large</option>
<option value="W2XL">Womens' XX-Large</option>
<option value="W3XL">Womens' XXX-Large</option>
</select>
<span asp-validation-for="Swag.ShirtSize" class="text-danger"></span>
</div>
Expand Down