Skip to content

E
edx-ora2
Commit b240280b by Brian Talbot
Options

proofing complete grade state

parent 1d55c981
Showing with 61 additions and 68 deletions
apps/openassessment/templates/openassessmentblock/grade/oa_grade_complete.html
...@@ -14,17 +14,6 @@ ...@@ -14,17 +14,6 @@
<div class="ui-toggle-visibility__content"> <div class="ui-toggle-visibility__content">
<div class="step__content"> <div class="step__content">
<!-- PLACEHOLDER: @talbs, you can overwrite this with the actual template -->
<!-- <div class="openassessment__feedback">
{% for asmnt in assessments %}
<div class="openassessment__peer_assessment_{{ forloop.counter }}">
<div>Peer #{{ forloop.counter }}</div>
<div>Feedback: {{ asmnt.feedback }}</div>
</div>
{% endfor %}
</div> -->
<article class="submission__answer__display"> <article class="submission__answer__display">
<h3 class="submission__answer__display__title">Your Submitted Response</h3> <h3 class="submission__answer__display__title">Your Submitted Response</h3>
...@@ -37,59 +26,62 @@ ...@@ -37,59 +26,62 @@
<h3 class="submission__peer-evaluations__title">Peer Evaluations Of Your Response</h3> <h3 class="submission__peer-evaluations__title">Peer Evaluations Of Your Response</h3>
<ol class="list submission__peer-evaluations__questions"> <ol class="list submission__peer-evaluations__questions">
{% for criterion in rubric_criteria %} {% for criterion in rubric_criteria %}
{% with criterion_num=forloop.counter %} {% with criterion_num=forloop.counter %}
<li class="question question--{{ criterion_num }} ui-toggle-visibility"> <li class="question question--{{ criterion_num }} ui-toggle-visibility">
<h4 class="question__title ui-toggle-visibility__control"> <h4 class="question__title ui-toggle-visibility__control">
<span class="question__title__copy">{{ criterion.name }}</span> <span class="question__title__copy">{{ criterion.name }}</span>
<span class="question__score"> <span class="question__score">
<span class="label sr">Overall Question Score</span> <span class="label sr">Overall Question Score</span>
<span class="question__score__value">{{ criterion.median_score }}</span> <span class="question__score__value">{{ criterion.median_score }}</span>
<span class="label label--divider sr">out of</span> <span class="label label--divider sr">out of</span>
<span class="question__score__potential"> <span class="question__score__potential">
{{ criterion.total_value }} {{ criterion.total_value }}
<span class="unit">Points</span> <span class="unit">Points</span>
</span> </span>
</span> </span>
</h4> </h4>
<ul class="question__answers ui-toggle-visibility__content"> <ul class="question__answers ui-toggle-visibility__content">
{% for assessment in peer_assessments %} {% for assessment in peer_assessments %}
{% with peer_num=forloop.counter %} {% with peer_num=forloop.counter %}
{% for part in assessment.parts %} {% for part in assessment.parts %}
{% if part.option.criterion.name == criterion.name %} {% if part.option.criterion.name == criterion.name %}
<li class="answer peer-assessment--{{ peer_num}}" <li class="answer peer-assessment--{{ peer_num}}"
id="question--{{ criterion_num }}__answer-{{ peer_num }}"> id="question--{{ criterion_num }}__answer-{{ peer_num }}">
<h5 class="answer__title"> <h5 class="answer__title">
<span class="answer__source"> <span class="answer__source">
<span class="label sr">Assessor: </span> <span class="label sr">Assessor: </span>
<span class="value">Peer {{ peer_num }}</span> <span class="value">Peer {{ peer_num }}</span>
</span> </span>
<span class="answer__value"> <span class="answer__value">
<span class="label sr">Peer's Assessment: </span> <span class="label sr">Peer's Assessment: </span>
<span class="value">{{ part.option.name }}</span> <span class="value">{{ part.option.name }}</span>
</span>
</h5>
<span class="answer__content">
{{ part.option.explanation }}
</span> </span>
</h5> </li>
<span class="answer__content"> {% endif %}
{{ part.option.explanation }} {% endfor %}
</span> {% endwith %}
</li> {% endfor %}
{% endif %} </ul>
{% endfor %} </li>
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
</ul> <li class="question question--feedback ui-toggle-visibility">
</li> <h4 class="question__title ui-toggle-visibility__control">
{% endwith %} <span class="question__title__copy">Additional feedback on your response</span>
{% endfor %} </h4>
<li class="question question--001 question--feedback ui-toggle-visibility">
<h4 class="question__title ui-toggle-visibility__control">How well did this response answer the overall question?</h4>
{% for assessment in peer_assessments %}
{% with peer_num=forloop.counter %}
{% if assessment.feedback %}
<ul class="question__answers ui-toggle-visibility__content"> <ul class="question__answers ui-toggle-visibility__content">
<li class="answer peer-evaluation--{{ peer_num }}" id="question--001__answer-{{ peer_num }}"> {% for assessment in peer_assessments %}
{% with peer_num=forloop.counter %}
{% if assessment.feedback %}
<li class="answer peer-evaluation--{{ peer_num }}" id="question--feedback__answer-{{ peer_num }}">
<h5 class="answer__title"> <h5 class="answer__title">
<span class="answer__source"> <span class="answer__source">
<span class="label sr">Evaluator: </span> <span class="label sr">Evaluator: </span>
...@@ -104,10 +96,11 @@ ...@@ -104,10 +96,11 @@
</div> </div>
</div> </div>
</li> </li>
{% endif %}
{% endwith %}
{% endfor %}
</ul> </ul>
{% endif %}
{% endwith %}
{% endfor %}
</li> </li>
</ol> </ol>
</article> </article>
......
apps/openassessment/xblock/static/css/openassessment.css
This source diff could not be displayed because it is too large. You can view the blob instead.
apps/openassessment/xblock/static/sass/oa/views/_oa-base.scss
...@@ -938,17 +938,17 @@ ...@@ -938,17 +938,17 @@
@include media($bp-dm) { @include media($bp-dm) {
@include span-columns(3 of 12); @include span-columns(3 of 12);
@include omega(3n); @include omega(4n);
} }
@include media($bp-dl) { @include media($bp-dl) {
@include span-columns(3 of 12); @include span-columns(3 of 12);
@include omega(3n); @include omega(4n);
} }
@include media($bp-dx) { @include media($bp-dx) {
@include span-columns(3 of 12); @include span-columns(3 of 12);
@include omega(3n); @include omega(4n);
} }
} }
......
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