Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge edit cleanup, nothing new

Browse Source
This commit is contained in:
marco
2013-08-02 14:30:04 -04:00
parent ec99e20a35 932bbd2592
commit 478fa18beb
4 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
View File

@@ -560,7 +560,7 @@ class @CombinedOpenEnded
collapse_question: (event) =>
@prompt_container.slideToggle()
@prompt_container.toggleClass('open')
if @question_header.text() == "(Hide)"
if @question_header.text() == "Hide Prompt"
new_text = "Show Prompt"
Logger.log 'oe_hide_question', {location: @location}
else
@@ -622,4 +622,10 @@ class @CombinedOpenEnded
toggle_rubric: (event) =>
info_rubric_elements = @$(@info_rubric_elements_sel)
info_rubric_elements.slideToggle()
@rubric_header = @$(@rubric_collapse_sel)
if @rubric_header.text() == "(Hide)"
new_text = "(Show)"
else
new_text = "(Hide)"
@rubric_header.text(new_text)
return false

38
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
View File

@@ -452,7 +452,6 @@ class CombinedOpenEndedV1Module():
def extract_human_name_from_task(self, task_xml):
tree = etree.fromstring(task_xml)
log.info(etree.tostring(tree))
payload = tree.xpath("/openended/openendedparam/grader_payload")
if len(payload)==0:
task_name = "selfassessment"
@@ -503,26 +502,29 @@ class CombinedOpenEndedV1Module():
"""
all_responses = []
loop_up_to_task = self.current_task_number + 1
contexts = []
for i in xrange(0, loop_up_to_task):
all_responses.append(self.get_last_response(i))
rubric_scores = [all_responses[i]['rubric_scores'] for i in xrange(0, len(all_responses)) if
len(all_responses[i]['rubric_scores']) > 0 and all_responses[i]['grader_types'][
0] in HUMAN_GRADER_TYPE.keys()]
grader_types = [all_responses[i]['grader_types'] for i in xrange(0, len(all_responses)) if
len(all_responses[i]['grader_types']) > 0 and all_responses[i]['grader_types'][
0] in HUMAN_GRADER_TYPE.keys()]
feedback_items = [all_responses[i]['feedback_items'] for i in xrange(0, len(all_responses)) if
len(all_responses[i]['feedback_items']) > 0 and all_responses[i]['grader_types'][
0] in HUMAN_GRADER_TYPE.keys()]
rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
rubric_scores,
grader_types, feedback_items)
response = self.get_last_response(i)
rubric_scores = None
if len(response['rubric_scores']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
rubric_scores = [response['rubric_scores']]
grader_types = None
if len(response['grader_types']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
grader_types = [response['grader_types']]
feedback_items = None
if len(response['feedback_items']) > 0 and response['grader_types'][0] in HUMAN_GRADER_TYPE.keys():
feedback_items = [response['feedback_items']]
if feedback_items is not None and grader_types is not None and rubric_scores is not None:
rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']),
rubric_scores,
grader_types, feedback_items)
contexts.append({
'result': rubric_html,
'task_name': 'Scored rubric'
})
response_dict = all_responses[-1]
context = {
'results': rubric_html,
'task_name': 'Scored Rubric',
'class_name': 'combined-rubric-container'
'results': contexts,
}
html = self.system.render_template('{0}/combined_open_ended_results.html'.format(self.TEMPLATE_DIR), context)
return {'html': html, 'success': True}