Skip to content

Commit

Permalink
fixed bug with mark deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
Altius01 authored and ShishckovA committed Jul 21, 2023
1 parent 57b786d commit e78c5b2
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions back-end/src/lms/serializers/marks.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class MarkHistorySerializer(serializers.ModelSerializer):
date = serializers.SerializerMethodField(read_only=True)

def get_after(self, obj):
if obj.history_type == "-":
return None
return obj.values

def get_before(self, obj):
Expand All @@ -102,9 +104,14 @@ def get_student_fullname(self, obj):
def get_teacher_fullname(self, obj):
if obj.changed_by is None:
return None
# Get Teacher fullname
teacher = Teacher.objects.filter(user=obj.changed_by).first()
if teacher:
return teacher.fullname
# Get Student journalist fullname
journalist = Student.objects.filter(user=obj.changed_by).first()
if journalist:
return journalist.fullname
return obj.changed_by.email

def get_date(self, obj):
Expand Down

0 comments on commit e78c5b2

Please sign in to comment.