From 309ac7aa5c1f217f0f5b85cbbbeba0938e4e0268 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 31 Jan 2013 13:27:46 -0500 Subject: [PATCH 01/11] Refactor rubric CSS into a single file. --- .../css/combinedopenended/display.scss | 41 --------------- lms/static/sass/course.scss | 1 + lms/static/sass/course/_rubric.scss | 52 +++++++++++++++++++ lms/static/sass/course/_staff_grading.scss | 47 +---------------- 4 files changed, 54 insertions(+), 87 deletions(-) create mode 100644 lms/static/sass/course/_rubric.scss diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss index a4045c9dad..1917471879 100644 --- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss +++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss @@ -231,47 +231,6 @@ div.result-container { } } -div.result-container, section.open-ended-child { - .rubric { - margin-bottom:25px; - tr { - margin:10px 0px; - height: 100%; - } - td { - padding: 20px 0px 25px 0px; - margin: 10px 0px; - height: 100%; - } - th { - padding: 5px; - margin: 5px; - } - label, - .view-only { - margin:2px; - position: relative; - padding: 10px 15px 25px 15px; - width: 145px; - height:100%; - display: inline-block; - min-height: 50px; - min-width: 50px; - background-color: #CCC; - font-size: .85em; - } - .grade { - position: absolute; - bottom:0px; - right:0px; - margin:10px; - } - .selected-grade { - background: #666; - color: white; - } - } -} section.open-ended-child { @media print { diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss index e900e589b2..d5f620be82 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss @@ -44,6 +44,7 @@ @import "course/gradebook"; @import "course/tabs"; @import "course/staff_grading"; +@import "course/rubric"; // instructor @import "course/instructor/instructor"; diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss new file mode 100644 index 0000000000..c82d929fac --- /dev/null +++ b/lms/static/sass/course/_rubric.scss @@ -0,0 +1,52 @@ +.rubric { + padding: 40px 0px; + tr { + margin:10px 0px; + height: 100%; + } + td { + padding: 20px 0px 25px 0px; + height: 100%; + border: 1px black solid; + } + th { + padding: 5px; + margin: 5px; + text-align: center; + } + .points-header th { + padding: 0px; + } + label, + .view-only { + margin:2px; + position: relative; + padding: 15px 15px 25px 15px; + width: 130px; + height:100%; + min-height: 50px; + min-width: 50px; + font-size: .9em; + background-color: white; + display: block; + } + .grade { + position: absolute; + bottom:0px; + right:0px; + margin:10px; + } + .selected-grade { + background: #666; + color: white; + } + input[type=radio]:checked + label { + background: #666; + color: white; } + input[class='score-selection'] { + position: relative; + margin-left: 10px; + font-size: 16px; + } +} + diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss index 177bd9e5e2..4d4da484de 100644 --- a/lms/static/sass/course/_staff_grading.scss +++ b/lms/static/sass/course/_staff_grading.scss @@ -12,7 +12,7 @@ div.peer-grading{ label { margin: 10px; padding: 5px; - display: inline-block; + @include inline-block; min-width: 50px; background-color: #CCC; text-size: 1.5em; @@ -176,49 +176,4 @@ div.peer-grading{ } } padding: 40px; - .rubric { - tr { - margin:10px 0px; - height: 100%; - } - td { - padding: 20px 0px 25px 0px; - height: 100%; - } - th { - padding: 5px; - margin: 5px; - } - label, - .view-only { - margin:2px; - position: relative; - padding: 15px 15px 25px 15px; - width: 150px; - height:100%; - display: inline-block; - min-height: 50px; - min-width: 50px; - background-color: #CCC; - font-size: .9em; - } - .grade { - position: absolute; - bottom:0px; - right:0px; - margin:10px; - } - .selected-grade { - background: #666; - color: white; - } - input[type=radio]:checked + label { - background: #666; - color: white; } - input[class='score-selection'] { - display: none; - } - } - } - From 683976d7adf4eebedd84894d79b13572072f8dfb Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 31 Jan 2013 13:28:19 -0500 Subject: [PATCH 02/11] Add scores to the top of the rubric, remove from individual cells --- common/lib/xmodule/xmodule/combined_open_ended_rubric.py | 5 ++++- lms/templates/open_ended_rubric.html | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py index 4380e32d5b..50ec22f033 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py @@ -25,10 +25,13 @@ class CombinedOpenEndedRubric(object): ''' try: rubric_categories = self.extract_categories(rubric_xml) + max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories) + max_score = max(max_scores) html = self.system.render_template('open_ended_rubric.html', {'categories' : rubric_categories, 'has_score': self.has_score, - 'view_only': self.view_only}) + 'view_only': self.view_only, + 'max_score': max_score}) except: raise RubricParsingError("[render_rubric] Could not parse the rubric with xml: {0}".format(rubric_xml)) return html diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html index 8d40c7d2b8..b92ad04bde 100644 --- a/lms/templates/open_ended_rubric.html +++ b/lms/templates/open_ended_rubric.html @@ -8,6 +8,14 @@

Select the criteria you feel best represents this submission in each category.

% endif + + + % for i in range(max_score + 1): + + % endfor + % for i in range(len(categories)): <% category = categories[i] %> @@ -23,7 +31,6 @@
% endif ${option['text']} -
[${option['points']} points]
% else: From 2e0f90081eb12c822b603861cbf86e8e34601866 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 31 Jan 2013 14:23:17 -0500 Subject: [PATCH 03/11] Make rubric cleaner and visually simpler --- lms/static/sass/course/_rubric.scss | 17 ++++++++--------- lms/templates/open_ended_rubric.html | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss index c82d929fac..9aa0ca2f2a 100644 --- a/lms/static/sass/course/_rubric.scss +++ b/lms/static/sass/course/_rubric.scss @@ -1,5 +1,5 @@ .rubric { - padding: 40px 0px; + margin: 40px 0px; tr { margin:10px 0px; height: 100%; @@ -8,6 +8,7 @@ padding: 20px 0px 25px 0px; height: 100%; border: 1px black solid; + text-align: center; } th { padding: 5px; @@ -17,13 +18,11 @@ .points-header th { padding: 0px; } - label, - .view-only { - margin:2px; + .rubric-label + { position: relative; - padding: 15px 15px 25px 15px; + padding: 15px 15px 25px; width: 130px; - height:100%; min-height: 50px; min-width: 50px; font-size: .9em; @@ -40,9 +39,9 @@ background: #666; color: white; } - input[type=radio]:checked + label { - background: #666; - color: white; } + input[type=radio]:checked + .rubric-label { + background: white; + color: $base-font-color; } input[class='score-selection'] { position: relative; margin-left: 10px; diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html index b92ad04bde..a2d8d6945c 100644 --- a/lms/templates/open_ended_rubric.html +++ b/lms/templates/open_ended_rubric.html @@ -26,15 +26,15 @@ % if view_only: ## if this is the selected rubric block, show it highlighted % if option['selected']: -
+
% else: -
+
% endif ${option['text']}
% else: - + % endif % endfor From 6575386d6992bea4e68332370d0e9de13180c861 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 08:43:55 -0500 Subject: [PATCH 04/11] Refactor rubric JS so that we don't have to keep duplicating this code. --- .../js/src/combinedopenended/display.coffee | 29 +++++++++++++++ .../peer_grading/peer_grading_problem.coffee | 15 ++------ .../src/staff_grading/staff_grading.coffee | 37 ++++--------------- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 594efe2f9b..c4560559c8 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -1,3 +1,32 @@ +class @Rubric + constructor: () -> + + # finds the scores for each rubric category + @get_score_list: () => + # find the number of categories: + num_categories = $('table.rubric tr').length + + score_lst = [] + # get the score for each one + for i in [0..(num_categories-2)] + score = $("input[name='score-selection-#{i}']:checked").val() + score_lst.push(score) + + return score_lst + + @get_total_score: () -> + score_lst = @get_score_list() + + @check_complete: () -> + # check to see whether or not any categories have not been scored + num_categories = $('table.rubric tr').length + # -2 because we want to skip the header + for i in [0..(num_categories-2)] + score = $("input[name='score-selection-#{i}']:checked").val() + if score == undefined + return false + return true + class @CombinedOpenEnded constructor: (element) -> @element=element diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index c4b87eb30e..525891bb03 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -239,7 +239,7 @@ class PeerGradingProblem score_lst = [] # get the score for each one - for i in [0..(num_categories-1)] + for i in [0..(num_categories-2)] score = $("input[name='score-selection-#{i}']:checked").val() score_lst.push(score) @@ -315,17 +315,10 @@ class PeerGradingProblem # called after a grade is selected on the interface graded_callback: (event) => - @grade = $("input[name='grade-selection']:checked").val() - if @grade == undefined - return # check to see whether or not any categories have not been scored - num_categories = $('table.rubric tr').length - for i in [0..(num_categories-1)] - score = $("input[name='score-selection-#{i}']:checked").val() - if score == undefined - return - # show button if we have scores for all categories - @show_submit_button() + if Rubric.check_complete(): + # show button if we have scores for all categories + @show_submit_button() diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee index 005a8e682e..2d3cafd3e7 100644 --- a/lms/static/coffee/src/staff_grading/staff_grading.coffee +++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee @@ -232,35 +232,14 @@ class @StaffGrading graded_callback: () => - @grade = $("input[name='grade-selection']:checked").val() - if @grade == undefined - return - # check to see whether or not any categories have not been scored - num_categories = $('table.rubric tr').length - for i in [0..(num_categories-1)] - score = $("input[name='score-selection-#{i}']:checked").val() - if score == undefined - return - # show button if we have scores for all categories - @state = state_graded - @submit_button.show() + # show button if we have scores for all categories + if Rubric.check_complete() + @state = state_graded + @submit_button.show() set_button_text: (text) => @action_button.attr('value', text) - # finds the scores for each rubric category - get_score_list: () => - # find the number of categories: - num_categories = $('table.rubric tr').length - - score_lst = [] - # get the score for each one - for i in [0..(num_categories-1)] - score = $("input[name='score-selection-#{i}']:checked").val() - score_lst.push(score) - - return score_lst - ajax_callback: (response) => # always clear out errors and messages on transition. @error_msg = '' @@ -285,8 +264,8 @@ class @StaffGrading skip_and_get_next: () => data = - score: @grade - rubric_scores: @get_score_list() + score: Rubric.get_total_score() + rubric_scores: Rubric.get_score_list() feedback: @feedback_area.val() submission_id: @submission_id location: @location @@ -299,8 +278,8 @@ class @StaffGrading submit_and_get_next: () -> data = - score: @grade - rubric_scores: @get_score_list() + score: Rubric.get_total_score() + rubric_scores: Rubric.get_score_list() feedback: @feedback_area.val() submission_id: @submission_id location: @location From f05bda764470b80873937cb8573cf3db27228137 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 08:44:08 -0500 Subject: [PATCH 05/11] Visual updates to rubric --- lms/static/sass/course/_rubric.scss | 3 ++- lms/templates/open_ended_rubric.html | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss index 9aa0ca2f2a..722a790e6d 100644 --- a/lms/static/sass/course/_rubric.scss +++ b/lms/static/sass/course/_rubric.scss @@ -35,7 +35,8 @@ right:0px; margin:10px; } - .selected-grade { + .selected-grade, + .selected-grade .rubric-label { background: #666; color: white; } diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html index a2d8d6945c..eb3fc564b4 100644 --- a/lms/templates/open_ended_rubric.html +++ b/lms/templates/open_ended_rubric.html @@ -22,14 +22,14 @@
% for j in range(len(category['options'])): <% option = category['options'][j] %> + %if option['selected']: +
+ ${i} points +
${category['description']} + %else: + % endif % if view_only: ## if this is the selected rubric block, show it highlighted - % if option['selected']: -
- % else:
- % endif ${option['text']}
% else: From 0ec3be18155d5136aeade3139686f04c07b6d8a4 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 10:17:16 -0500 Subject: [PATCH 06/11] Calculate the total score from the rubric. --- .../xmodule/xmodule/js/src/combinedopenended/display.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index c4560559c8..576fb7290d 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -16,6 +16,10 @@ class @Rubric @get_total_score: () -> score_lst = @get_score_list() + tot = 0 + for score in score_lst + tot += parseInt(score) + return tot @check_complete: () -> # check to see whether or not any categories have not been scored From cb44918f4958ebef6cd70bb8d1e760c534f046ea Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 10:31:46 -0500 Subject: [PATCH 07/11] Remove duplicate Javascript and remove total grade selection. --- .../peer_grading/peer_grading_problem.coffee | 35 ++----------------- .../src/staff_grading/staff_grading.coffee | 15 -------- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index 525891bb03..f4b9bdbe78 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -232,23 +232,11 @@ class PeerGradingProblem fetch_submission_essay: () => @backend.post('get_next_submission', {location: @location}, @render_submission) - # finds the scores for each rubric category - get_score_list: () => - # find the number of categories: - num_categories = $('table.rubric tr').length - - score_lst = [] - # get the score for each one - for i in [0..(num_categories-2)] - score = $("input[name='score-selection-#{i}']:checked").val() - score_lst.push(score) - - return score_lst construct_data: () -> data = - rubric_scores: @get_score_list() - score: @grade + rubric_scores: Rubric.get_score_list() + score: Rubric.get_total_score() location: @location submission_id: @essay_id_input.val() submission_key: @submission_key_input.val() @@ -316,7 +304,7 @@ class PeerGradingProblem # called after a grade is selected on the interface graded_callback: (event) => # check to see whether or not any categories have not been scored - if Rubric.check_complete(): + if Rubric.check_complete() # show button if we have scores for all categories @show_submit_button() @@ -439,25 +427,8 @@ class PeerGradingProblem setup_score_selection: (max_score) => - # first, get rid of all the old inputs, if any. - @score_selection_container.html(""" -

Overall Score

-

Choose an overall score for this submission.

- """) - - # Now create new labels and inputs for each possible score. - for score in [0..max_score] - id = 'score-' + score - label = """""" - - input = """ - - """ # " fix broken parsing in emacs - @score_selection_container.append(input + label) - # And now hook up an event handler again $("input[name='score-selection']").change @graded_callback - $("input[name='grade-selection']").change @graded_callback diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee index 2d3cafd3e7..117388bab0 100644 --- a/lms/static/coffee/src/staff_grading/staff_grading.coffee +++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee @@ -212,21 +212,6 @@ class @StaffGrading setup_score_selection: => - # first, get rid of all the old inputs, if any. - @grade_selection_container.html(""" -

Overall Score

-

Choose an overall score for this submission.

- """) - # Now create new labels and inputs for each possible score. - for score in [0..@max_score] - id = 'score-' + score - label = """""" - input = """ - - """ # " fix broken parsing in emacs - @grade_selection_container.append(input + label) - $('.grade-selection').click => @graded_callback() - @score_selection_container.html(@rubric) $('.score-selection').click => @graded_callback() From 1fef6b161b767fddc88aac4194cfac7792b82cd0 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 11:21:56 -0500 Subject: [PATCH 08/11] Add in some better encouragement to write feedback --- lms/templates/instructor/staff_grading.html | 1 + lms/templates/peer_grading/peer_grading_problem.html | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html index 56aed5a54a..dcfece34b8 100644 --- a/lms/templates/instructor/staff_grading.html +++ b/lms/templates/instructor/staff_grading.html @@ -75,6 +75,7 @@

+

Written Feedback

diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index cb9ed1c0fb..ae630f118e 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -70,7 +70,9 @@

- From 2b764eebad0dd892f894ca3abb7f68b0be3e63c1 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 11:27:53 -0500 Subject: [PATCH 09/11] Make the rubric for self-assessment selectable and remove the separate grade selection. --- .../js/src/combinedopenended/display.coffee | 6 +++--- .../xmodule/xmodule/self_assessment_module.py | 2 +- .../src/peer_grading/peer_grading_problem.coffee | 1 - lms/templates/self_assessment_rubric.html | 16 ---------------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 576fb7290d..9add338137 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -208,9 +208,9 @@ class @CombinedOpenEnded save_assessment: (event) => event.preventDefault() - if @child_state == 'assessing' - checked_assessment = @$('input[name="grade-selection"]:checked') - data = {'assessment' : checked_assessment.val()} + if @child_state == 'assessing' && Rubric.check_complete() + checked_assessment = Rubric.get_total_score() + data = {'assessment' : checked_assessment} $.postWithPrefix "#{@ajax_url}/save_assessment", data, (response) => if response.success @child_state = response.state diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py index fb1d306708..a288fa55b3 100644 --- a/common/lib/xmodule/xmodule/self_assessment_module.py +++ b/common/lib/xmodule/xmodule/self_assessment_module.py @@ -122,7 +122,7 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild): if self.state == self.INITIAL: return '' - rubric_renderer = CombinedOpenEndedRubric(system, True) + rubric_renderer = CombinedOpenEndedRubric(system, False) rubric_html = rubric_renderer.render_rubric(self.rubric) # we'll render it diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index f4b9bdbe78..f803c74c7b 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -426,7 +426,6 @@ class PeerGradingProblem @submit_button.show() setup_score_selection: (max_score) => - # And now hook up an event handler again $("input[name='score-selection']").change @graded_callback diff --git a/lms/templates/self_assessment_rubric.html b/lms/templates/self_assessment_rubric.html index b4fc125232..2986c5041a 100644 --- a/lms/templates/self_assessment_rubric.html +++ b/lms/templates/self_assessment_rubric.html @@ -2,20 +2,4 @@
${rubric | n }
- - % if not read_only: -
-

Scoring

-

Please select a score below:

- -
- %for i in xrange(0,max_score+1): - <% id = "score-{0}".format(i) %> - - - %endfor -
-
- % endif - From 91d9bc05be2f20a8b09ebe1de9b6ae8edf2018d0 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 13:06:12 -0500 Subject: [PATCH 10/11] Fix bug in the callback --- lms/static/coffee/src/peer_grading/peer_grading_problem.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index f803c74c7b..05d0189ac8 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -427,7 +427,7 @@ class PeerGradingProblem setup_score_selection: (max_score) => # And now hook up an event handler again - $("input[name='score-selection']").change @graded_callback + $("input[class='score-selection']").change @graded_callback From 00ffbc070adeb605d58efce4478969d620c06b0e Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 1 Feb 2013 14:34:09 -0500 Subject: [PATCH 11/11] Make rubrics spacing smaller and fix a bug in the grading service renderer --- lms/djangoapps/open_ended_grading/grading_service.py | 2 +- lms/static/sass/course/_rubric.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/open_ended_grading/grading_service.py b/lms/djangoapps/open_ended_grading/grading_service.py index f65554a9d6..8e6209bf38 100644 --- a/lms/djangoapps/open_ended_grading/grading_service.py +++ b/lms/djangoapps/open_ended_grading/grading_service.py @@ -115,7 +115,7 @@ class GradingService(object): response_json = json.loads(response) if 'rubric' in response_json: rubric = response_json['rubric'] - rubric_renderer = CombinedOpenEndedRubric(self.system, False) + rubric_renderer = CombinedOpenEndedRubric(self.system, view_only) rubric_html = rubric_renderer.render_rubric(rubric) response_json['rubric'] = rubric_html return response_json diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss index 722a790e6d..5048d70253 100644 --- a/lms/static/sass/course/_rubric.scss +++ b/lms/static/sass/course/_rubric.scss @@ -21,7 +21,7 @@ .rubric-label { position: relative; - padding: 15px 15px 25px; + padding: 0px 15px 15px 15px; width: 130px; min-height: 50px; min-width: 50px;