Added ability for admins to release and restrict email mode

ServerCore/ModelBases/PuzzleStatePerTeamPageModel.cs

@@ -14,9 +14,10 @@ public abstract class PuzzleStatePerTeamPageModel : EventSpecificPageModel
     {
         public SortOrder? Sort { get; set; }
 
-        public PuzzleStatePerTeamPageModel(PuzzleServerContext serverContext, UserManager<IdentityUser> userManager) : base(serverContext, userManager)
-        {
-        }
+        public PuzzleStatePerTeamPageModel(
+            PuzzleServerContext serverContext,
+            UserManager<IdentityUser> userManager)
+        : base(serverContext, userManager) { }
 
         public IList<PuzzleStatePerTeam> PuzzleStatePerTeam { get; set; }
 
@@ -29,7 +30,13 @@ public async Task<IActionResult> InitializeModelAsync(Puzzle puzzle, Team team,
                 return NotFound();
             }
 
-            IQueryable<PuzzleStatePerTeam> statesQ = PuzzleStateHelper.GetFullReadOnlyQuery(_context, Event, puzzle, team, EventRole == EventRole.admin ? null : LoggedInUser);
+            IQueryable<PuzzleStatePerTeam> statesQ = PuzzleStateHelper.GetFullReadOnlyQuery(
+                _context,
+                Event,
+                puzzle,
+                team,
+                EventRole == EventRole.admin ? null : LoggedInUser);
+
             Sort = sort;
 
             switch(sort ?? DefaultSort)
@@ -86,12 +93,38 @@ public async Task<IActionResult> InitializeModelAsync(Puzzle puzzle, Team team,
 
         public async Task SetUnlockStateAsync(Puzzle puzzle, Team team, bool value)
         {
-            await PuzzleStateHelper.SetUnlockStateAsync(_context, Event, puzzle, team, value ? (DateTime?)DateTime.UtcNow : null, EventRole == EventRole.admin ? null : LoggedInUser);
+            await PuzzleStateHelper.SetUnlockStateAsync(
+                _context,
+                Event,
+                puzzle,
+                team,
+                value ? (DateTime?)DateTime.UtcNow : null,
+                EventRole == EventRole.admin ? null : LoggedInUser);
+
         }
 
         public async Task SetSolveStateAsync(Puzzle puzzle, Team team, bool value)
         {
-            await PuzzleStateHelper.SetSolveStateAsync(_context, Event, puzzle, team, value ? (DateTime?)DateTime.UtcNow : null, EventRole == EventRole.admin ? null : LoggedInUser);
+            await PuzzleStateHelper.SetSolveStateAsync(
+                _context,
+                Event,
+                puzzle,
+                team,
+                value ? (DateTime?)DateTime.UtcNow : null,
+                EventRole == EventRole.admin ? null : LoggedInUser);
+
+        }
+
+        public async Task SetEmailModeAsync(Puzzle puzzle, Team team, bool value)
+        {
+            await PuzzleStateHelper.SetEmailOnlyModeAsync(
+                _context,
+                Event, 
+                puzzle,
+                team,
+                value,
+                EventRole == EventRole.admin ? null : LoggedInUser);
+
         }
 
         public enum SortOrder

ServerCore/Pages/Events/Map.cshtml.cs

@@ -21,9 +21,9 @@ public class MapModel : EventSpecificPageModel
 
         public StateStats[,] StateMap { get; private set; }
 
-        public MapModel(PuzzleServerContext serverContext, UserManager<IdentityUser> userManager) : base(serverContext, userManager)
-        {
-        }
+        public MapModel(PuzzleServerContext serverContext,
+                        UserManager<IdentityUser> userManager)
+            : base(serverContext, userManager) { }
 
         public async Task<IActionResult> OnGetAsync()
         {
@@ -32,14 +32,22 @@ public async Task<IActionResult> OnGetAsync()
 
             if (EventRole == EventRole.admin)
             {
-                puzzles = await _context.Puzzles.Where(p => p.Event == Event).Select(p => new PuzzleStats() { Puzzle = p }).ToListAsync();
+                puzzles = await _context.Puzzles.Where(p => p.Event == Event)
+                    .Select(p => new PuzzleStats() { Puzzle = p })
+                    .ToListAsync();
+
             }
             else
             {
-                puzzles = await UserEventHelper.GetPuzzlesForAuthorAndEvent(_context, Event, LoggedInUser).Select(p => new PuzzleStats() { Puzzle = p }).ToListAsync();
+                puzzles = await UserEventHelper.GetPuzzlesForAuthorAndEvent(_context, Event, LoggedInUser)
+                    .Select(p => new PuzzleStats() { Puzzle = p })
+                    .ToListAsync();
+
             }
 
-            List<TeamStats> teams = await _context.Teams.Where(t => t.Event == Event).Select(t => new TeamStats() { Team = t }).ToListAsync();
+            List<TeamStats> teams = await _context.Teams.Where(t => t.Event == Event)
+                .Select(t => new TeamStats() { Team = t })
+                .ToListAsync();
 
             // build an ID-based lookup for puzzles and teams
             Dictionary<int, PuzzleStats> puzzleLookup = new Dictionary<int, PuzzleStats>();
@@ -49,17 +57,30 @@ public async Task<IActionResult> OnGetAsync()
             teams.ForEach(t => teamLookup[t.Team.ID] = t);
 
             // tabulate solve counts and team scores
-            List<PuzzleStatePerTeam> states = await PuzzleStateHelper.GetSparseQuery(_context, Event, null, null, EventRole == EventRole.admin ? null : LoggedInUser).ToListAsync();
+            List<PuzzleStatePerTeam> states = await PuzzleStateHelper.GetSparseQuery(
+                _context,
+                Event,
+                null,
+                null,
+                EventRole == EventRole.admin ? null : LoggedInUser).ToListAsync();
+
             List<StateStats> stateList = new List<StateStats>(states.Count);
             foreach (PuzzleStatePerTeam state in states)
             {
                 // TODO: Is it more performant to prefilter the states if an author, or is this sufficient?
-                if (!puzzleLookup.TryGetValue(state.PuzzleID, out PuzzleStats puzzle) || !teamLookup.TryGetValue(state.TeamID, out TeamStats team))
+                if (!puzzleLookup.TryGetValue(state.PuzzleID, out PuzzleStats puzzle) ||
+                    !teamLookup.TryGetValue(state.TeamID, out TeamStats team))
                 {
                     continue;
                 }
 
-                stateList.Add(new StateStats() { Puzzle = puzzle, Team = team, UnlockedTime = state.UnlockedTime, SolvedTime = state.SolvedTime });
+                stateList.Add(new StateStats() {
+                    Puzzle = puzzle,
+                    Team = team,
+                    UnlockedTime = state.UnlockedTime,
+                    SolvedTime = state.SolvedTime,
+                    LockedOut = state.IsEmailOnlyMode
+                });
 
                 if (state.SolvedTime != null)
                 {
@@ -75,17 +96,26 @@ public async Task<IActionResult> OnGetAsync()
             }
 
             // sort puzzles by solve count, add the sort index to the lookup
-            puzzles = puzzles.OrderByDescending(p => p.SolveCount).ThenBy(p => p.Puzzle.Name).ToList();
+            puzzles = puzzles.OrderByDescending(p => p.SolveCount)
+                .ThenBy(p => p.Puzzle.Name)
+                .ToList();
+
             for (int i = 0; i < puzzles.Count; i++)
             {
                 puzzles[i].SortOrder = i;
             }
 
             // sort teams by metameta/score, add the sort index to the lookup
-            teams = teams.OrderBy(t => t.FinalMetaSolveTime).ThenByDescending(t => t.Score).ThenBy(t => t.Team.Name).ToList();
+            teams = teams.OrderBy(t => t.FinalMetaSolveTime)
+                .ThenByDescending(t => t.Score)
+                .ThenBy(t => t.Team.Name)
+                .ToList();
+
             for (int i = 0; i < teams.Count; i++)
             {
-                if (i == 0 || teams[i].FinalMetaSolveTime != teams[i - 1].FinalMetaSolveTime || teams[i].Score != teams[i - 1].Score)
+                if (i == 0 ||
+                    teams[i].FinalMetaSolveTime != teams[i - 1].FinalMetaSolveTime ||
+                    teams[i].Score != teams[i - 1].Score)
                 {
                     teams[i].Rank = i + 1;
                 }
@@ -129,20 +159,52 @@ public class StateStats
             public TeamStats Team { get; set; }
             public DateTime? UnlockedTime { get; set; }
             public DateTime? SolvedTime { get; set; }
+            public Boolean LockedOut { get; set; }
 
             public string DisplayText
             {
                 get
                 {
-                    return SolvedTime != null ? "C" : UnlockedTime != null ? "U" : "L";
+                    if (LockedOut)
+                    {
+                        return "E";
+                    }
+
+                    if (SolvedTime != null)
+                    {
+                        return "C";
+                    }
+
+                    if (UnlockedTime != null)
+                    {
+                        return "U";
+                    }
+
+                    return "L";
+
                 }
             }
 
             public int DisplayHue
             {
                 get
                 {
-                    return SolvedTime != null ? 120 : UnlockedTime != null ? 60 : 0;
+                    if (LockedOut)
+                    {
+                        return 0;
+                    }
+
+                    if (SolvedTime != null)
+                    {
+                        return 120;
+                    }
+
+                    if (UnlockedTime != null)
+                    {
+                        return 60;
+                    }
+
+                    return 0;
                 }
             }
 
@@ -155,15 +217,14 @@ public int DisplayLightness
                         int minutes = (int)((DateTime.UtcNow - SolvedTime.Value).TotalMinutes);
                         return 75 - (Math.Min(minutes, 236) >> 2);
                     }
-                    else if (UnlockedTime != null)
+
+                    if (UnlockedTime != null)
                     {
                         int minutes = (int)((DateTime.UtcNow - UnlockedTime.Value).TotalMinutes);
                         return 75 - (Math.Min(minutes, 236) >> 2);
                     }
-                    else
-                    {
-                        return 100;
-                    }
+
+                    return 100;
                 }
             }
         }

ServerCore/Pages/Puzzles/Status.cshtml

@@ -36,14 +36,17 @@
             <th>
                 @Html.DisplayNameFor(model => model.PuzzleStatePerTeam[0].Notes)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.PuzzleStatePerTeam[0].IsEmailOnlyMode)
