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
bde05fec
Commit
bde05fec
authored
Jan 22, 2015
by
Usman Khalid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated staff info panel to use new template for displaying submission.
TNL-708
parent
57ca8732
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
9 deletions
+17
-9
openassessment/templates/openassessmentblock/staff_debug/student_info.html
+1
-1
openassessment/xblock/staff_info_mixin.py
+2
-2
openassessment/xblock/test/test_staff_info.py
+14
-6
No files found.
openassessment/templates/openassessmentblock/staff_debug/student_info.html
View file @
bde05fec
...
...
@@ -21,7 +21,7 @@
Comments: {{ comments }}
{% endblocktrans %}
{% else %}
{
{ submission.answer.text|linebreaks }
}
{
% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label="The student's response to the question above:" %
}
{% endif %}
</div>
...
...
openassessment/xblock/staff_info_mixin.py
View file @
bde05fec
...
...
@@ -16,7 +16,7 @@ from openassessment.workflow.errors import (
from
openassessment.assessment.errors.ai
import
AIError
from
openassessment.xblock.resolve_dates
import
DISTANT_PAST
,
DISTANT_FUTURE
from
openassessment.xblock.data_conversion
import
(
create_rubric_dict
,
convert_training_examples_list_to_dict
create_rubric_dict
,
convert_training_examples_list_to_dict
,
create_submission_dict
)
from
submissions
import
api
as
submission_api
from
openassessment.assessment.api
import
peer
as
peer_api
...
...
@@ -285,7 +285,7 @@ class StaffInfoMixin(object):
workflow_cancellation
[
'cancelled_by'
]
=
self
.
get_username
(
workflow_cancellation
[
'cancelled_by_id'
])
context
=
{
'submission'
:
submission
,
'submission'
:
create_submission_dict
(
submission
,
self
.
prompts
)
if
submission
else
None
,
'workflow_cancellation'
:
workflow_cancellation
,
'peer_assessments'
:
peer_assessments
,
'submitted_assessments'
:
submitted_assessments
,
...
...
openassessment/xblock/test/test_staff_info.py
View file @
bde05fec
...
...
@@ -14,6 +14,8 @@ from openassessment.workflow import api as workflow_api
from
openassessment.assessment.errors.ai
import
AIError
,
AIGradingInternalError
from
openassessment.fileupload.api
import
FileUploadInternalError
from
submissions
import
api
as
sub_api
from
openassessment.xblock.data_conversion
import
prepare_submission_for_serialization
from
openassessment.xblock.test.base
import
scenario
,
XBlockHandlerTestCase
from
xblock.core
import
XBlock
...
...
@@ -180,7 +182,9 @@ class TestCourseStaff(XBlockHandlerTestCase):
bob_item
=
STUDENT_ITEM
.
copy
()
bob_item
[
"item_id"
]
=
xblock
.
scope_ids
.
usage_id
# Create a submission for Bob, and corresponding workflow.
submission
=
sub_api
.
create_submission
(
bob_item
,
{
'text'
:
"Bob Answer"
})
submission
=
sub_api
.
create_submission
(
bob_item
,
prepare_submission_for_serialization
((
"Bob Answer 1"
,
"Bob Answer 2"
))
)
peer_api
.
on_start
(
submission
[
"uuid"
])
workflow_api
.
create_workflow
(
submission
[
"uuid"
],
[
'peer'
])
...
...
@@ -203,7 +207,7 @@ class TestCourseStaff(XBlockHandlerTestCase):
# Now Bob should be fully populated in the student info view.
path
,
context
=
xblock
.
get_student_info_path_and_context
(
"Bob"
)
self
.
assertEquals
(
"Bob Answer
"
,
context
[
'submission'
][
'answer'
][
'text'
])
self
.
assertEquals
(
"Bob Answer
1"
,
context
[
'submission'
][
'answer'
][
'parts'
][
0
][
'text'
])
self
.
assertIsNone
(
context
[
'self_assessment'
])
self
.
assertEquals
(
"openassessmentblock/staff_debug/student_info.html"
,
path
)
...
...
@@ -217,7 +221,9 @@ class TestCourseStaff(XBlockHandlerTestCase):
bob_item
=
STUDENT_ITEM
.
copy
()
bob_item
[
"item_id"
]
=
xblock
.
scope_ids
.
usage_id
# Create a submission for Bob, and corresponding workflow.
submission
=
sub_api
.
create_submission
(
bob_item
,
{
'text'
:
"Bob Answer"
})
submission
=
sub_api
.
create_submission
(
bob_item
,
prepare_submission_for_serialization
((
"Bob Answer 1"
,
"Bob Answer 2"
))
)
peer_api
.
on_start
(
submission
[
"uuid"
])
workflow_api
.
create_workflow
(
submission
[
"uuid"
],
[
'self'
])
...
...
@@ -232,7 +238,7 @@ class TestCourseStaff(XBlockHandlerTestCase):
)
path
,
context
=
xblock
.
get_student_info_path_and_context
(
"Bob"
)
self
.
assertEquals
(
"Bob Answer
"
,
context
[
'submission'
][
'answer'
][
'text'
])
self
.
assertEquals
(
"Bob Answer
1"
,
context
[
'submission'
][
'answer'
][
'parts'
][
0
][
'text'
])
self
.
assertEquals
([],
context
[
'peer_assessments'
])
self
.
assertEquals
(
"openassessmentblock/staff_debug/student_info.html"
,
path
)
...
...
@@ -254,7 +260,9 @@ class TestCourseStaff(XBlockHandlerTestCase):
bob_item
=
STUDENT_ITEM
.
copy
()
bob_item
[
"item_id"
]
=
xblock
.
scope_ids
.
usage_id
# Create a submission for Bob, and corresponding workflow.
submission
=
sub_api
.
create_submission
(
bob_item
,
{
'text'
:
"Bob Answer"
})
submission
=
sub_api
.
create_submission
(
bob_item
,
prepare_submission_for_serialization
((
"Bob Answer 1"
,
"Bob Answer 2"
))
)
peer_api
.
on_start
(
submission
[
"uuid"
])
workflow_api
.
create_workflow
(
submission
[
"uuid"
],
[
'peer'
])
...
...
@@ -266,7 +274,7 @@ class TestCourseStaff(XBlockHandlerTestCase):
)
path
,
context
=
xblock
.
get_student_info_path_and_context
(
"Bob"
)
self
.
assertEquals
(
"Bob Answer
"
,
context
[
'submission'
][
'answer'
][
'text'
])
self
.
assertEquals
(
"Bob Answer
1"
,
context
[
'submission'
][
'answer'
][
'parts'
][
0
][
'text'
])
self
.
assertIsNotNone
(
context
[
'workflow_cancellation'
])
self
.
assertEquals
(
"openassessmentblock/staff_debug/student_info.html"
,
path
)
...
...
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