Commit 8218a4a2 by Vik Paruchuri

Show the right rubric, be more explicit about "next step"

parent b97dbc37
...@@ -286,6 +286,8 @@ class @CombinedOpenEnded ...@@ -286,6 +286,8 @@ class @CombinedOpenEnded
@answer_area.attr("disabled", true) @answer_area.attr("disabled", true)
@replace_text_inputs() @replace_text_inputs()
@hint_area.attr('disabled', true) @hint_area.attr('disabled', true)
if @task_number<@task_count
@gentle_alert "Your score did not meet the criteria to move to the next step."
else if @child_state == 'initial' else if @child_state == 'initial'
@answer_area.attr("disabled", false) @answer_area.attr("disabled", false)
@submit_button.prop('value', 'Submit') @submit_button.prop('value', 'Submit')
......
...@@ -556,10 +556,8 @@ class CombinedOpenEndedV1Module(): ...@@ -556,10 +556,8 @@ class CombinedOpenEndedV1Module():
if not can_see_rubric: if not can_see_rubric:
return {'html' : self.system.render_template('{0}/combined_open_ended_hidden_results.html'.format(self.TEMPLATE_DIR), {'error' : error}), 'success' : True, 'hide_reset' : True} return {'html' : self.system.render_template('{0}/combined_open_ended_hidden_results.html'.format(self.TEMPLATE_DIR), {'error' : error}), 'success' : True, 'hide_reset' : True}
loop_up_to_task = self.current_task_number + 1
contexts = [] contexts = []
for i in xrange(0, loop_up_to_task): response = self.get_last_response(self.current_task_number + 1)
response = self.get_last_response(i)
score_length = len(response['grader_types']) score_length = len(response['grader_types'])
for z in xrange(0,score_length): for z in xrange(0,score_length):
feedback = response['feedback_dicts'][z].get('feedback', '') feedback = response['feedback_dicts'][z].get('feedback', '')
...@@ -594,15 +592,6 @@ class CombinedOpenEndedV1Module(): ...@@ -594,15 +592,6 @@ class CombinedOpenEndedV1Module():
html = self.system.render_template('{0}/combined_open_ended_legend.html'.format(self.TEMPLATE_DIR), context) html = self.system.render_template('{0}/combined_open_ended_legend.html'.format(self.TEMPLATE_DIR), context)
return {'html': html, 'success': True} return {'html': html, 'success': True}
def get_status_ajax(self, _data):
"""
Gets the results of a given grader via ajax.
Input: AJAX data dictionary
Output: Dictionary to be rendered via ajax that contains the result html.
"""
html = self.get_status(True)
return {'html': html, 'success': True}
def handle_ajax(self, dispatch, data): def handle_ajax(self, dispatch, data):
""" """
This is called by courseware.module_render, to handle an AJAX call. This is called by courseware.module_render, to handle an AJAX call.
...@@ -618,7 +607,6 @@ class CombinedOpenEndedV1Module(): ...@@ -618,7 +607,6 @@ class CombinedOpenEndedV1Module():
'next_problem': self.next_problem, 'next_problem': self.next_problem,
'reset': self.reset, 'reset': self.reset,
'get_combined_rubric': self.get_rubric, 'get_combined_rubric': self.get_rubric,
'get_status': self.get_status_ajax,
'get_legend': self.get_legend, 'get_legend': self.get_legend,
'get_last_response': self.get_last_response_ajax, 'get_last_response': self.get_last_response_ajax,
'get_current_state': self.get_current_state, 'get_current_state': self.get_current_state,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment