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
93c3621b
Commit
93c3621b
authored
Sep 27, 2016
by
Eric Fischer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
review feedback
parent
c70f6a9d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
openassessment/workflow/api.py
+3
-0
openassessment/workflow/models.py
+6
-2
test/acceptance/tests.py
+6
-8
No files found.
openassessment/workflow/api.py
View file @
93c3621b
...
...
@@ -204,6 +204,9 @@ def update_from_assessments(submission_uuid, assessment_requirements, override_s
`must_be_graded_by` to ensure that everyone will get scored.
The intention is to eventually pass in more assessment sequence
specific requirements in this dict.
override_submitter_requirements (bool): If True, the presence of a new
staff score will cause all of the submitter's requirements to be
fulfilled, moving the workflow to DONE and exposing their grade.
Returns:
dict: Assessment workflow information with the following
...
...
openassessment/workflow/models.py
View file @
93c3621b
...
...
@@ -297,6 +297,9 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
can refer to this to decide whether the requirements have been
met. Note that the requirements could change if the author
updates the problem definition.
override_submitter_requirements (bool): If True, the presence of a new
staff score will cause all of the submitter's requirements to be
fulfilled, moving the workflow to DONE and exposing their grade.
"""
if
self
.
status
==
self
.
STATUS
.
cancelled
:
...
...
@@ -326,9 +329,10 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
# Update the assessment_completed_at field for all steps
# All steps are considered "assessment complete", as the staff score will override all
for
step
in
steps
:
step
.
assessment_completed_at
=
now
()
common_now
=
now
()
step
.
assessment_completed_at
=
common_now
if
override_submitter_requirements
:
step
.
submitter_completed_at
=
now
()
step
.
submitter_completed_at
=
common_now
step
.
save
()
if
self
.
status
==
self
.
STATUS
.
done
:
...
...
test/acceptance/tests.py
View file @
93c3621b
"""
UI-level acceptance tests for OpenAssessment.
"""
from
__future__
import
absolute_import
import
ddt
import
os
import
unittest
...
...
@@ -342,6 +344,8 @@ class StaffAssessmentTest(OpenAssessmentTest):
# Verify staff grade section appears as expected
self
.
_verify_staff_grade_section
(
"NOT AVAILABLE"
)
message_title
=
self
.
staff_asmnt_page
.
open_step
()
.
message_title
self
.
assertEqual
(
"Waiting for a Staff Grade"
,
message_title
)
# Perform staff assessment
self
.
staff_area_page
=
StaffAreaPage
(
self
.
browser
,
self
.
problem_loc
)
...
...
@@ -532,14 +536,8 @@ class StaffAreaTest(OpenAssessmentTest):
self
.
assertEqual
(
self
.
staff_area_page
.
visible_staff_panels
,
[])
for
panel_name
,
button_label
in
[
(
"staff-tools"
,
"MANAGE INDIVIDUAL LEARNERS"
),
(
"staff-info"
,
"VIEW ASSIGNMENT STATISTICS"
),
(
"staff-tools"
,
"MANAGE INDIVIDUAL LEARNERS"
),
(
"staff-info"
,
"VIEW ASSIGNMENT STATISTICS"
),
]:
# Click on the button and verify that the panel has opened
self
.
staff_area_page
.
click_staff_toolbar_button
(
panel_name
)
...
...
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