Soup up grade_summary. Closes #3863.

 * Include rubric_assessments inline, rather than linking to submission page
 * Add link to "Show All Details", expands all rubric_assessments and comments sections

Change-Id: I93065908fa181a337a6497d5e3142324cfed6479
Reviewed-on: https://gerrit.instructure.com/3036
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>

Author: ccutrer

app/stylesheets/grade_summary.sass

@@ -21,6 +21,13 @@
   font-size: 0.8em
   padding-left: 30px
 
+#grades_summary tr.rubric_assessments>td
+  border-width: 0
+  padding-left: 30px
+  table.rubric
+    margin-top: 0
+    margin-bottom: 20px
+
 #grades_summary tr.editable:hover td 
   background-color: #cdf
 

app/views/gradebooks/grade_summary.html.erb

@@ -1,5 +1,5 @@
 <% 
-  jammit_js :grade_summary
+  jammit_js :grade_summary, :rubric_assessment
   jammit_css :grade_summary 
   content_for :page_title, "Grades for #{@student.name} - #{@context.name}" 
 %>
@@ -18,6 +18,9 @@
       <b>NOTE</b>: This is NOT your official score.<br/>
       <a href="#" class="button revert_all_scores_link"><%= image_tag "back.png" %> Revert to Actual Score</a>
     </div>
+    <div class="show_all_details" style="font-size: 0.8em; margin-top: 10px;">
+      <a href="#" class="button" id="show_all_details_link">Show All Details</a>
+    </div>
     <div style="margin-top: 10px;">
       <%= render :partial => "courses/sidebar_weighting", :object => @groups %>
       <div style="font-size: 0.8em;">
@@ -68,6 +71,8 @@
 <% turnitin_enabled = @context.turnitin_enabled? && @assignments.any?(&:turnitin_enabled) %>
 <% @assignments.each do |assignment| %>
   <% submission = @submissions.find {|s| s.assignment_id == assignment.id} %>
+  <% visible_rubric_assessments = [] %>
+  <% visible_rubric_assessments = submission.rubric_assessments.select{|a| a.grants_rights?(@current_user, :read)[:read]}.sort_by{|a| [a.assessment_type == 'grading' ? '0' : '1', a.assessor_name] } if submission %>
   <tr class="student_assignment <%= 'assignment_graded' if submission && submission.grade %> <%= assignment.special_class ? ("hard_coded " + assignment.special_class) : "editable" %>" id="<%= "submission_" + assignment.id.to_s %>">
     <td class="title">
       <% if assignment.class.to_s == "Assignment" %>
@@ -123,19 +128,21 @@
     <td class="possible points_possible" <%= "colspan='2'" if assignment.special_class %>><%= assignment.points_possible %></td>
     <% if !assignment.special_class %>
     <td style="padding-left: 10px; white-space: nowrap;">
-      <a href="#" class="toggle_comments_link tooltip" title="View comments and scoring details" style="<%= 'visibility: hidden;' unless submission && submission.submission_comments && !submission.submission_comments.empty? %>">
+      <% has_comments = submission && submission.submission_comments && !submission.submission_comments.empty? %>
+      <a href="#" class="toggle_comments_link tooltip" title="View comments and scoring details" style="<%= 'visibility: hidden;' unless has_comments %>">
         <span class="tooltip_wrap right">
           <span class="tooltip_text"><%= pluralize(submission && submission.submission_comments && submission.submission_comments.count, "comment") %></span>
         </span>
         <%= image_tag "word_bubble.png" %>
       </a>
-      <a href="#" class="toggle_comments_link tooltip" title="View Scoring Details" style="<%= 'visibility: hidden;' unless submission && submission.score && assignment.points_possible && assignment.points_possible > 0 %>">
+      <% has_scoring_details = submission && submission.score && assignment.points_possible && assignment.points_possible > 0 %>
+      <a href="#" class="toggle_comments_link tooltip" title="View Scoring Details" style="<%= 'visibility: hidden;' unless has_scoring_details %>">
         <span class="tooltip_wrap right">
           <span class="tooltip_text">See scoring details</span>
         </span>
         <%= image_tag "grading_icon.png", :style => "opacity: 0.5;" %>
       </a>
-      <a class="tooltip" title="View Rubric Evaluation" href="<%= context_url(assignment.context, :context_assignment_submission_url, assignment.id, submission ? submission.user_id : "{{ user_id }}") %>#rubric" style="<%= 'visibility: hidden;' unless submission && submission.rubric_assessment %>">
+      <a href="#" class="toggle_rubric_assessments_link tooltip" title="View Rubric Evaluation" style="<%= 'visibility: hidden;' if visible_rubric_assessments.empty? %>">
         <span class="tooltip_wrap right">
           <span class="tooltip_text">See rubric results</span>
         </span>
@@ -168,7 +175,7 @@
     </td>
     <% end %>
   </tr>
-  <% if !assignment.special_class %>
+  <% if !assignment.special_class && (has_comments || has_scoring_details) %>
     <tr class="comments <%= 'assignment_graded' if submission && submission.grade %>" style="display: none;">
       <td colspan="5" style="padding-bottom: 20px;">
         <% if assignment && assignment.points_possible && assignment.points_possible > 0 %>
@@ -250,6 +257,16 @@
         <% end %>
       </td>
     </tr>
