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
6b9476a9
Commit
6b9476a9
authored
Mar 19, 2014
by
Will Daly
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #172 from edx/will/fix-circular-import
Fix circular import
parents
a5723de4
7282a364
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletions
+4
-1
apps/openassessment/workflow/models.py
+4
-1
No files found.
apps/openassessment/workflow/models.py
View file @
6b9476a9
...
...
@@ -14,7 +14,6 @@ from django_extensions.db.fields import UUIDField
from
model_utils
import
Choices
from
model_utils.models
import
StatusModel
,
TimeStampedModel
from
openassessment.assessment
import
peer_api
,
self_api
from
submissions
import
api
as
sub_api
...
...
@@ -67,10 +66,12 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
}
def
_is_peer_complete
(
self
,
assessment_requirements
):
from
openassessment.assessment
import
peer_api
peer_requirements
=
assessment_requirements
[
"peer"
]
return
peer_api
.
is_complete
(
self
.
submission_uuid
,
peer_requirements
)
def
_is_self_complete
(
self
):
from
openassessment.assessment
import
self_api
return
self_api
.
is_complete
(
self
.
submission_uuid
)
def
update_from_assessments
(
self
,
assessment_requirements
):
...
...
@@ -104,6 +105,8 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
specific requirements in this dict.
"""
from
openassessment.assessment
import
peer_api
# If we're done, we're done -- it doesn't matter if requirements have
# changed because we've already written a score.
if
self
.
status
==
self
.
STATUS
.
done
:
...
...
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