Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-ora2
Commits
bf30363c
Commit
bf30363c
authored
Nov 05, 2015
by
cahrens
Committed by
Andy Armstrong
Dec 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make student information sections collapsible.
parent
0f407dc2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
103 additions
and
64 deletions
+103
-64
openassessment/templates/openassessmentblock/staff_area/student_info.html
+102
-64
openassessment/xblock/staff_area_mixin.py
+1
-0
No files found.
openassessment/templates/openassessmentblock/staff_area/student_info.html
View file @
bf30363c
...
...
@@ -3,13 +3,20 @@
<div
id=
"openassessment__student-info"
class=
"staff-info__student__report"
>
{% if submission %}
<h2
class=
"title"
>
<span
class=
"label"
>
{% trans "Learner Information" %}
</span>
<span
class=
"label"
>
{% blocktrans with learner=student_username %}
Viewing learner: {{ learner }}
{% endblocktrans %}
</span>
</h2>
<div
class=
"staff-info__content ui-staff__content"
>
<div
class=
"wrapper--step__content"
>
<div
class=
"step__content"
>
<h3
class=
"title"
>
{% trans "Learner Response" %}
</h3>
<div
class=
"staff-info__status ui-staff__content__section 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 "Learner Response" %}
</span>
</h2>
<div
class=
"ui-toggle-visibility__content"
>
<div
class=
"student__answer__display__content"
>
{% 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" %}
...
...
@@ -25,6 +32,7 @@
{% endif %}
</div>
{% if submission.file_url %}
<a
href=
"{{ submission.file_url }}"
class=
"submission--file"
>
{% trans "The file associated with this response." %}
...
...
@@ -33,64 +41,16 @@
{% endif %}
</div>
</div>
</div>
{% if not workflow_cancellation %}
<div
id=
"openassessment__staff-info__cancel__submission"
class=
"openassessment__staff-info__cancel__submission wrapper--ui-staff wrapper--ui--collapse"
>
{% if peer_assessments %}
<div
class=
"staff-info__status ui-staff__content__section 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>
<span>
{% trans "
Peer Assessments for This Learner
" %}
</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 %}
{% if peer_assessments %}
<div
class=
"staff-info__status ui-staff__content__section"
>
<h3
class=
"title"
>
{% trans "Peer Assessments for This Learner" %}
</h3>
<div
class=
"ui-toggle-visibility__content"
>
{% for assessment in peer_assessments %}
{% with peer_num=forloop.counter %}
<h4
class=
"title--sub"
>
{% trans "Peer" %} {{ peer_num }}:
</h4>
...
...
@@ -128,11 +88,18 @@
{% endwith %}
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% if submitted_assessments %}
<div
class=
"staff-info__status ui-staff__content__section"
>
<h3
class=
"title"
>
{% trans "Peer Assessments Completed by This Learner" %}
</h3>
<div
class=
"staff-info__status ui-staff__content__section 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 "Peer Assessments Completed by This Learner" %}
</span>
</h2>
<div
class=
"ui-toggle-visibility__content"
>
{% for assessment in submitted_assessments %}
{% with peer_num=forloop.counter %}
<h4
class=
"title--sub"
>
{% trans "Assessment" %} {{ peer_num }}:
</h4>
...
...
@@ -170,11 +137,18 @@
{% endwith %}
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% if self_assessment %}
<div
class=
"staff-info__status ui-staff__content__section"
>
<h3
class=
"title"
>
{% trans "Learner's Self Assessment" %}
</h3>
<div
class=
"staff-info__status ui-staff__content__section 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 "Learner's Self Assessment" %}
</span>
</h2>
<div
class=
"ui-toggle-visibility__content"
>
<table
class=
"staff-info__status__table"
summary=
"{% trans "
Self
Assessment
"
%}"
>
<thead>
<tr>
...
...
@@ -201,11 +175,18 @@
</tbody>
</table>
</div>
</div>
</div>
{% endif %}
{% if example_based_assessment %}
<div
class=
"staff-info__status ui-staff__content__section"
>
<h3
class=
"title"
>
{% trans "Example-Based Assessment" %}
</h3>
<div
class=
"staff-info__status ui-staff__content__section 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 "Example-Based Assessment" %}
</span>
</h2>
<div
class=
"ui-toggle-visibility__content"
>
<table
class=
"staff-info__status__table"
summary=
"{% trans "
Example
Based
Assessment
"
%}"
>
<thead>
<tr>
...
...
@@ -232,7 +213,64 @@
</tbody>
</table>
</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 %}
</div>
{% else %}
{% trans "A response was not found for this learner." %}
...
...
openassessment/xblock/staff_area_mixin.py
View file @
bf30363c
...
...
@@ -290,6 +290,7 @@ class StaffAreaMixin(object):
'self_assessment'
:
self_assessment
,
'example_based_assessment'
:
example_based_assessment
,
'rubric_criteria'
:
copy
.
deepcopy
(
self
.
rubric_criteria_with_labels
),
'student_username'
:
student_username
}
if
peer_assessments
or
self_assessment
or
example_based_assessment
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment