Commit b72532bf by Stephen Sanchez

Cleaning up some files that should have never made it to master

parent e44b501c
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<article class="peer-assessment" id="peer-assessment--001"> <article class="peer-assessment" id="peer-assessment--001">
<header class="peer-assessment__header"> <header class="peer-assessment__header">
<h3 class="peer-assessment__title">Assessment # <h3 class="peer-assessment__title">Assessment #
<span class="peer-assessment__number--current">{{ graded }}</span> of <span class="peer-assessment__number--current">{{ review_num }}</span> of
<span class="peer-assessment__number--required">{{ must_grade }}</span> <span class="peer-assessment__number--required">{{ must_grade }}</span>
</h3> </h3>
......
{% extends "openassessmentblock/peer/oa_peer_assessment.html" %}
{% block list_item %}
<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment is--collapsed ui-toggle-visibility">
{% endblock %}
{% block body %}
{% endblock %}
{% extends "openassessmentblock/response/oa_response.html" %}
{% block list_item %}
<li id="openassessment__response" class="openassessment__steps__step step--response ui-toggle-visibility">
{% endblock %}
{% block body %}
{% endblock %}
{% extends "openassessmentblock/self/oa_self_assessment.html" %}
{% block list_item %}
<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment">
{% endblock %}
{% block body %}
{% endblock %}
...@@ -113,6 +113,12 @@ UI_MODELS = { ...@@ -113,6 +113,12 @@ UI_MODELS = {
"class_id": "openassessment__self-assessment", "class_id": "openassessment__self-assessment",
"navigation_text": "Your assessment of your response", "navigation_text": "Your assessment of your response",
"title": "Assess Your Response" "title": "Assess Your Response"
},
"grade": {
"name": "grade",
"class_id": "openassessment__grade",
"navigation_text": "Your grade for this problem",
"title": "Your grade for this problem"
} }
} }
...@@ -233,7 +239,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse ...@@ -233,7 +239,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
""" """
trace = self.get_xblock_trace() trace = self.get_xblock_trace()
ui_models = self._create_ui_models() ui_models = self._create_ui_models()
grade_state = self.get_grade_state()
# All data we intend to pass to the front end. # All data we intend to pass to the front end.
context_dict = { context_dict = {
"xblock_trace": trace, "xblock_trace": trace,
...@@ -241,7 +246,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse ...@@ -241,7 +246,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
"question": self.prompt, "question": self.prompt,
"rubric_criteria": self.rubric_criteria, "rubric_criteria": self.rubric_criteria,
"rubric_assessments": ui_models, "rubric_assessments": ui_models,
"grade_state": grade_state,
} }
template = get_template("openassessmentblock/oa_base.html") template = get_template("openassessmentblock/oa_base.html")
...@@ -265,6 +269,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse ...@@ -265,6 +269,7 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
for assessment in self.rubric_assessments: for assessment in self.rubric_assessments:
ui_model = UI_MODELS[assessment["name"]] ui_model = UI_MODELS[assessment["name"]]
ui_models.append(dict(assessment, **ui_model)) ui_models.append(dict(assessment, **ui_model))
ui_models.append(UI_MODELS["grade"])
return ui_models return ui_models
@staticmethod @staticmethod
...@@ -302,17 +307,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse ...@@ -302,17 +307,6 @@ class OpenAssessmentBlock(XBlock, SubmissionMixin, PeerAssessmentMixin, SelfAsse
block = sparser.parse() block = sparser.parse()
return block return block
def get_grade_state(self):
# TODO: Placeholder for workflow state.
grade_state = {
"style_class": "is--incomplete",
"value": "Incomplete",
"title": "Your Grade:",
"message": "You have not started this problem",
}
return grade_state
def render_assessment(self, path, context_dict=None): def render_assessment(self, path, context_dict=None):
"""Render an Assessment Module's HTML """Render an Assessment Module's HTML
......
...@@ -86,6 +86,7 @@ class PeerAssessmentMixin(object): ...@@ -86,6 +86,7 @@ class PeerAssessmentMixin(object):
assessment["must_grade"] assessment["must_grade"]
) )
context_dict["graded"] = count context_dict["graded"] = count
context_dict["review_num"] = count + 1
if finished: if finished:
path = "openassessmentblock/peer/oa_peer_complete.html" path = "openassessmentblock/peer/oa_peer_complete.html"
elif student_submission: elif student_submission:
...@@ -97,7 +98,7 @@ class PeerAssessmentMixin(object): ...@@ -97,7 +98,7 @@ class PeerAssessmentMixin(object):
if assessment["must_grade"] - count == 1: if assessment["must_grade"] - count == 1:
context_dict["submit_button_text"] = "Submit your assessment & move onto next step." context_dict["submit_button_text"] = "Submit your assessment & move onto next step."
else: else:
context_dict["submit_button_text"] = "Submit your assessment & move to response #{}".format(count + 1) context_dict["submit_button_text"] = "Submit your assessment & move to response #{}".format(count + 2)
problem_open, date = self.is_open() problem_open, date = self.is_open()
if not problem_open and date == "due" and not finished: if not problem_open and date == "due" and not finished:
......
...@@ -23,7 +23,6 @@ class SelfAssessmentMixin(object): ...@@ -23,7 +23,6 @@ class SelfAssessmentMixin(object):
if student_submission: if student_submission:
path = 'openassessmentblock/self/oa_self_assessment.html' path = 'openassessmentblock/self/oa_self_assessment.html'
context_dict = { context_dict = {
"rubric_instructions": self.rubric_instructions,
"rubric_criteria": self.rubric_criteria, "rubric_criteria": self.rubric_criteria,
"estimated_time": "20 minutes", # TODO: Need to configure this. "estimated_time": "20 minutes", # TODO: Need to configure this.
"self_submission": student_submission, "self_submission": student_submission,
......
...@@ -122,22 +122,6 @@ function OpenAssessmentBlock(runtime, element) { ...@@ -122,22 +122,6 @@ function OpenAssessmentBlock(runtime, element) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: renderPeerCollapseUrl,
success: function(data) {
$('#openassessment__peer-assessment', element).replaceWith(data);
}
});
$.ajax({
type: "POST",
url: renderSelfCollapseUrl,
success: function(data) {
$('#openassessment__self-assessment', element).replaceWith(data);
}
});
$.ajax({
type: "POST",
url: renderPeerUrl, url: renderPeerUrl,
success: function(data) { success: function(data) {
$(peerListItem, element).replaceWith(data); $(peerListItem, element).replaceWith(data);
......
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