+            </th>
         </tr>
     </thead>
     <tbody>
         @foreach (var item in Model.PuzzleStatePerTeam)
         {
             <tr>
                 <td>
-                    <a asp-page="../Teams/Status" asp-route-id="@item.Team.ID">@Html.DisplayFor(modelItem => item.Team.Name)</a>
+                    <a asp-page="../Teams/Status" asp-route-teamId="@item.Team.ID">@Html.DisplayFor(modelItem => item.Team.Name)</a>
                 </td>
                 <td>
                     @if (item.UnlockedTime == null)
@@ -73,6 +76,16 @@
                 <td>
                     @Html.DisplayFor(modelItem => item.Notes)
                 </td>
+                <td>
+                    @if (item.IsEmailOnlyMode == true)
+                    {
+                        <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@item.Team.ID" asp-route-puzzleid="@Model.Puzzle.ID" asp-route-value="false" onclick="return confirm('Are you sure you want to release @(item.Team.Name) from email-only mode?')">Release</a>
+                    }
+                    else
+                    {
+                        <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@item.Team.ID" asp-route-puzzleid="@Model.Puzzle.ID" asp-route-value="true" onclick="return confirm('Are you sure you want to restrict @(item.Team.Name) to email-only mode?')">Restrict</a>
+                    }
+                </td>
             </tr>
         }
 
