Skip to content

E
edx-ora2
Commit bf30363c by cahrens Committed by Andy Armstrong
Options

Make student information sections collapsible.

parent 0f407dc2
Showing with 103 additions and 64 deletions
openassessment/templates/openassessmentblock/staff_area/student_info.html
...@@ -3,13 +3,20 @@ ...@@ -3,13 +3,20 @@
<div id="openassessment__student-info" class="staff-info__student__report"> <div id="openassessment__student-info" class="staff-info__student__report">
{% if submission %} {% if submission %}
<h2 class="title"> <h2 class="title">
<span class="label">{% trans "Learner Information" %}</span> <span class="label">
{% blocktrans with learner=student_username %}
Viewing learner: {{ learner }}
{% endblocktrans %}
</span>
</h2> </h2>
<div class="staff-info__content ui-staff__content"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse">
<div class="wrapper--step__content"> <div class="ui-staff ui-toggle-visibility is--collapsed">
<div class="step__content"> <h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<h3 class="title">{% trans "Learner Response" %}</h3> <i class="icon fa fa-caret-right"></i>
<span>{% trans "Learner Response" %}</span>
</h2>
<div class="ui-toggle-visibility__content">
<div class="student__answer__display__content"> <div class="student__answer__display__content">
{% if workflow_cancellation %} {% if workflow_cancellation %}
{% blocktrans with removed_by_username=workflow_cancellation.cancelled_by removed_datetime=workflow_cancellation.created_at|utc|date:"N j, Y H:i e" %} {% blocktrans with removed_by_username=workflow_cancellation.cancelled_by removed_datetime=workflow_cancellation.created_at|utc|date:"N j, Y H:i e" %}
...@@ -25,6 +32,7 @@ ...@@ -25,6 +32,7 @@
{% endif %} {% endif %}
</div> </div>
{% if submission.file_url %} {% if submission.file_url %}
<a href="{{ submission.file_url }}" class="submission--file"> <a href="{{ submission.file_url }}" class="submission--file">
{% trans "The file associated with this response." %} {% trans "The file associated with this response." %}
...@@ -33,64 +41,16 @@ ...@@ -33,64 +41,16 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
{% if not workflow_cancellation %} {% if peer_assessments %}
<div id="openassessment__staff-info__cancel__submission" <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse">
class="openassessment__staff-info__cancel__submission wrapper--ui-staff wrapper--ui--collapse">
<div class="ui-staff ui-toggle-visibility is--collapsed"> <div class="ui-staff ui-toggle-visibility is--collapsed">
<h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control"> <h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<i class="icon fa fa-caret-right"></i> <i class="icon fa fa-caret-right"></i>
<span>{% trans "Remove submission from peer grading" %}</span> <span>{% trans "Peer Assessments for This Learner" %}</span>
</h2> </h2>
<div class="ui-toggle-visibility__content">
<div class="staff-info__cancel-submission__content ui-toggle-visibility__content">
<div class="ui-staff__content__section">
<div class="wrapper--input">
<form id="openassessment_staff_cancel_submission_form"
data-submission-uuid="{{ submission.uuid }}">
<ul class="list list--actions">
<li>
<div class="has--warnings">
<div class="warning">
{% trans "Caution: Removing a learner's submission cannot be undone." %}
</div>
</div>
</li>
<li>
<label for="staff-info__cancel-submission__comments"
class="label">{% trans "Comments:" %}</label>
</li>
<li>
<textarea
id="staff-info__cancel-submission__comments"
class="cancel_submission_comments"
value=""
maxlength="10000"></textarea>
</li>
</ul>
<ul class="list list--actions">
<li class="list--actions__item">
<a data-submission-uuid="{{ submission.uuid }}" aria-role="button" href=""
id="submit_cancel_submission" class="action--submit is--disabled">
<span class="copy">{% trans "Remove submission" %}</span>
</a>
<div class="cancel-submission-error"></div>
</li>
</ul>
</form>
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% if peer_assessments %}
<div class="staff-info__status ui-staff__content__section">
<h3 class="title">{% trans "Peer Assessments for This Learner" %}</h3>
{% for assessment in peer_assessments %} {% for assessment in peer_assessments %}
{% with peer_num=forloop.counter %} {% with peer_num=forloop.counter %}
<h4 class="title--sub"> {% trans "Peer" %} {{ peer_num }}: </h4> <h4 class="title--sub"> {% trans "Peer" %} {{ peer_num }}: </h4>
...@@ -128,11 +88,18 @@ ...@@ -128,11 +88,18 @@
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if submitted_assessments %} {% if submitted_assessments %}
<div class="staff-info__status ui-staff__content__section"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse">
<h3 class="title">{% trans "Peer Assessments Completed by This Learner" %}</h3> <div class="ui-staff ui-toggle-visibility is--collapsed">
<h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<i class="icon fa fa-caret-right"></i>
<span>{% trans "Peer Assessments Completed by This Learner" %}</span>
</h2>
<div class="ui-toggle-visibility__content">
{% for assessment in submitted_assessments %} {% for assessment in submitted_assessments %}
{% with peer_num=forloop.counter %} {% with peer_num=forloop.counter %}
<h4 class="title--sub">{% trans "Assessment" %} {{ peer_num }}:</h4> <h4 class="title--sub">{% trans "Assessment" %} {{ peer_num }}:</h4>
...@@ -170,11 +137,18 @@ ...@@ -170,11 +137,18 @@
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if self_assessment %} {% if self_assessment %}
<div class="staff-info__status ui-staff__content__section"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse">
<h3 class="title">{% trans "Learner's Self Assessment" %}</h3> <div class="ui-staff ui-toggle-visibility is--collapsed">
<h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<i class="icon fa fa-caret-right"></i>
<span>{% trans "Learner's Self Assessment" %}</span>
</h2>
<div class="ui-toggle-visibility__content">
<table class="staff-info__status__table" summary="{% trans "Self Assessment" %}"> <table class="staff-info__status__table" summary="{% trans "Self Assessment" %}">
<thead> <thead>
<tr> <tr>
...@@ -201,11 +175,18 @@ ...@@ -201,11 +175,18 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
{% if example_based_assessment %} {% if example_based_assessment %}
<div class="staff-info__status ui-staff__content__section"> <div class="staff-info__status ui-staff__content__section wrapper--ui--collapse">
<h3 class="title">{% trans "Example-Based Assessment" %}</h3> <div class="ui-staff ui-toggle-visibility is--collapsed">
<h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<i class="icon fa fa-caret-right"></i>
<span>{% trans "Example-Based Assessment" %}</span>
</h2>
<div class="ui-toggle-visibility__content">
<table class="staff-info__status__table" summary="{% trans "Example Based Assessment" %}"> <table class="staff-info__status__table" summary="{% trans "Example Based Assessment" %}">
<thead> <thead>
<tr> <tr>
...@@ -232,7 +213,64 @@ ...@@ -232,7 +213,64 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div>
{% endif %}
{% if not workflow_cancellation %}
<div id="openassessment__staff-info__cancel__submission"
class="openassessment__staff-info__cancel__submission wrapper--ui--collapse">
<div class="ui-staff ui-toggle-visibility is--collapsed">
<h2 class="staff-info__title ui-staff__title ui-toggle-visibility__control">
<i class="icon fa fa-caret-right"></i>
<span>{% trans "Remove submission from peer grading" %}</span>
</h2>
<div class="staff-info__cancel-submission__content ui-toggle-visibility__content">
<div class="ui-staff__content__section">
<div class="wrapper--input">
<form id="openassessment_staff_cancel_submission_form"
data-submission-uuid="{{ submission.uuid }}">
<ul class="list list--actions">
<li>
<div class="has--warnings">
<div class="warning">
{% trans "Caution: Removing a learner's submission cannot be undone." %}
</div>
</div>
</li>
<li>
<label for="staff-info__cancel-submission__comments"
class="label">{% trans "Comments:" %}</label>
</li>
<li>
<textarea
id="staff-info__cancel-submission__comments"
class="cancel_submission_comments"
value=""
maxlength="10000"></textarea>
</li>
</ul>
<ul class="list list--actions">
<li class="list--actions__item">
<a data-submission-uuid="{{ submission.uuid }}" aria-role="button" href=""
id="submit_cancel_submission" class="action--submit is--disabled">
<span class="copy">{% trans "Remove submission" %}</span>
</a>
<div class="cancel-submission-error"></div>
</li>
</ul>
</form>
</div>
</div>
</div>
</div>
</div>
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
{% trans "A response was not found for this learner." %} {% trans "A response was not found for this learner." %}
......
openassessment/xblock/staff_area_mixin.py
...@@ -290,6 +290,7 @@ class StaffAreaMixin(object): ...@@ -290,6 +290,7 @@ class StaffAreaMixin(object):
'self_assessment': self_assessment, 'self_assessment': self_assessment,
'example_based_assessment': example_based_assessment, 'example_based_assessment': example_based_assessment,
'rubric_criteria': copy.deepcopy(self.rubric_criteria_with_labels), 'rubric_criteria': copy.deepcopy(self.rubric_criteria_with_labels),
'student_username': student_username
} }
if peer_assessments or self_assessment or example_based_assessment: if peer_assessments or self_assessment or example_based_assessment:
......
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