From 0351dbb56044171cd0c18e2bcdda9cd9bf66f36f Mon Sep 17 00:00:00 2001
From: Jeremy Vercillo <jvercill@cs.washington.edu>
Date: Wed, 16 Jan 2019 21:52:18 -0800
Subject: [PATCH 1/3] Feedback pages user work. - If a user has already
 submitted feedback it will seed the page with what they submitted last time.
 - When they resubmit it will update instead of duplicating. - Shows user that
 submitted each piece of feedback in author view - Aggregates all feedback in
 author view

---
 ServerCore/DataModel/Feedback.cs              |  2 +-
 ServerCore/Pages/Puzzles/Feedback.cshtml      | 20 ++++++++-
 ServerCore/Pages/Puzzles/Feedback.cshtml.cs   |  2 +-
 .../Pages/Puzzles/SubmitFeedback.cshtml       |  4 +-
 .../Pages/Puzzles/SubmitFeedback.cshtml.cs    | 45 +++++++++++++++----
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/ServerCore/DataModel/Feedback.cs b/ServerCore/DataModel/Feedback.cs
index 9d9e3af3..f4846cde 100644
--- a/ServerCore/DataModel/Feedback.cs
+++ b/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; }
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml b/ServerCore/Pages/Puzzles/Feedback.cshtml
index 3c501dd6..e782643d 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml
+++ b/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>
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml.cs b/ServerCore/Pages/Puzzles/Feedback.cshtml.cs
index c07c9a02..fa37d7b0 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml.cs
+++ b/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) 
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index 2cc6a0e2..26a37177 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/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");
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index d1b32a4e..a1791df9 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/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");

From f726094659b35cc300cfd5bac2109aa2db646083 Mon Sep 17 00:00:00 2001
From: Jeremy Vercillo <jvercill@cs.washington.edu>
Date: Tue, 22 Jan 2019 16:53:46 -0800
Subject: [PATCH 2/3] Addressed comments for feedback PR.

---
 ServerCore/Pages/Puzzles/Feedback.cshtml      | 15 ++-------------
 ServerCore/Pages/Puzzles/Feedback.cshtml.cs   | 19 +++++++++++++++++--
 .../Pages/Puzzles/SubmitFeedback.cshtml       |  4 ++--
 .../Pages/Puzzles/SubmitFeedback.cshtml.cs    | 13 ++++++++++++-
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml b/ServerCore/Pages/Puzzles/Feedback.cshtml
index e782643d..b9417904 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml
+++ b/ServerCore/Pages/Puzzles/Feedback.cshtml
@@ -8,25 +8,14 @@
     ViewData["PlayRoute"] = "../Puzzles/SubmitFeedback";
     ViewData["RoutingPuzzleId"] = ViewContext.RouteData.Values["puzzleId"];
     Layout = "_puzzleManagementLayout.cshtml";
-
-    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>
+    <h3><b>Avg Fun Rating:</b> @Model.FunScore</h3>
     <br>
-    <h3><b>Avg Difficulty Rating:</b> @sumDiff</h3>
+    <h3><b>Avg Difficulty Rating:</b> @Model.DiffScore</h3>
 </div>
 
 <br>
diff --git a/ServerCore/Pages/Puzzles/Feedback.cshtml.cs b/ServerCore/Pages/Puzzles/Feedback.cshtml.cs
index fa37d7b0..b5bddd23 100644
--- a/ServerCore/Pages/Puzzles/Feedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/Feedback.cshtml.cs
@@ -7,7 +7,7 @@
 using Microsoft.EntityFrameworkCore;
 using ServerCore.DataModel;
 using ServerCore.ModelBases;
