Jessica/unsolved filter

ServerCore/Pages/Submissions/Index.cshtml

@@ -92,20 +92,20 @@
             </tr>
         </thead>
         <tbody>
-            @foreach (var item in Model.Submissions)
+            @for (int i = Model.Submissions.Count-1; i >= 0; --i)
             {
                 <tr>
                     <td>
-                        @Html.Raw(Model.LocalTime(item.TimeSubmitted))
+                        @Html.Raw(Model.LocalTime(Model.Submissions[i].TimeSubmitted))
                     </td>
                     <td>
-                        @Html.DisplayFor(modelItem => item.Submitter.Name)
+                        @Html.DisplayFor(modelItem => Model.Submissions[i].Submitter.Name)
                     </td>
                     <td>
-                        @Html.DisplayFor(modelItem => item.SubmissionText)
+                        @Html.DisplayFor(modelItem => Model.Submissions[i].SubmissionText)
                     </td>
                     <td>
-                        @(item.Response != null ? item.Response.ResponseText : "Incorrect")
+                        @(Model.Submissions[i].Response != null ? Model.Submissions[i].Response.ResponseText : "Incorrect")
                     </td>
                 </tr>
             }

ServerCore/Pages/Teams/Play.cshtml

@@ -6,22 +6,47 @@
     ViewData["AdminRoute"] = "/Puzzles/Index";
     ViewData["AuthorRoute"] = "/Puzzles/Index";
     // Needs route data - ViewData["PlayRoute"] = "/Teams/Play";
+
+    Boolean unsolvedFilter = Model.StateFilter == PlayModel.PuzzleStateFilter.Unsolved;
 }
+<style>
+    .radioButton {
+        padding: 0px 5px;
+        color: inherit;
+        text-decoration: none;
+    }
+
+    .radioButton:hover {
+        color: inherit;
+        text-decoration: none;
+        cursor: pointer;
+    }
+</style>
 
 <h2>Puzzles</h2>
 <div>
     <a asp-page="/Teams/Answers" asp-route-teamId="@Model.TeamID">View All Correct Answers</a>
 </div>
+<br/>
+<div>
+    <a class="radioButton" asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@Model.Sort" asp-route-stateFilter="@PlayModel.PuzzleStateFilter.All">
+        <input id="StateFilter" name="StateFilter" value="All" type="radio" @(unsolvedFilter ? "" : "checked")> All
+    </a>
+    <a class="radioButton" asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@Model.Sort" asp-route-stateFilter="@PlayModel.PuzzleStateFilter.Unsolved">
+        <input id="StateFilter" name="StateFilter" value="Unsolved" type="radio" @(unsolvedFilter ? "checked" : "")> Unsolved
+    </a>
+</div>
+<br/>
 <table class="table">
     <thead>
         <tr>
             <th>
-                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.GroupAscending, PlayModel.SortOrder.GroupDescending))">
+                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.GroupAscending, PlayModel.SortOrder.GroupDescending))" asp-route-stateFilter="@Model.StateFilter">
                     @Html.DisplayNameFor(model => model.PuzzleViews[0].Group)
                 </a>
             </th>
             <th>
-                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.PuzzleAscending, PlayModel.SortOrder.PuzzleDescending))">
+                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.PuzzleAscending, PlayModel.SortOrder.PuzzleDescending))" asp-route-stateFilter="@Model.StateFilter">
                     Puzzle
                 </a>
             </th>
@@ -32,7 +57,7 @@
                 </th>
             }
             <th>
-                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.SolveAscending, PlayModel.SortOrder.SolveDescending))">
+                <a asp-page="./Play" asp-route-teamId="@Model.TeamID" asp-route-sort="@(Model.SortForColumnLink(PlayModel.SortOrder.SolveAscending, PlayModel.SortOrder.SolveDescending))" asp-route-stateFilter="@Model.StateFilter">
                     Solve
                 </a>
             </th>
