Correctly display orphaned annotations on viewFeedback page (#1658)

* fixed issue where error occurred on viewFeedback if there's an orphaned problem

* allow instructors/CA's to see annotations

* updated getProblemNameWithId label to 'deleted problem(s)' for consistency, allow orphaned annotations to be deleted

* put comment back

Co-authored-by: Damian Ho <damian_ho_xu_yang@yahoo.com>

Author: michellexliu

app/assets/javascripts/annotations.js

@@ -429,7 +429,7 @@ var initializeAnnotationsForCode = function () {
 function getProblemNameWithId(problem_id) {
   var problem_id = parseInt(problem_id, 10);
   var problem = _.findWhere(problems, { "id": problem_id });
-  if (problem == undefined) return "General";
+  if (problem == undefined) return "Deleted Problem(s)";
   return problem.name;
 }
 

app/models/annotation.rb

@@ -33,6 +33,9 @@ def update_non_autograded_score
       submission_id, problem_id
     )
 
+    # Associated problem was deleted
+    return if score.problem_id && score.problem.nil?
+
     # Ensure that problem is non-autograded
     return if score.grader_id == 0
 

app/views/assessments/viewFeedback.html.erb

@@ -15,14 +15,14 @@
       </div>
       <pre><%= @score.feedback %></pre>
     </div>
-    <% if @submission.annotations.count > 0 and @problemReleased %>
+    <% if @submission.annotations.count > 0 and (@cud.instructor? or @cud.course_assistant? or @problemReleased) %>
     <div class="result-pane">
       <div class="feedback-header">
         <h2 style="margin-top: 1em">Remarks</h2>
       </div>
       <% subs_by_problem = @submission.annotations.group_by(&:problem)
           subs_by_problem.each do |problem, annotations| %>
-          <b> <%= problem.name %> </b>
+          <b> <%= problem.nil? ? "Deleted Problem(s)" : problem.name %> </b>
           <ul class="collection">
           <%# use custom sort b/c using ordering doesn't work with autograder output, archived files %>
             <%