Commit 68eb8025 by Vik Paruchuri

Remove images from status bar after finding out that they run afoul of the…

Remove images from status bar after finding out that they run afoul of the rewriting of static links.  Need to send them back via ajax to avoid
parent f5fcd3e1
...@@ -21,7 +21,7 @@ from .xml_module import XmlDescriptor ...@@ -21,7 +21,7 @@ from .xml_module import XmlDescriptor
from xmodule.modulestore import Location from xmodule.modulestore import Location
import self_assessment_module import self_assessment_module
import open_ended_module import open_ended_module
from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError, GRADER_TYPE_IMAGE_DICT
from .stringify import stringify_children from .stringify import stringify_children
import dateutil import dateutil
import dateutil.parser import dateutil.parser
...@@ -477,6 +477,7 @@ class CombinedOpenEndedV1Module(): ...@@ -477,6 +477,7 @@ class CombinedOpenEndedV1Module():
'rubric_scores' : rubric_scores, 'rubric_scores' : rubric_scores,
'grader_types' : grader_types, 'grader_types' : grader_types,
'feedback_items' : feedback_items, 'feedback_items' : feedback_items,
'grader_type' : grader_types[0],
} }
return last_response_dict return last_response_dict
...@@ -647,7 +648,7 @@ class CombinedOpenEndedV1Module(): ...@@ -647,7 +648,7 @@ class CombinedOpenEndedV1Module():
task_data = self.get_last_response(i) task_data = self.get_last_response(i)
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} context = {'status_list': status, 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT}
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
......
...@@ -7,6 +7,7 @@ GRADER_TYPE_IMAGE_DICT = { ...@@ -7,6 +7,7 @@ GRADER_TYPE_IMAGE_DICT = {
'SA' : '/static/images/self_assessment_icon.png', 'SA' : '/static/images/self_assessment_icon.png',
'PE' : '/static/images/peer_grading_icon.png', 'PE' : '/static/images/peer_grading_icon.png',
'ML' : '/static/images/ml_grading_icon.png', 'ML' : '/static/images/ml_grading_icon.png',
'IN' : '/static/images/peer_grading_icon.png',
} }
class RubricParsingError(Exception): class RubricParsingError(Exception):
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
<div class="statusitem" data-status-number="${i}"> <div class="statusitem" data-status-number="${i}">
%endif %endif
${status['human_task']} (${status['human_state']}) ${status['score']} / ${status['max_score']} <% grader_image = grader_type_image_dict[status['grader_type']]%>
${status['human_task']}(${status['human_state']}) ${status['score']} / ${status['max_score']}
</div> </div>
%endfor %endfor
</section> </section>
......
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