Skip to content

E
edx-ora2
Commit af955d54 by Stephen Sanchez Committed by Brian Talbot
Options

Adding a bunch of collapsed templates and javascript to load them.

parent 4ebacb89
Showing with 85 additions and 46 deletions
apps/openassessment/templates/openassessmentblock/oa_peer_assessment.html
...@@ -72,4 +72,5 @@ ...@@ -72,4 +72,5 @@
</li> </li>
</ul> </ul>
</div> </div>
{% endblock %}
</li> </li>
apps/openassessment/templates/openassessmentblock/oa_peer_assessment_collapsed.html 0 → 100644
{% extends "openassessmentblock/oa_peer_assessment.html" %}
{% block body %}
{% endblock %}
apps/openassessment/templates/openassessmentblock/oa_response_collapsed.html 0 → 100644
{% extends "openassessmentblock/oa_response.html" %}
{% block body %}
{% endblock %}
\ No newline at end of file
apps/openassessment/templates/openassessmentblock/oa_self_assessment.html
...@@ -26,61 +26,60 @@ ...@@ -26,61 +26,60 @@
<span class="step_status_value">Incomplete</span> <span class="step_status_value">Incomplete</span>
</span> </span>
</header> </header>
{% block body %}
<div class="step--content"> <div class="step--content">
<article class="self-assessment" id="self-assessment"> <article class="self-assessment" id="self-assessment">
<header class="self-assessment__header"> <header class="self-assessment__header">
<h3 class="self-assessment__title">Your Submitted Response</h3> <h3 class="self-assessment__title">Your Submitted Response</h3>
</header> </header>
<!-- ?: markup validating/copy cleaning upon submission --> <!-- ?: markup validating/copy cleaning upon submission -->
<div class="self-assessment__response"> <div class="self-assessment__response">
{{ self_submission.answer }} {{ self_submission.answer }}
</div> </div>
<form id="self-assessment--001__assessment" class="self-assessment__assessment" method="post"> <form id="self-assessment--001__assessment" class="self-assessment__assessment" method="post">
<fieldset class="assessment__fields"> <fieldset class="assessment__fields">
<legend class="assessment__instruction">{{ rubric_instructions }}</legend> <legend class="assessment__instruction">{{ rubric_instructions }}</legend>
<ol class="list list--fields assessment__rubric"> <ol class="list list--fields assessment__rubric">
{% for criterion in rubric_criteria %} {% for criterion in rubric_criteria %}
<!-- individual rubric question (radio-based choice) --> <!-- individual rubric question (radio-based choice) -->
<li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}"> <li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}">
<h4 class="question__title"> <h4 class="question__title">
{{ criterion.instructions }} {{ criterion.instructions }}
<span class="label--required">* <span class="sr">(Required)</span></span> <span class="label--required">* <span class="sr">(Required)</span></span>
</h4> </h4>
<ol class="question__answers"> <ol class="question__answers">
{% for value, text in criterion.options %} {% for value, text in criterion.options %}
<li class="answer"> <li class="answer">
<div class="wrapper--input"> <div class="wrapper--input">
<input type="radio" name="assessment__rubric__question--{{ criterion.name }}" id="assessment__rubric__question--{{ criterion.name }}--01" class="answer__value" value="answer--001__option--01 - Very Well" /> <input type="radio" name="assessment__rubric__question--{{ criterion.name }}" id="assessment__rubric__question--{{ criterion.name }}--01" class="answer__value" value="answer--001__option--01 - Very Well" />
<label for="assessment__rubric__question--001__option--01" class="answer__label">({{ value }}) {{ text }}</label> <label for="assessment__rubric__question--001__option--01" class="answer__label">({{ value }}) {{ text }}</label>
</div> </div>
<span class="answer__tip">TODO: Criterion Instructions</span> <span class="answer__tip">TODO: Criterion Instructions</span>
</li> </li>
{% endfor %} {% endfor %}
</ol> </ol>
</li> </li>
{% endfor %} {% endfor %}
<!-- individual rubric question (text) --> <!-- individual rubric question (text) -->
<li class="field field--textarea assessment__rubric__question" id="assessment__rubric__question--004"> <li class="field field--textarea assessment__rubric__question" id="assessment__rubric__question--004">
<label for="assessment__rubric__question--004__value">Please provide any other feedback you have around this response</label> <label for="assessment__rubric__question--004__value">Please provide any other feedback you have around this response</label>
<textarea id="assessment__rubric__question--004__value" placeholder="I felt this response was..."></textarea> <textarea id="assessment__rubric__question--004__value" placeholder="I felt this response was..."></textarea>
</li> </li>
</ol> </ol>
</fieldset> </fieldset>
<ul class="list list--actions"> <ul class="list list--actions">
<li class="list--actions__item"> <li class="list--actions__item">
<button type="submit" id="self-assessment--001__assessment__submit" class="action action--submit">Submit your assessment</button> <button type="submit" id="self-assessment--001__assessment__submit" class="action action--submit">Submit your assessment</button>
</li> </li>
</ul> </ul>
</form> </form>
</article> </article>
</li>
</ul>
</div> </div>
{% endblock %}
</li> </li>
apps/openassessment/templates/openassessmentblock/oa_self_assessment_collapsed.html 0 → 100644
{% extends "openassessmentblock/oa_self_assessment.html" %}
{% block body %}
{% endblock %}
apps/openassessment/xblock/peer_assessment_mixin.py
...@@ -99,3 +99,7 @@ class PeerAssessmentMixin(object): ...@@ -99,3 +99,7 @@ class PeerAssessmentMixin(object):
for assessment in self.rubric_assessments: for assessment in self.rubric_assessments:
if assessment["name"] == mixin_name: if assessment["name"] == mixin_name:
return assessment return assessment
@XBlock.handler
def render_peer_assessment_collapsed(self, data, suffix=''):
return self.render_assessment("openassessmentblock/oa_peer_assessment_collapsed.html")
apps/openassessment/xblock/self_assessment_mixin.py
...@@ -18,3 +18,7 @@ class SelfAssessmentMixin(object): ...@@ -18,3 +18,7 @@ class SelfAssessmentMixin(object):
def render_self_assessment(self, data, suffix=''): def render_self_assessment(self, data, suffix=''):
return self.render_assessment('openassessmentblock/oa_self_assessment.html') return self.render_assessment('openassessmentblock/oa_self_assessment.html')
@XBlock.handler
def render_self_assessment_collapsed(self, data, suffix=''):
return self.render_assessment("openassessmentblock/oa_self_assessment_collapsed.html")
apps/openassessment/xblock/static/js/src/oa_base.js
...@@ -29,7 +29,6 @@ function OpenAssessmentBlock(runtime, element) { ...@@ -29,7 +29,6 @@ function OpenAssessmentBlock(runtime, element) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: renderSubmissionUrl, url: renderSubmissionUrl,
dataType: "html",
success: function(data) { success: function(data) {
render_submissions(data); render_submissions(data);
} }
...@@ -99,6 +98,22 @@ function OpenAssessmentBlock(runtime, element) { ...@@ -99,6 +98,22 @@ function OpenAssessmentBlock(runtime, element) {
render_submissions(data); render_submissions(data);
} }
}); });
$.ajax({
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);
}
});
}); });
} }
/* END Javascript for OpenAssessmentXBlock. */ /* END Javascript for OpenAssessmentXBlock. */
apps/openassessment/xblock/submission_mixin.py
...@@ -167,3 +167,7 @@ class SubmissionMixin(object): ...@@ -167,3 +167,7 @@ class SubmissionMixin(object):
path = 'openassessmentblock/oa_response_closed.html' path = 'openassessmentblock/oa_response_closed.html'
return self.render_assessment(path, context_dict=context) return self.render_assessment(path, context_dict=context)
@XBlock.handler
def render_submission_collapsed(self, data, suffix=''):
return self.render_assessment("openassessmentblock/oa_response_collapsed.html")
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