@@ -41,73 +66,74 @@
             </th>
             @if (Model.AllowFeedback)
             {
-            <th>
-                Feedback
-            </th>
+                <th>
+                    Feedback
+                </th>
             }
         </tr>
     </thead>
     <tbody>
-@foreach (var item in Model.PuzzleViews) {
-        <tr>
-            <td>
-                @Html.DisplayFor(modelItem => item.Group)
-            </td>
-            <td>
-                @if (!string.IsNullOrWhiteSpace(item.Errata))
-                {
-                <text>&#x26A0; </text>
-                }
-
-                @if (item.CustomUrl != null)
-                {
-                <a href="@ServerCore.Helpers.PuzzleHelper.GetFormattedUrl(item.CustomUrl, item.ID, Model.Event.ID)" target="_blank">@item.Name</a>
-                }
-                else if (item.Content != null)
-                {
-                @Html.ActionLink(item.Name, "Index", "Files", new { eventId = Model.Event.ID, filename = item.Content.ShortName }, new { target = "_blank" })
-                }
-                else
-                {
-                @Html.DisplayFor(modelItem => item.Name)
-                }
-            </td>
-            @if (Model.ShowAnswers)
-            {
+        @foreach (var item in Model.PuzzleViews)
+        {
+            <tr>
                 <td>
-                    @if (item.Answer != null)
+                    @Html.DisplayFor(modelItem => item.Group)
+                </td>
+                <td>
+                    @if (!string.IsNullOrWhiteSpace(item.Errata))
                     {
-                        @Html.ActionLink("View answer", "Index", "Files", new { eventId = Model.Event.ID, filename = item.Answer.ShortName }, new { target = "_blank" })
+                        <text>&#x26A0; </text>
                     }
-                </td>
-            }
-            <td>
-                <a asp-page="/Submissions/Index" asp-route-puzzleId="@item.ID">
-                    @if (item.SolvedTime != null)
+
+                    @if (item.CustomUrl != null)
                     {
-                        <text>Solved on </text>@Html.Raw(Model.LocalTime(item.SolvedTime))
+                        <a href="@ServerCore.Helpers.PuzzleHelper.GetFormattedUrl(item.CustomUrl, item.ID, Model.Event.ID)" target="_blank">@item.Name</a>
                     }
-                    else if (@Model.Event.IsAnswerSubmissionActive)
+                    else if (item.Content != null)
                     {
-                        <text>Submit Answer</text>
+                        @Html.ActionLink(item.Name, "Index", "Files", new { eventId = Model.Event.ID, filename = item.Content.ShortName }, new { target = "_blank" })
                     }
                     else
                     {
-                        <text>See past submissions</text>
+                        @Html.DisplayFor(modelItem => item.Name)
                     }
-                </a>
-            </td>
-            <td>
-                <a asp-page="./Hints" asp-route-puzzleid="@item.ID" asp-route-teamId="@Model.TeamID">Hints</a>
-            </td>
-            @if (Model.AllowFeedback)
-            {
-            <td>
-                <a asp-Page="/Puzzles/SubmitFeedback" asp-route-puzzleid="@item.ID">Submit feedback</a>
-            </td>
-            }
-        </tr>
-    }
+                </td>
+                @if (Model.ShowAnswers)
+                {
+                    <td>
+                        @if (item.Answer != null)
+                        {
+                            @Html.ActionLink("View answer", "Index", "Files", new { eventId = Model.Event.ID, filename = item.Answer.ShortName }, new { target = "_blank" })
+                        }
+                    </td>
+                }
+                <td>
+                    <a asp-page="/Submissions/Index" asp-route-puzzleId="@item.ID">
+                        @if (item.SolvedTime != null)
+                        {
+                            <text>Solved on </text>@Html.Raw(Model.LocalTime(item.SolvedTime))
+                        }
+                        else if (@Model.Event.IsAnswerSubmissionActive)
+                        {
+                            <text>Submit Answer</text>
+                        }
+                        else
+                        {
+                            <text>See past submissions</text>
+                        }
+                    </a>
+                </td>
+                <td>
+                    <a asp-page="./Hints" asp-route-puzzleid="@item.ID" asp-route-teamId="@Model.TeamID">Hints</a>
+                </td>
+                @if (Model.AllowFeedback)
+                {
+                    <td>
+                        <a asp-Page="/Puzzles/SubmitFeedback" asp-route-puzzleid="@item.ID">Submit feedback</a>
+                    </td>
+                }
+            </tr>
+        }
     </tbody>
 </table>
 

