Skip to content

E
edx-ora2
Commit 6d631658 by Brian Talbot
Options

resolving master rebase and test errors

parent e258afd5
Showing with 78 additions and 36 deletions
apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html
...@@ -23,44 +23,87 @@ ...@@ -23,44 +23,87 @@
<span class="step__label">Evaluate Peers' Responses</span> <span class="step__label">Evaluate Peers' Responses</span>
<span class="step__deadline">due <span class="date">{{ formatted_due_datetime }}</span></span> <span class="step__deadline">due <span class="date">{{ formatted_due_datetime }}</span></span>
</span> </span>
</header> </h2>
<!-- ?: markup validating/copy cleaning upon submission --> {% block title %}
<div class="peer-assessment__response"> <span class="step__status">
{{ peer_submission.answer }} <span class="step__status__label">This step's status:</span>
</div> <span class="step__status__value">
<span class="copy">
<span class="step__status__value--completed">{{ graded }}</span> of
<span class="step__status__value--required">{{ must_grade }}</span> completed
</span>
</span>
</span>
{% endblock %}
</header>
{% block body %}
<div class="step__instruction">
<p>Please read and evaluate the following response from one of your peers in the course.</p>
</div>
<form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post"> <div class="step__content">
<fieldset class="assessment__fields"> <ul class="list--peer-assessments">
<li class="list--peer-assessments__item">
<article class="peer-assessment" id="peer-assessment--001">
<header class="peer-assessment__header">
<h3 class="peer-assessment__title">Assessment #
<span class="peer-assessment__number--current">{{ graded }}</span> of
<span class="peer-assessment__number--required">{{ must_grade }}</span>
</h3>
<ol class="list list--fields assessment__rubric"> <span class="peer-assessment__expected-time">
{% for criterion in rubric_criteria %} <span class="label">Expected Time Spent:</span>
<!-- individual rubric question (radio-based choice) --> <span class="value">{{ estimated_time }}</span>
<li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}"> </span>
<h4 class="question__title"> </header>
{{ criterion.prompt }}
<span class="label--required">* <span class="sr">(Required)</span></span> <!-- ?: markup validating/copy cleaning upon submission -->
</h4> <div class="peer-assessment__response">
<ol class="question__answers"> {{ peer_submission.answer }}
{% for option in criterion.options %} </div>
<li class="answer">
<div class="wrapper--input"> <form id="peer-assessment--001__assessment" class="peer-assessment__assessment" method="post">
<input type="radio" <fieldset class="assessment__fields">
name="{{ criterion.name }}" <legend class="assessment__instruction">{{ rubric_instructions }}</legend>
id="assessment__rubric__question--{{ criterion.name }}"
class="answer__value" <ol class="list list--fields assessment__rubric">
value="{{ option.name }}" /> {% for criterion in rubric_criteria %}
({{option.points}}) <!-- individual rubric question (radio-based choice) -->
<label for="assessment__rubric__question--001__option--01" <li class="field field--radio is--required assessment__rubric__question" id="assessment__rubric__question--{{ criterion.name }}">
class="answer__label" <h4 class="question__title">
>{{ option.name }}</label> {{ criterion.prompt }}
</div> <span class="label--required">* <span class="sr">(Required)</span></span>
<span class="answer__tip">{{ option.explanation }}</span> </h4>
</li> <ol class="question__answers">
{% endfor %} {% for option in criterion.options %}
</ol> <li class="answer">
</li> <div class="wrapper--input">
{% endfor %} <input type="radio"
name="{{ criterion.name }}"
id="assessment__rubric__question--{{ criterion.name }}"
class="answer__value"
value="{{ option.name }}" />
({{option.points}})
<label for="assessment__rubric__question--001__option--01"
class="answer__label"
>{{ option.name }}</label>
</div>
<span class="answer__tip">{{ option.explanation }}</span>
</li>
{% endfor %}
</ol>
</li>
{% endfor %}
<!-- individual rubric question (text) -->
<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>
<textarea id="assessment__rubric__question--004__value" placeholder="I felt this response was..."></textarea>
</li>
</ol>
</fieldset>
<ul class="list list--actions"> <ul class="list list--actions">
<li class="list--actions__item"> <li class="list--actions__item">
......
apps/openassessment/xblock/peer_assessment_mixin.py
...@@ -68,7 +68,6 @@ class PeerAssessmentMixin(object): ...@@ -68,7 +68,6 @@ class PeerAssessmentMixin(object):
""" """
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.
} }
......
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