@@ -98,5 +111,16 @@
             <td></td>
             <td></td>
         </tr>
+        <tr>
+            <td></td>
+            <td>
+                    <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-puzzleId="@Model.Puzzle.ID" asp-route-value="false" onclick="return confirm('Are you sure you want to release all teams from email-only mode?')">Release all</a>
+            </td>
+            <td>
+                    <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-puzzleId="@Model.Puzzle.ID"  asp-route-value="true" onclick="return confirm('Are you sure you want to restrict all teams to email-only mode?')">Restrict all</a>
+            </td>
+            <td></td>
+            <td></td>
+        </tr>
     </tbody>
 </table>

ServerCore/Pages/Puzzles/Status.cshtml.cs

@@ -63,6 +63,21 @@ public async Task<IActionResult> OnGetSolveStateAsync(int puzzleId, int? teamId,
 
             await SetSolveStateAsync(puzzle, team, value);
 
+            // redirect without the solve info to keep the URL clean
+            return RedirectToPage(new { puzzleId, sort });
+        }
+        public async Task<IActionResult> OnGetEmailModeAsync(int puzzleId, int? teamId, bool value, string sort)
+        {
+            var puzzle = await _context.Puzzles.FirstAsync(m => m.ID == puzzleId);
+            var team = teamId == null ? null : await _context.Teams.FirstAsync(m => m.ID == teamId.Value);
+
+            if (puzzle == null)
+            {
+                return NotFound();
+            }
+
+            await SetEmailModeAsync(puzzle, team, value);
+
             // redirect without the solve info to keep the URL clean
             return RedirectToPage(new { puzzleId, sort });
         }

