Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
2cc91192
Commit
2cc91192
authored
7 years ago
by
robinwilliam.hundt
Browse files
Options
Downloads
Patches
Plain Diff
Added optional fields mixin for serializers
parent
a42a0d4a
No related branches found
No related tags found
1 merge request
!25
WIP: Resolve "A new student overview page with Vue.js"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/serializers.py
+15
-9
15 additions, 9 deletions
core/serializers.py
grady/settings/default.py
+1
-0
1 addition, 0 deletions
grady/settings/default.py
with
16 additions
and
9 deletions
core/serializers.py
+
15
−
9
View file @
2cc91192
import
logging
from
drf_dynamic_fields
import
DynamicFieldsMixin
from
rest_framework
import
serializers
from
core.models
import
(
ExamType
,
Feedback
,
Student
,
Submission
,
...
...
@@ -10,7 +11,11 @@ log = logging.getLogger(__name__)
user_factory
=
GradyUserFactory
()
class
ExamSerializer
(
serializers
.
ModelSerializer
):
class
DynamicFieldsModelSerializer
(
DynamicFieldsMixin
,
serializers
.
ModelSerializer
):
pass
class
ExamSerializer
(
DynamicFieldsModelSerializer
):
class
Meta
:
model
=
ExamType
...
...
@@ -18,21 +23,21 @@ class ExamSerializer(serializers.ModelSerializer):
'
pass_score
'
,
'
pass_only
'
,)
class
FeedbackSerializer
(
serializers
.
ModelSerializer
):
class
FeedbackSerializer
(
DynamicFields
ModelSerializer
):
class
Meta
:
model
=
Feedback
fields
=
(
'
text
'
,
'
score
'
)
class
SubmissionTypeSerializer
(
serializers
.
ModelSerializer
):
class
SubmissionTypeSerializer
(
DynamicFields
ModelSerializer
):
class
Meta
:
model
=
SubmissionType
fields
=
(
'
name
'
,
'
full_score
'
,
'
description
'
,
'
solution
'
)
class
SubmissionSerializer
(
serializers
.
ModelSerializer
):
class
SubmissionSerializer
(
DynamicFields
ModelSerializer
):
feedback
=
serializers
.
ReadOnlyField
(
source
=
'
feedback.text
'
)
score
=
serializers
.
ReadOnlyField
(
source
=
'
feedback.score
'
)
type_id
=
serializers
.
ReadOnlyField
(
source
=
'
type.id
'
)
...
...
@@ -41,10 +46,11 @@ class SubmissionSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
Submission
fields
=
(
'
type_id
'
,
'
type_name
'
,
'
text
'
,
'
feedback
'
,
'
score
'
,
'
full_score
'
)
fields
=
(
'
type_id
'
,
'
type_name
'
,
'
text
'
,
'
feedback
'
,
'
score
'
,
'
full_score
'
)
class
StudentSerializer
(
serializers
.
ModelSerializer
):
class
StudentSerializer
(
DynamicFields
ModelSerializer
):
name
=
serializers
.
ReadOnlyField
(
source
=
'
user.fullname
'
)
user
=
serializers
.
ReadOnlyField
(
source
=
'
user.username
'
)
exam
=
ExamSerializer
()
...
...
@@ -55,7 +61,7 @@ class StudentSerializer(serializers.ModelSerializer):
fields
=
(
'
name
'
,
'
user
'
,
'
exam
'
,
'
submissions
'
)
class
SubmissionNoTextFieldsSerializer
(
serializers
.
ModelSerializer
):
class
SubmissionNoTextFieldsSerializer
(
DynamicFields
ModelSerializer
):
score
=
serializers
.
ReadOnlyField
(
source
=
'
feedback.score
'
)
type
=
serializers
.
ReadOnlyField
(
source
=
'
type.name
'
)
full_score
=
serializers
.
ReadOnlyField
(
source
=
'
type.full_score
'
)
...
...
@@ -65,7 +71,7 @@ class SubmissionNoTextFieldsSerializer(serializers.ModelSerializer):
fields
=
(
'
type
'
,
'
score
'
,
'
full_score
'
)
class
StudentSerializerForListView
(
serializers
.
ModelSerializer
):
class
StudentSerializerForListView
(
DynamicFields
ModelSerializer
):
name
=
serializers
.
ReadOnlyField
(
source
=
'
user.fullname
'
)
user
=
serializers
.
ReadOnlyField
(
source
=
'
user.username
'
)
exam
=
serializers
.
ReadOnlyField
(
source
=
'
exam.module_reference
'
)
...
...
@@ -76,7 +82,7 @@ class StudentSerializerForListView(serializers.ModelSerializer):
fields
=
(
'
name
'
,
'
user
'
,
'
exam
'
,
'
submissions
'
)
class
TutorSerializer
(
serializers
.
ModelSerializer
):
class
TutorSerializer
(
DynamicFields
ModelSerializer
):
username
=
serializers
.
CharField
(
source
=
'
user.username
'
)
feedback_count
=
serializers
.
IntegerField
(
source
=
'
get_feedback_count
'
,
read_only
=
True
)
...
...
This diff is collapsed.
Click to expand it.
grady/settings/default.py
+
1
−
0
View file @
2cc91192
...
...
@@ -40,6 +40,7 @@ INSTALLED_APPS = [
'
django_extensions
'
,
'
rest_framework
'
,
'
corsheaders
'
,
'
drf_dynamic_fields
'
,
'
core
'
,
]
...
...
This diff is collapsed.
Click to expand it.
Jan Maximilian Michal
@j.michal
mentioned in issue
#74 (closed)
·
7 years ago
mentioned in issue
#74 (closed)
mentioned in issue #74
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment