mirror of
https://github.com/lemeow125/StudE-Backend.git
synced 2024-11-17 06:19:24 +08:00
Improved student serializer
This commit is contained in:
parent
eb26533dcd
commit
95cbd88fd8
2 changed files with 14 additions and 2 deletions
|
@ -17,6 +17,9 @@ from django.contrib.gis.geos import Point
|
||||||
class CustomUserSerializer(BaseUserSerializer):
|
class CustomUserSerializer(BaseUserSerializer):
|
||||||
# user_status = StudentStatusSerializer(
|
# user_status = StudentStatusSerializer(
|
||||||
# source='studentstatus', read_only=True)
|
# source='studentstatus', read_only=True)
|
||||||
|
course_shortname = serializers.SerializerMethodField()
|
||||||
|
yearlevel_shortname = serializers.SerializerMethodField()
|
||||||
|
semester_shortname = serializers.SerializerMethodField()
|
||||||
course = serializers.SlugRelatedField(
|
course = serializers.SlugRelatedField(
|
||||||
many=False, slug_field='name', queryset=Course.objects.all(), required=False, allow_null=True)
|
many=False, slug_field='name', queryset=Course.objects.all(), required=False, allow_null=True)
|
||||||
year_level = serializers.SlugRelatedField(
|
year_level = serializers.SlugRelatedField(
|
||||||
|
@ -27,9 +30,18 @@ class CustomUserSerializer(BaseUserSerializer):
|
||||||
class Meta(BaseUserSerializer.Meta):
|
class Meta(BaseUserSerializer.Meta):
|
||||||
model = CustomUser
|
model = CustomUser
|
||||||
fields = ('username', 'email',
|
fields = ('username', 'email',
|
||||||
'student_id_number', 'year_level', 'semester', 'course', 'subjects', 'avatar', 'first_name', 'last_name', 'is_banned')
|
'student_id_number', 'year_level', 'yearlevel_shortname', 'semester', 'semester_shortname', 'course', 'course_shortname', 'subjects', 'avatar', 'first_name', 'last_name', 'is_banned')
|
||||||
read_only_fields = ('is_banned', 'user_status')
|
read_only_fields = ('is_banned', 'user_status')
|
||||||
|
|
||||||
|
def get_course_shortname(self, instance):
|
||||||
|
return instance.course.shortname if instance.course else None
|
||||||
|
|
||||||
|
def get_yearlevel_shortname(self, instance):
|
||||||
|
return instance.year_level.shortname if instance.year_level else None
|
||||||
|
|
||||||
|
def get_semester_shortname(self, instance):
|
||||||
|
return instance.semester.shortname if instance.semester else None
|
||||||
|
|
||||||
# The model from your custom user
|
# The model from your custom user
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ class SubjectSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Subject
|
model = Subject
|
||||||
fields = ('name', 'code', 'courses', 'year_levels', 'semesters')
|
fields = ('id', 'name', 'code', 'courses', 'year_levels', 'semesters')
|
||||||
|
|
||||||
def get_year_level(self, obj):
|
def get_year_level(self, obj):
|
||||||
return obj.year_level.name
|
return obj.year_level.name
|
||||||
|
|
Loading…
Reference in a new issue