Commit 3eb18a9e by Vik Paruchuri

Fix status display/make it more robust, and fix module render error

parent 85324ec8
...@@ -355,7 +355,7 @@ class CombinedOpenEndedV1Module(): ...@@ -355,7 +355,7 @@ class CombinedOpenEndedV1Module():
'state': self.state, 'state': self.state,
'task_count': len(self.task_xml), 'task_count': len(self.task_xml),
'task_number': self.current_task_number + 1, 'task_number': self.current_task_number + 1,
'status': self.get_status(), 'status': self.get_status(False),
'display_name': self.display_name, 'display_name': self.display_name,
'accept_file_upload': self.accept_file_upload, 'accept_file_upload': self.accept_file_upload,
'legend_list' : LEGEND_LIST, 'legend_list' : LEGEND_LIST,
...@@ -621,7 +621,7 @@ class CombinedOpenEndedV1Module(): ...@@ -621,7 +621,7 @@ class CombinedOpenEndedV1Module():
Input: AJAX get dictionary Input: AJAX get dictionary
Output: Dictionary to be rendered via ajax that contains the result html. Output: Dictionary to be rendered via ajax that contains the result html.
""" """
html = self.get_status() html = self.get_status(True)
return {'html': html, 'success': True} return {'html': html, 'success': True}
def handle_ajax(self, dispatch, get): def handle_ajax(self, dispatch, get):
...@@ -705,7 +705,7 @@ class CombinedOpenEndedV1Module(): ...@@ -705,7 +705,7 @@ class CombinedOpenEndedV1Module():
return json.dumps(state) return json.dumps(state)
def get_status(self): def get_status(self, render_via_ajax):
""" """
Gets the status panel to be displayed at the top right. Gets the status panel to be displayed at the top right.
Input: None Input: None
...@@ -717,7 +717,12 @@ class CombinedOpenEndedV1Module(): ...@@ -717,7 +717,12 @@ class CombinedOpenEndedV1Module():
task_data.update({'task_number': i + 1}) task_data.update({'task_number': i + 1})
status.append(task_data) status.append(task_data)
context = {'status_list': status, 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT, 'legend_list' : LEGEND_LIST} context = {
'status_list': status,
'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
'legend_list' : LEGEND_LIST,
'render_via_ajax' : render_via_ajax,
}
status_html = self.system.render_template("combined_open_ended_status.html", context) status_html = self.system.render_template("combined_open_ended_status.html", context)
return status_html return status_html
......
...@@ -192,7 +192,9 @@ class @CombinedOpenEnded ...@@ -192,7 +192,9 @@ class @CombinedOpenEnded
@next_problem_button.hide() @next_problem_button.hide()
@hide_file_upload() @hide_file_upload()
@hint_area.attr('disabled', false) @hint_area.attr('disabled', false)
@show_status_current() if @task_number>1 or @child_state!='initial'
@show_status_current()
if @task_number==1 and @child_state=='assessing' if @task_number==1 and @child_state=='assessing'
@prompt_hide() @prompt_hide()
if @child_state == 'done' if @child_state == 'done'
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%else: %else:
<div class="statusitem" data-status-number="${i}"> <div class="statusitem" data-status-number="${i}">
%endif %endif
%if status['grader_type'] in grader_type_image_dict: %if status['grader_type'] in grader_type_image_dict and render_via_ajax:
<% grader_image = grader_type_image_dict[status['grader_type']]%> <% grader_image = grader_type_image_dict[status['grader_type']]%>
<img src="${grader_image}" title=${status['human_grader_type']}> <img src="${grader_image}" title=${status['human_grader_type']}>
%else: %else:
......
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