Feedback pages improvements

ServerCore/DataModel/Feedback.cs

@@ -11,7 +11,7 @@ public class Feedback
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
         public Puzzle Puzzle { get; set; }
-        public User Submitter {get; set;}
+        public PuzzleUser Submitter {get; set;}
         public DateTime SubmissionTime { get; set; }
         public string WrittenFeedback { get; set; }
         public int Difficulty { get; set; }

ServerCore/Pages/Puzzles/Feedback.cshtml

@@ -8,11 +8,29 @@
     ViewData["PlayRoute"] = "../Puzzles/SubmitFeedback";
     ViewData["RoutingPuzzleId"] = ViewContext.RouteData.Values["puzzleId"];
     Layout = "_puzzleManagementLayout.cshtml";
-    var id = ViewContext.RouteData.Values["id"];
+
+    var sumFun = 0.0;
+    var sumDiff = 0.0;
+    var count = 0;
+    foreach (var item in Model.Feedbacks) {
+        sumFun += item.Fun;
+        sumDiff += item.Difficulty;
+        count++;
+    }
+    sumFun /= count;
+    sumDiff /= count;
 }
 
 <h2>@Html.DisplayFor(model => model.Puzzle.Name): Feedback</h2>
 
+<div>
+    <h3><b>Avg Fun Rating:</b> @sumFun</h3>
+    <br>
+    <h3><b>Avg Difficulty Rating:</b> @sumDiff</h3>
+</div>
+
+<br>
+
 <table class="table">
     <thead>
         <tr>

ServerCore/Pages/Puzzles/Feedback.cshtml.cs

@@ -29,7 +29,7 @@ public FeedbackModel(PuzzleServerContext serverContext, UserManager<IdentityUser
         /// </summary>
         public async Task<IActionResult> OnGetAsync(int puzzleId)
         {
-            Feedbacks = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId).ToListAsync();
+            Feedbacks = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId).Include("Submitter").ToListAsync();
             Puzzle = await _context.Puzzles.Where((p) => p.ID == puzzleId).FirstOrDefaultAsync();
 
             if (Puzzle == null) 

ServerCore/Pages/Puzzles/SubmitFeedback.cshtml

@@ -26,7 +26,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Difficulty" class="control-label"></label>
-                <input asp-for="Feedback.Difficulty" type="range" min="0" max="10" value="5" step="1" class="slider" id="difficultySlider">
+                <input asp-for="Feedback.Difficulty" type="range" min="0" max="10" step="1" class="slider" id="difficultySlider">
                 <label id="difficultyLabel">NULL</label>
                 <script>
                     var diffslider = document.getElementById("difficultySlider");
@@ -41,7 +41,7 @@
             </div>
             <div class="form-group">
                 <label asp-for="Feedback.Fun" class="control-label"></label>
-                <input asp-for="Feedback.Fun" type="range" min="0" max="10" value="5" step="1" class="slider" id="funSlider">
+                <input asp-for="Feedback.Fun" type="range" min="0" max="10" step="1" class="slider" id="funSlider">
                 <label id="funLabel">NULL</label>
                 <script>
                     var funslider = document.getElementById("funSlider");

ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -9,6 +10,7 @@
 
 namespace ServerCore.Pages.Puzzles
 {
+//    [Authorize(Policy = "PlayerIsOnTeam, PlayerCanSeePuzzle")] // TODO: These auth checks not working currently.
     public class SubmitFeedbackModel : EventSpecificPageModel
     {
         public SubmitFeedbackModel(PuzzleServerContext serverContext, UserManager<IdentityUser> userManager) : base(serverContext, userManager)
@@ -31,6 +33,15 @@ public async Task<IActionResult> OnGetAsync(int puzzleId)
                 return NotFound();
             }
 
+            // Seed existing feedback page
+            Feedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
+            if (Feedback == null)
+            {
+                Feedback = new Feedback();
+                Feedback.Fun = 5;
+                Feedback.Difficulty = 5;
+            }
+
             return Page();
         }
 
@@ -44,15 +55,33 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 return Page();
             }
 
-            Feedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
-
-            if (Feedback.Puzzle == null) 
-            { 
-                return NotFound(); 
-            } 
+            Feedback editableFeedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
+            if (editableFeedback == null)
+            {
+                Feedback.SubmissionTime = DateTime.UtcNow;
+                Feedback.Submitter = LoggedInUser;
+                Feedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
+                if (Feedback.Puzzle == null)
+                {
+                    return NotFound();
+                }
+                _context.Feedback.Add(Feedback);
+            }
+            else
+            {
+                editableFeedback.SubmissionTime = DateTime.UtcNow;
+                editableFeedback.Submitter = LoggedInUser;
+                editableFeedback.Difficulty = Feedback.Difficulty;
+                editableFeedback.Fun = Feedback.Fun;
+                editableFeedback.WrittenFeedback = Feedback.WrittenFeedback;
+                editableFeedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
+                if (editableFeedback.Puzzle == null)
+                {
+                    return NotFound();
+                }
+                _context.Attach(editableFeedback).State = EntityState.Modified;
+            }
 
-            Feedback.SubmissionTime = DateTime.UtcNow;
-            _context.Feedback.Add(Feedback);
             await _context.SaveChangesAsync();
 
             return RedirectToPage("/Teams/Play");