ServerCore/Pages/Teams/Status.cshtml

@@ -35,6 +35,9 @@
             <th>
                 @Html.DisplayNameFor(model => model.PuzzleStatePerTeam[0].Notes)
             </th>
+            <th>
+                @Html.DisplayNameFor(model => model.PuzzleStatePerTeam[0].IsEmailOnlyMode)
+            </th>
         </tr>
     </thead>
     <tbody>
@@ -72,6 +75,16 @@
                 <td>
                     @Html.DisplayFor(modelItem => item.Notes)
                 </td>
+                <td>
+                    @if (item.IsEmailOnlyMode == true)
+                    {
+                        <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@Model.Team.ID" asp-route-puzzleid="@item.Puzzle.ID" asp-route-value="false" onclick="return confirm('Are you sure you want to release @(item.Puzzle.Name) from email-only mode?')">Release</a>
+                    }
+                    else
+                    {
+                        <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@Model.Team.ID" asp-route-puzzleid="@item.Puzzle.ID" asp-route-value="true" onclick="return confirm('Are you sure you want to restrict @(item.Puzzle.Name) to email-only mode?')">Restrict</a>
+                    }
+                </td>
             </tr>
         }
 
@@ -97,6 +110,17 @@
             <td></td>
             <td></td>
         </tr>
+        <tr>
+            <td></td>
+            <td>
+                    <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@Model.Team.ID" asp-route-value="false" onclick="return confirm('Are you sure you want to release all puzzles from email-only mode?')">Release all</a>
+            </td>
+            <td>
+                    <a asp-page-handler="EmailMode" asp-route-sort="@Model.Sort" asp-route-teamId="@Model.Team.ID"  asp-route-value="true" onclick="return confirm('Are you sure you want to restrict all puzzles to email-only mode?')">Restrict all</a>
+            </td>
+            <td></td>
+            <td></td>
+        </tr>
     </tbody>
 </table>
 <div>

ServerCore/Pages/Teams/Status.cshtml.cs

@@ -67,5 +67,21 @@ public async Task<IActionResult> OnGetSolveStateAsync(int teamId, int? puzzleId,
             // redirect without the solve info to keep the URL clean
             return RedirectToPage(new { teamId, sort });
         }
+
+        public async Task<IActionResult> OnGetEmailModeAsync(int teamId, int? puzzleId, bool value, string sort)
+        {
+            var puzzle = puzzleId == null ? null : await _context.Puzzles.FirstAsync(m => m.ID == puzzleId);
+            var team = await _context.Teams.FirstAsync(m => m.ID == teamId);
+
+            if (team == null)
+            {
+                return NotFound();
+            }
+
+            await SetEmailModeAsync(puzzle, team, value);
+
+            // redirect without the solve info to keep the URL clean
+            return RedirectToPage(new { teamId, sort });
+        }
     }
 }