+    <% unless visible_rubric_assessments.empty? %>
+      <tr class="rubric_assessments <%= 'assignment_graded' if submission && submission.grade %>" style="display: none;">
+        <td colspan="5">
+          <% visible_rubric_assessments.each do |assessment| %>
+            <div id="assessor" style="text-align: right; margin-bottom: 5px">Assessment by <%= assessment.assessor_name %></span>
+            <%= render :partial => "shared/rubric", :object => assessment.rubric, :locals => { :assessment => assessment } %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
   <% end %>
 <% end %>
 </table>
@@ -259,6 +276,7 @@
   end
 %>
 <div id="total_groups_weight" style="display: none;"><%= total_weight %></div>
+<%= render :partial => "shared/rubric_criterion_dialog" %>
 <input type="text" style="width: 40px; display: none;" id="grade_entry"/>
 <a href="#" id="revert_score_template" class="revert_score_link" title="Revert to original score"><%= image_tag "back.png" %></a>
 <a href="<%= context_url(@context, :context_assignment_submission_url, "{{ assignment_id }}", @student.id) %>" class="update_submission_url" style="display: none;">&nbsp;</a>

app/views/shared/_rubric.html.erb

@@ -74,7 +74,7 @@
 <tbody>
   <% if rubric && rubric.criteria %>
     <% rubric.criteria_object.each do |criterion| %>
-      <% rating = assessment.ratings.find{|r| r.criterion_id == criterion.id} rescue nil %>
+      <% rating = assessment.ratings.find{|r| r[:criterion_id] == criterion.id} rescue nil %>
       <%= render :partial => "shared/rubric_criterion", :object => criterion, :locals => {:assessing => assessing, :assessment_rating => rating, :rubric => rubric, :rubric_association => rubric_association, :edit_view => edit_view} %>
     <% end %>
   <% end %>
@@ -83,7 +83,7 @@
     <td colspan="4">
       <div style="float: right;" class="total_points_holder">
         <span style="padding-right: 10px;">Total Points: 
-          <span class="rubric_total"><%= assessing ? "0" : (rubric.points_possible rescue 5) %></span>
+          <span class="rubric_total"><%= assessment ? assessment.score : (rubric.points_possible rescue 5) %></span>
           <span class="assessing">out of <%= rubric.points_possible rescue 5 %></span>
         </span>
       </div>

app/views/shared/_rubric_criterion.html.erb

@@ -1,4 +1,4 @@
-<% criterion = rubric_criterion || nil; assessing ||= false; rubric ||= nil; rubric_association ||= nil; edit_view ||= false %>
+<% criterion = rubric_criterion || nil; assessing ||= false; rubric ||= nil; rubric_association ||= nil; edit_view ||= false; assessment_rating ||= nil %>
 <tr id="criterion_<%= criterion ? criterion.id : "blank" %>" class="criterion <%= "blank" unless criterion %> <%= 'ignore_criterion_for_scoring' if criterion && criterion.ignore_for_scoring %> <%= 'learning_outcome_criterion' if criterion && criterion.learning_outcome_id %>" style="<%= hidden unless criterion %>">
   <td class="criterion_description">
   <div class="container">
@@ -82,13 +82,13 @@
     </div>
     <div class="displaying">
       <span style="white-space: nowrap;">
-        <span class="criterion_rating_points_holder" style="display: none;">
-          <span class="criterion_rating_points">&nbsp;</span> / 
+        <span class="criterion_rating_points_holder" style="<%= hidden unless assessment_rating %>">
+          <span class="criterion_rating_points"><%= assessment_rating ? assessment_rating[:points] : nbsp %></span> /
         </span>
         <span class="display_criterion_points"><%= criterion.points rescue 5 %></span> pts<br />
       </span>
       <% if rubric && !rubric.free_form_criterion_comments %>
-        <a href="#" class="<%= 'empty' if edit_view %> no-hover criterion_comments" title="Additional Comments"><%= image_tag "rubric_comment.png" %></a>
+        <a href="#" class="<%= 'empty' if edit_view || (assessment_rating && assessment_rating[:comments].blank?)%> no-hover criterion_comments" title="Additional Comments"><%= image_tag "rubric_comment.png" %></a>
       <% end %>
     </div>
     <div class="ignoring">

public/javascripts/grade_summary.js

@@ -225,6 +225,10 @@
       event.preventDefault();
       $(this).parents("tr.student_assignment").next("tr.comments").toggle();
     });
+    $(".toggle_rubric_assessments_link").click(function(event) {
+      event.preventDefault();
+      $(this).parents("tr.student_assignment").next("tr.comments").next("tr.rubric_assessments").toggle();
+    });
     $(".student_assignment.editable .assignment_score").click(function(event) {
       if($("#grades_summary.editable").length === 0 || $(this).find("#grade_entry").length > 0 || $(event.target).closest('.revert_score_link').length > 0) {
         return;
@@ -350,6 +354,11 @@
     $("#only_consider_graded_assignments").change(function() {
       updateStudentGrades();
     }).triggerHandler('change');
+    $("#show_all_details_link").click(function(event) {
+      event.preventDefault();
+      $("tr.comments").show();
+      $("tr.rubric_assessments").show();
+    });
     $.scrollSidebar();
   });
-})();
+})();