ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "add graded anonymously indicator to grade summary page" 

This reverts commit 3442e94b46.

Adding a whole column to the top level list of this page put
too much attention on something that most institutions don't
use or care about. So we're removing it.

fixes CNVS-25718
refs CNVS-21538

test plan:
 - student grade summary page should no longer show "graded
   anonymously" column.
 - student grade page should still work and look good in all its various
   configurations.

Change-Id: I2933bb55c6839bfa01f09c3d403f103a6e95eb6c
Reviewed-on: https://gerrit.instructure.com/68504
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Ryan Allen <rallen@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
This commit is contained in:
Jon Willesen 2015-12-08 22:07:30 +00:00
parent d239d5a531
commit 1dd8167084
4 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/presenters/grade_summary_assignment_presenter.rb
View File

@ -23,13 +23,6 @@ class GradeSummaryAssignmentPresenter
!assignment.muted?
end
def graded_anonymously_status
return '' if submission.blank?
submission.graded_anonymously ?
I18n.t('#grade_summary.yes', "yes") :
I18n.t('#grade_summary.no', "no")
end
def is_letter_graded?
assignment.grading_type == 'letter_grade'
end

16
app/stylesheets/bundles/grade_summary.scss
View File

@ -127,7 +127,7 @@
}
#grades_summary th.possible {
text-align: center;
text-align: right;
white-space: nowrap;
}
@ -142,19 +142,7 @@
}
#grades_summary td.possible {
text-align: center;
white-space: nowrap;
}
#grades_summary th.anonymous {
text-align: center;
white-space: nowrap;
padding-right: 15px;
}
#grades_summary td.anonymous {
text-align: center;
white-space: nowrap;
text-align: right;
padding-right: 15px;
}

8
app/views/gradebooks/grade_summary.html.erb
View File

@ -134,7 +134,6 @@
<th scope="col"><%= t('headers.due', "Due") %></th>
<th scope="col" class="assignment_score"><%= t('headers.score', "Score") %></th>
<th scope="col" class="possible"><%= t('headers.out_of', "Out of") %></th>
<th scope="col" class="anonymous"><%= t('headers.anonymous', "Graded Anonymously") %></th>
<th scope="col"><span class="screenreader-only"><%= t('headers.details', "Details") %></span></th>
</tr>
</thead>
@ -232,7 +231,6 @@
</div>
</td>
<td class="possible points_possible" <%= "colspan='2'".html_safe if assignment.special_class %>><%= assignment.points_possible %></td>
<td class="anonymous"><%= assignment_presenter.graded_anonymously_status %></td>
<% if !assignment.special_class %>
<td class="details">
<a href="#" class="toggle_comments_link tooltip" aria-label="<%= t(:comment_count_screenreader, 'Read comments') %>" <% if assignment_presenter.has_comments? %>aria-expanded="false" aria-controls="comments_thread_<%= assignment.id %>"<% else %>aria-hidden='true' role='presentation' tabindex='-1'<% end %> style="<%= 'visibility: hidden;' unless assignment_presenter.has_comments? %>">
@ -280,7 +278,7 @@
<%# always add row (even if empty) so javascript references work %>
<tr id="grade_info_<%= assignment.id %>" class="comments grade_details <%= 'assignment_graded' if assignment_presenter.graded? %>" style="display: none;">
<% if assignment_presenter.should_display_details? %>
<td colspan="6" style="padding-bottom: 20px;">
<td colspan="5" style="padding-bottom: 20px;">
<% if assignment_presenter.has_grade_distribution? && can_view_distribution %>
<table id="score_details_<%= assignment.id %>" class="score_details_table">
<thead>
@ -336,7 +334,7 @@
<% end %>
</tr>
<tr id="comments_thread_<%= assignment.id %>" class="comments comments_thread <%= 'assignment_graded' if assignment_presenter.graded? %>" style="display: none;">
<td colspan="6">
<td colspan="5">
<% if assignment_presenter.has_comments? %>
<table class="score_details_table">
<thead>
@ -383,7 +381,7 @@
</tr>
<tr id="rubric_<%= assignment.id %>" class="rubric_assessments <%= 'assignment_graded' if submission && submission.grade %>" style="display: none;">
<% if assignment_presenter.has_rubric_assessments? %>
<td colspan="6">
<td colspan="5">
<% assignment_presenter.rubric_assessments.each do |assessment| %>
<div class="assessor" style="text-align: right; margin-bottom: 5px">
<% if assignment.anonymous_peer_reviews %>

13
spec/selenium/grades_spec.rb
View File

@ -55,7 +55,7 @@ describe "grades" do
#second student submission
@student_2_submission = @first_assignment.submit_homework(@student_2, :body => 'second student second submission')
@first_assignment.grade_student(@student_2, :grade => 4, :graded_anonymously => true)
@first_assignment.grade_student(@student_2, :grade => 4)
@student_2_submission.score = 3
@submission.save!
@ -171,17 +171,6 @@ describe "grades" do
driver.execute_script '$("#grade_entry").blur()'
end
it "shows the assignment was not graded anonymously" do
get "/courses/#{@course.id}/grades"
expect(f("#submission_#{@first_assignment.id} .anonymous").text).to eq 'no'
end
it "shows the assignment was graded anonymously" do
user_session(@student_2)
get "/courses/#{@course.id}/grades"
expect(f("#submission_#{@first_assignment.id} .anonymous").text).to eq 'yes'
end
it "should display rubric on assignment", priority: "1", test_id: 229661 do
get "/courses/#{@course.id}/grades"