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
0f12fc0a
Commit
0f12fc0a
authored
Jun 12, 2017
by
Eric Fischer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quality cleanup
parent
8a5edabf
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
7 deletions
+16
-7
openassessment/assessment/migrations/0001_initial.py
+1
-0
openassessment/assessment/migrations/0002_staffworkflow.py
+1
-0
openassessment/assessment/migrations/0003_expand_course_id.py
+1
-0
openassessment/assessment/models/ai.py
+1
-0
openassessment/assessment/models/base.py
+0
-1
openassessment/assessment/models/peer.py
+11
-6
openassessment/workflow/migrations/0001_initial.py
+1
-0
No files found.
openassessment/assessment/migrations/0001_initial.py
View file @
0f12fc0a
# -*- coding: utf-8 -*-
# pylint: skip-file
from
__future__
import
unicode_literals
from
django.db
import
models
,
migrations
...
...
openassessment/assessment/migrations/0002_staffworkflow.py
View file @
0f12fc0a
# -*- coding: utf-8 -*-
# pylint: skip-file
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
...
...
openassessment/assessment/migrations/0003_expand_course_id.py
View file @
0f12fc0a
# -*- coding: utf-8 -*-
# pylint: skip-file
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
...
...
openassessment/assessment/models/ai.py
View file @
0f12fc0a
...
...
@@ -414,6 +414,7 @@ class AIClassifierSet(models.Model):
# an AWS S3 bucket.
AI_CLASSIFIER_STORAGE
=
"ora2_ai_classifiers"
def
upload_to_path
(
instance
,
filename
):
# pylint:disable=W0613
"""
Calculate the file path where classifiers should be uploaded.
...
...
openassessment/assessment/models/base.py
View file @
0f12fc0a
...
...
@@ -790,7 +790,6 @@ class AssessmentPart(models.Model):
msg
=
u"Missing selections for criteria: {missing}"
.
format
(
missing
=
missing_criteria
)
raise
InvalidRubricSelection
(
msg
)
@classmethod
def
_check_all_criteria_assessed
(
cls
,
rubric_index
,
selected_criteria
,
criteria_feedback
):
"""
...
...
openassessment/assessment/models/peer.py
View file @
0f12fc0a
...
...
@@ -341,9 +341,10 @@ class PeerWorkflow(models.Model):
"and student_id<>
%
s "
"and pw.cancelled_at is NULL "
"and pw.id not in ( "
"select pwi.author_id "
"from assessment_peerworkflowitem pwi "
"where pwi.scorer_id=
%
s); "
,
"select pwi.author_id "
"from assessment_peerworkflowitem pwi "
"where pwi.scorer_id=
%
s"
"); "
,
[
self
.
course_id
,
self
.
item_id
,
self
.
student_id
,
self
.
id
]
))
workflow_count
=
len
(
query
)
...
...
@@ -379,7 +380,9 @@ class PeerWorkflow(models.Model):
"""
try
:
item_query
=
self
.
graded
.
filter
(
submission_uuid
=
submission_uuid
)
.
order_by
(
"-started_at"
,
"-id"
)
# pylint:disable=E1101
item_query
=
self
.
graded
.
filter
(
submission_uuid
=
submission_uuid
)
.
order_by
(
"-started_at"
,
"-id"
)
# pylint:disable=E1101
items
=
list
(
item_query
[:
1
])
if
not
items
:
msg
=
(
...
...
@@ -391,8 +394,10 @@ class PeerWorkflow(models.Model):
item
.
assessment
=
assessment
item
.
save
()
if
(
not
item
.
author
.
grading_completed_at
and
item
.
author
.
graded_by
.
filter
(
assessment__isnull
=
False
)
.
count
()
>=
num_required_grades
):
if
(
not
item
.
author
.
grading_completed_at
and
item
.
author
.
graded_by
.
filter
(
assessment__isnull
=
False
)
.
count
()
>=
num_required_grades
):
item
.
author
.
grading_completed_at
=
now
()
item
.
author
.
save
()
except
(
DatabaseError
,
PeerWorkflowItem
.
DoesNotExist
):
...
...
openassessment/workflow/migrations/0001_initial.py
View file @
0f12fc0a
# -*- coding: utf-8 -*-
# pylint: skip-file
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
...
...
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