ServerCore/Pages/Teams/Play.cshtml.cs

@@ -25,6 +25,8 @@ public PlayModel(PuzzleServerContext serverContext, UserManager<IdentityUser> us
 
         public IList<PuzzleView> PuzzleViews { get; set; }
 
+        public PuzzleStateFilter? StateFilter { get; set; }
+
         public int TeamID { get; set; }
 
         public SortOrder? Sort { get; set; }
@@ -35,7 +37,7 @@ public PlayModel(PuzzleServerContext serverContext, UserManager<IdentityUser> us
 
         public bool AllowFeedback { get; set; }
 
-        public async Task OnGetAsync(SortOrder? sort, int teamId)
+        public async Task OnGetAsync(SortOrder? sort, int teamId, PuzzleStateFilter? stateFilter)
         {
             TeamID = teamId;
             Team myTeam = await UserEventHelper.GetTeamForPlayer(_context, Event, LoggedInUser);
@@ -49,6 +51,7 @@ public async Task OnGetAsync(SortOrder? sort, int teamId)
                 throw new Exception("Not currently registered for a team");
             }
             this.Sort = sort;
+            this.StateFilter = stateFilter;
 
             ShowAnswers = Event.AnswersAvailableBegin <= DateTime.UtcNow;
             AllowFeedback = Event.AllowFeedback;
@@ -97,13 +100,18 @@ join PuzzleStatePerTeam pspt in stateForTeamQ on puzzle.ID equals pspt.PuzzleID
                     throw new ArgumentException($"unknown sort: {sort}");
             }
 
+            if (this.StateFilter == PuzzleStateFilter.Unsolved)
+            {
+                visiblePuzzlesQ = visiblePuzzlesQ.Where(puzzles => puzzles.SolvedTime == null);
+            }
+
             PuzzleViews = await visiblePuzzlesQ.ToListAsync();
 
             Dictionary<int, ContentFile> files = await (from file in _context.ContentFiles
                                                         where file.Event == Event && file.FileType == ContentFileType.Puzzle
                                                         select file).ToDictionaryAsync(file => file.PuzzleID);
 
-            foreach(var puzzleView in PuzzleViews)
+            foreach (var puzzleView in PuzzleViews)
             {
                 files.TryGetValue(puzzleView.ID, out ContentFile content);
                 puzzleView.Content = content;
@@ -112,8 +120,8 @@ join PuzzleStatePerTeam pspt in stateForTeamQ on puzzle.ID equals pspt.PuzzleID
             if (ShowAnswers)
             {
                 Dictionary<int, ContentFile> answers = await (from file in _context.ContentFiles
-                                                            where file.Event == Event && file.FileType == ContentFileType.Answer
-                                                            select file).ToDictionaryAsync(file => file.PuzzleID);
+                                                              where file.Event == Event && file.FileType == ContentFileType.Answer
+                                                              select file).ToDictionaryAsync(file => file.PuzzleID);
 
                 foreach (var puzzleView in PuzzleViews)
                 {
@@ -162,5 +170,11 @@ public enum SortOrder
             SolveAscending,
             SolveDescending
         }
+
+        public enum PuzzleStateFilter
+        {
+            All,
+            Unsolved
+        }
     }
 }