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
eba36c54
Commit
eba36c54
authored
Dec 12, 2016
by
Eric Fischer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pylint cleanup
parent
1e64121e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
5 deletions
+44
-5
openassessment/assessment/admin.py
+42
-3
scripts/run-pep8.sh
+1
-1
scripts/run-pylint.sh
+1
-1
No files found.
openassessment/assessment/admin.py
View file @
eba36c54
"""
Django admin models for openassessment
"""
import
json
import
json
from
django.contrib
import
admin
from
django.contrib
import
admin
...
@@ -12,6 +15,9 @@ from openassessment.assessment.serializers import RubricSerializer
...
@@ -12,6 +15,9 @@ from openassessment.assessment.serializers import RubricSerializer
class
RubricAdmin
(
admin
.
ModelAdmin
):
class
RubricAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for Rubrics.
"""
list_per_page
=
20
# Loads of criteria summary are moderately expensive
list_per_page
=
20
# Loads of criteria summary are moderately expensive
list_display
=
(
'id'
,
'content_hash'
,
'criteria_summary'
)
list_display
=
(
'id'
,
'content_hash'
,
'criteria_summary'
)
...
@@ -40,6 +46,9 @@ class RubricAdmin(admin.ModelAdmin):
...
@@ -40,6 +46,9 @@ class RubricAdmin(admin.ModelAdmin):
class
PeerWorkflowItemInline
(
admin
.
StackedInline
):
class
PeerWorkflowItemInline
(
admin
.
StackedInline
):
"""
Django admin model for PeerWorkflowItems.
"""
model
=
PeerWorkflowItem
model
=
PeerWorkflowItem
fk_name
=
'author'
fk_name
=
'author'
raw_id_fields
=
(
'author'
,
'scorer'
,
'assessment'
)
raw_id_fields
=
(
'author'
,
'scorer'
,
'assessment'
)
...
@@ -47,23 +56,29 @@ class PeerWorkflowItemInline(admin.StackedInline):
...
@@ -47,23 +56,29 @@ class PeerWorkflowItemInline(admin.StackedInline):
class
PeerWorkflowAdmin
(
admin
.
ModelAdmin
):
class
PeerWorkflowAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for PeerWorkflows.
"""
list_display
=
(
list_display
=
(
'id'
,
'student_id'
,
'item_id'
,
'course_id'
,
'submission_uuid'
,
'id'
,
'student_id'
,
'item_id'
,
'course_id'
,
'submission_uuid'
,
'created_at'
,
'completed_at'
,
'grading_completed_at'
,
'created_at'
,
'completed_at'
,
'grading_completed_at'
,
)
)
search_fields
=
(
search_fields
=
(
'id'
,
'student_id'
,
'item_id'
,
'course_id'
,
'submission_uuid'
,
'id'
,
'student_id'
,
'item_id'
,
'course_id'
,
'submission_uuid'
,
)
)
inlines
=
(
PeerWorkflowItemInline
,)
inlines
=
(
PeerWorkflowItemInline
,)
class
AssessmentAdmin
(
admin
.
ModelAdmin
):
class
AssessmentAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for Assessments.
"""
list_display
=
(
list_display
=
(
'id'
,
'submission_uuid'
,
'score_type'
,
'scorer_id'
,
'scored_at'
,
'id'
,
'submission_uuid'
,
'score_type'
,
'scorer_id'
,
'scored_at'
,
'rubric_link'
,
'rubric_link'
,
)
)
search_fields
=
(
search_fields
=
(
'id'
,
'submission_uuid'
,
'score_type'
,
'scorer_id'
,
'scored_at'
,
'id'
,
'submission_uuid'
,
'score_type'
,
'scorer_id'
,
'scored_at'
,
'rubric__content_hash'
,
'rubric__content_hash'
,
)
)
readonly_fields
=
(
readonly_fields
=
(
...
@@ -74,6 +89,9 @@ class AssessmentAdmin(admin.ModelAdmin):
...
@@ -74,6 +89,9 @@ class AssessmentAdmin(admin.ModelAdmin):
exclude
=
(
'rubric'
,
'submission_uuid'
)
exclude
=
(
'rubric'
,
'submission_uuid'
)
def
rubric_link
(
self
,
assessment_obj
):
def
rubric_link
(
self
,
assessment_obj
):
"""
Returns the rubric link for this assessment.
"""
url
=
reverse
(
url
=
reverse
(
'admin:assessment_rubric_change'
,
'admin:assessment_rubric_change'
,
args
=
[
assessment_obj
.
rubric
.
id
]
args
=
[
assessment_obj
.
rubric
.
id
]
...
@@ -86,6 +104,9 @@ class AssessmentAdmin(admin.ModelAdmin):
...
@@ -86,6 +104,9 @@ class AssessmentAdmin(admin.ModelAdmin):
rubric_link
.
short_description
=
'Rubric'
rubric_link
.
short_description
=
'Rubric'
def
parts_summary
(
self
,
assessment_obj
):
def
parts_summary
(
self
,
assessment_obj
):
"""
Returns the parts summary of this assessment as HTML.
"""
return
"<br/>"
.
join
(
return
"<br/>"
.
join
(
html
.
escape
(
html
.
escape
(
u"{}/{} - {} - {}: {} - {} - {}"
.
format
(
u"{}/{} - {} - {}: {} - {} - {}"
.
format
(
...
@@ -104,6 +125,9 @@ class AssessmentAdmin(admin.ModelAdmin):
...
@@ -104,6 +125,9 @@ class AssessmentAdmin(admin.ModelAdmin):
class
AssessmentFeedbackAdmin
(
admin
.
ModelAdmin
):
class
AssessmentFeedbackAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for AssessmentFeedbacks.
"""
list_display
=
(
'id'
,
'submission_uuid'
,)
list_display
=
(
'id'
,
'submission_uuid'
,)
search_fields
=
(
'id'
,
'submission_uuid'
,)
search_fields
=
(
'id'
,
'submission_uuid'
,)
readonly_fields
=
(
readonly_fields
=
(
...
@@ -112,6 +136,9 @@ class AssessmentFeedbackAdmin(admin.ModelAdmin):
...
@@ -112,6 +136,9 @@ class AssessmentFeedbackAdmin(admin.ModelAdmin):
exclude
=
(
'assessments'
,)
exclude
=
(
'assessments'
,)
def
assessments_by
(
self
,
assessment_feedback
):
def
assessments_by
(
self
,
assessment_feedback
):
"""
Gets all assessments for this feedback.
"""
links
=
[
links
=
[
u'<a href="{}">{}</a>'
.
format
(
u'<a href="{}">{}</a>'
.
format
(
reverse
(
'admin:assessment_assessment_change'
,
args
=
[
asmt
.
id
]),
reverse
(
'admin:assessment_assessment_change'
,
args
=
[
asmt
.
id
]),
...
@@ -124,22 +151,34 @@ class AssessmentFeedbackAdmin(admin.ModelAdmin):
...
@@ -124,22 +151,34 @@ class AssessmentFeedbackAdmin(admin.ModelAdmin):
class
AIGradingWorkflowAdmin
(
admin
.
ModelAdmin
):
class
AIGradingWorkflowAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for AIGradingWorkflows.
"""
list_display
=
(
'uuid'
,
'submission_uuid'
)
list_display
=
(
'uuid'
,
'submission_uuid'
)
search_fields
=
(
'uuid'
,
'submission_uuid'
,
'student_id'
,
'item_id'
,
'course_id'
)
search_fields
=
(
'uuid'
,
'submission_uuid'
,
'student_id'
,
'item_id'
,
'course_id'
)
readonly_fields
=
(
'uuid'
,
'submission_uuid'
,
'student_id'
,
'item_id'
,
'course_id'
)
readonly_fields
=
(
'uuid'
,
'submission_uuid'
,
'student_id'
,
'item_id'
,
'course_id'
)
class
AITrainingWorkflowAdmin
(
admin
.
ModelAdmin
):
class
AITrainingWorkflowAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for AITrainingWorkflows.
"""
list_display
=
(
'uuid'
,)
list_display
=
(
'uuid'
,)
search_fields
=
(
'uuid'
,
'course_id'
,
'item_id'
,)
search_fields
=
(
'uuid'
,
'course_id'
,
'item_id'
,)
readonly_fields
=
(
'uuid'
,
'course_id'
,
'item_id'
,)
readonly_fields
=
(
'uuid'
,
'course_id'
,
'item_id'
,)
class
AIClassifierInline
(
admin
.
TabularInline
):
class
AIClassifierInline
(
admin
.
TabularInline
):
"""
Django admin model for AIClassifiers.
"""
model
=
AIClassifier
model
=
AIClassifier
class
AIClassifierSetAdmin
(
admin
.
ModelAdmin
):
class
AIClassifierSetAdmin
(
admin
.
ModelAdmin
):
"""
Django admin model for AICLassifierSets.
"""
list_display
=
(
'id'
,)
list_display
=
(
'id'
,)
search_fields
=
(
'id'
,)
search_fields
=
(
'id'
,)
inlines
=
[
AIClassifierInline
]
inlines
=
[
AIClassifierInline
]
...
...
scripts/run-pep8.sh
View file @
eba36c54
#!/usr/bin/env bash
#!/usr/bin/env bash
MAX_PEP8_VIOLATIONS
=
1
11
MAX_PEP8_VIOLATIONS
=
1
06
mkdir
-p
test
/logs
mkdir
-p
test
/logs
PEP8_VIOLATIONS
=
test
/logs/pep8.txt
PEP8_VIOLATIONS
=
test
/logs/pep8.txt
...
...
scripts/run-pylint.sh
View file @
eba36c54
#!/usr/bin/env bash
#!/usr/bin/env bash
MAX_PYLINT_VIOLATIONS
=
4
72
MAX_PYLINT_VIOLATIONS
=
4
57
mkdir
-p
test
/logs
mkdir
-p
test
/logs
PYLINT_VIOLATIONS
=
test
/logs/pylint.txt
PYLINT_VIOLATIONS
=
test
/logs/pylint.txt
...
...
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