From 1e3bc1e7366ed7639b25ac3cfe9177dcc87a9b1c Mon Sep 17 00:00:00 2001 From: Kenny Young Date: Tue, 14 May 2019 23:23:32 -0700 Subject: [PATCH 1/2] Finalize Swag --- Data/DataModel/Swag.cs | 2 +- ServerCore/Pages/Swag/Register.cshtml | 38 ++++++++++++++------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Data/DataModel/Swag.cs b/Data/DataModel/Swag.cs index 9a52d8b2..80b861cc 100644 --- a/Data/DataModel/Swag.cs +++ b/Data/DataModel/Swag.cs @@ -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")] diff --git a/ServerCore/Pages/Swag/Register.cshtml b/ServerCore/Pages/Swag/Register.cshtml index 1b4f72c4..8902ae14 100644 --- a/ServerCore/Pages/Swag/Register.cshtml +++ b/ServerCore/Pages/Swag/Register.cshtml @@ -31,9 +31,13 @@ else
@@ -45,21 +49,19 @@ else
From acb34115258050cfc257f348d90cda7c00ea0c29 Mon Sep 17 00:00:00 2001 From: Kenny Young Date: Wed, 15 May 2019 19:27:43 -0700 Subject: [PATCH 2/2] typos, highlighting, time merge --- ServerCore/ModelBases/EventSpecificPageModel.cs | 5 +++++ .../Pages/Shared/_EventNavigationPartial.cshtml | 11 +++++++++-- ServerCore/Pages/Swag/Register.cshtml | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ServerCore/ModelBases/EventSpecificPageModel.cs b/ServerCore/ModelBases/EventSpecificPageModel.cs index 9de11d71..c4a6a49c 100644 --- a/ServerCore/ModelBases/EventSpecificPageModel.cs +++ b/ServerCore/ModelBases/EventSpecificPageModel.cs @@ -95,6 +95,11 @@ public async Task IsEventAdmin() return isEventAdmin.Value; } + public async Task HasSwag() + { + return Event.IsInternEvent && await _context.Swag.Where(m => m.Event == Event && m.Player == LoggedInUser).AnyAsync(); + } + public async Task GetTeamId() { if (EventRole == ModelBases.EventRole.play) diff --git a/ServerCore/Pages/Shared/_EventNavigationPartial.cshtml b/ServerCore/Pages/Shared/_EventNavigationPartial.cshtml index 8b1f5697..69ea5104 100644 --- a/ServerCore/Pages/Shared/_EventNavigationPartial.cshtml +++ b/ServerCore/Pages/Shared/_EventNavigationPartial.cshtml @@ -156,7 +156,14 @@
  • Puzzles
    • @if (Event.IsInternEvent) { -
  • Lunch/T-Shirt
    • + if (DateTime.UtcNow > Event.TeamMiscDataChangeEnd || await Model.HasSwag()) + { +
  • Lunch/T-Shirt
    • + } + else + { +
  • Order Lunch/T-Shirt by @(Event.TeamMiscDataChangeEnd.ToString("M/dd"))!
    • + } }
  • @@ -223,7 +230,7 @@