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
bfcb6ff1
Commit
bfcb6ff1
authored
May 06, 2014
by
Will Daly
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #307 from edx/will/status-details-error
TIM-548
parents
3ccafa17
b0e1bb61
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
apps/openassessment/xblock/peer_assessment_mixin.py
+2
-3
apps/openassessment/xblock/test/test_peer.py
+18
-0
No files found.
apps/openassessment/xblock/peer_assessment_mixin.py
View file @
bfcb6ff1
...
...
@@ -148,9 +148,8 @@ class PeerAssessmentMixin(object):
context_dict
[
'peer_due'
]
=
due_date
workflow
=
self
.
get_workflow_info
()
if
workflow
is
None
:
return
self
.
render_assessment
(
path
,
context_dict
)
continue_grading
=
continue_grading
and
workflow
[
"status_details"
][
"peer"
][
"complete"
]
peer_complete
=
workflow
.
get
(
'status_details'
,
{})
.
get
(
'peer'
,
{})
.
get
(
'complete'
,
False
)
continue_grading
=
continue_grading
and
peer_complete
student_item
=
self
.
get_student_item_dict
()
assessment
=
self
.
get_assessment_module
(
'peer-assessment'
)
...
...
apps/openassessment/xblock/test/test_peer.py
View file @
bfcb6ff1
...
...
@@ -449,6 +449,24 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
was_graded_enough
=
True
,
)
@scenario
(
'data/peer_assessment_scenario.xml'
,
user_id
=
'Bob'
)
def
test_continued_grading_no_submission
(
self
,
xblock
):
# Bugfix: This used to cause a KeyError when students would click "Peer Assessment"
# (indicating "continued grading") before making a submission.
expected_context
=
{
'estimated_time'
:
'20 minutes'
,
'graded'
:
0
,
'must_grade'
:
5
,
'review_num'
:
1
,
'rubric_criteria'
:
xblock
.
rubric_criteria
,
'submit_button_text'
:
'Submit your assessment & review another response'
,
}
self
.
_assert_path_and_context
(
xblock
,
'openassessmentblock/peer/oa_peer_unavailable.html'
,
expected_context
,
continue_grading
=
True
,
)
def
_assert_path_and_context
(
self
,
xblock
,
expected_path
,
expected_context
,
continue_grading
=
False
,
workflow_status
=
None
,
...
...
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