-
+using System.ComponentModel.DataAnnotations;
 namespace ServerCore.Pages.Puzzles
 {
     /// <summary>
@@ -23,6 +23,10 @@ public FeedbackModel(PuzzleServerContext serverContext, UserManager<IdentityUser
 
         public IList<Feedback> Feedbacks { get; set; }
         public Puzzle Puzzle { get; set; }
+        [DisplayFormat(DataFormatString = "{0:n2}", ApplyFormatInEditMode = true)]
+        public double FunScore;
+        [DisplayFormat(DataFormatString = "{0:n2}", ApplyFormatInEditMode = true)]
+        public double DiffScore;
 
         /// <summary>
         /// Gets the feedback and puzzle associated with the given ID
@@ -34,8 +38,19 @@ public async Task<IActionResult> OnGetAsync(int puzzleId)
 
             if (Puzzle == null) 
             { 
-                return NotFound(); 
+                return NotFound("Could not find puzzle for this feedback page."); 
+            }
+            
+            FunScore = 0.0;
+            DiffScore = 0.0;
+            var count = 0;
+            foreach (var item in Feedbacks) {
+                FunScore += item.Fun;
+                DiffScore += item.Difficulty;
+                count++;
             }
+            FunScore /= count;
+            DiffScore /= count;
 
             return Page();
         }
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index 26a37177..5336a736 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/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" step="1" class="slider" id="difficultySlider">
+                <input asp-for="Feedback.Difficulty" type="range" min="@Model.MinRating" max="@Model.MaxRating" 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" step="1" class="slider" id="funSlider">
+                <input asp-for="Feedback.Fun" type="range" min="@Model.MinRating" max="@Model.MaxRating" step="1" class="slider" id="funSlider">
                 <label id="funLabel">NULL</label>
                 <script>
                     var funslider = document.getElementById("funSlider");
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index a1791df9..092b5368 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
@@ -20,6 +20,8 @@ public SubmitFeedbackModel(PuzzleServerContext serverContext, UserManager<Identi
         [BindProperty]
         public Feedback Feedback { get; set; }  
         public Puzzle Puzzle { get; set; }
+        public int MinRating = 0;
+        public int MaxRating = 10;
 
         /// <summary>
         /// Gets the submit feedback page for a puzzle
@@ -55,6 +57,15 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 return Page();
             }
 
+            if (Feedback.Fun < MinRating)
+                Feedback.Fun = MinRating;
+            if (Feedback.Fun > MaxRating)
+                Feedback.Fun = MaxRating;
+            if (Feedback.Difficulty < MinRating)
+                Feedback.Difficulty = MinRating;
+            if (Feedback.Difficulty > MaxRating)
+                Feedback.Difficulty = MaxRating;
+
             Feedback editableFeedback = await _context.Feedback.Where((f) => f.Puzzle.ID == puzzleId && f.Submitter == LoggedInUser).FirstOrDefaultAsync();
             if (editableFeedback == null)
             {
@@ -63,7 +74,7 @@ public async Task<IActionResult> OnPostAsync(int puzzleId)
                 Feedback.Puzzle = await _context.Puzzles.Where(m => m.ID == puzzleId).FirstOrDefaultAsync();
                 if (Feedback.Puzzle == null)
                 {
-                    return NotFound();
+                    return NotFound("Could not find puzzle for this feedback submission.");
                 }
                 _context.Feedback.Add(Feedback);
             }

From a273cfbdc6b62e2ab6073fc36e86a081d0899bcd Mon Sep 17 00:00:00 2001
From: Jeremy Vercillo <jvercill@cs.washington.edu>
Date: Wed, 23 Jan 2019 18:43:21 -0800
Subject: [PATCH 3/3] Updated the textbox to a textarea and 1-based the
 feedback scales.

---
 ServerCore/Pages/Puzzles/SubmitFeedback.cshtml    | 3 ++-
 ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
index 5336a736..d66379d1 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml
@@ -21,7 +21,7 @@
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
             <div class="form-group">
                 <label asp-for="Feedback.WrittenFeedback" class="control-label"></label>
-                <input asp-for="Feedback.WrittenFeedback" class="form-control" />
+                <textarea asp-for="Feedback.WrittenFeedback" class="form-control" rows="6"></textarea>
                 <span asp-validation-for="Feedback.WrittenFeedback" class="text-danger"></span>
             </div>
             <div class="form-group">
@@ -58,6 +58,7 @@
                 <input type="submit" value="Create" class="btn btn-default" />
             </div>
         </form>
+        <p>*Feedback is not anonymous, but is only visible to the puzzle author(s) and event admins.</p>
     </div>
 </div>
 
diff --git a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
index 092b5368..a827baac 100644
--- a/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
+++ b/ServerCore/Pages/Puzzles/SubmitFeedback.cshtml.cs
@@ -20,7 +20,7 @@ public SubmitFeedbackModel(PuzzleServerContext serverContext, UserManager<Identi
         [BindProperty]
         public Feedback Feedback { get; set; }  
         public Puzzle Puzzle { get; set; }
-        public int MinRating = 0;
+        public int MinRating = 1;
         public int MaxRating = 10;
 
         /// <summary>