diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index 1b74b80..6d677ad 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -340,6 +340,7 @@ class TrainingSerializer(serializers.ModelSerializer): session = serializers.PrimaryKeyRelatedField(queryset=models.Session.objects.all()) student_name = serializers.SerializerMethodField() student_email = serializers.SerializerMethodField() + student_id = serializers.SerializerMethodField() class Meta: model = models.Training @@ -360,6 +361,12 @@ class TrainingSerializer(serializers.ModelSerializer): member = models.Member.objects.get(id=obj.member_id) return member.old_email + def get_student_id(self, obj): + if obj.user: + return obj.user.member.id + else: + return obj.member_id + class StudentTrainingSerializer(TrainingSerializer): attendance_status = serializers.ChoiceField(['Waiting for payment', 'Withdrawn']) diff --git a/webclient/src/InstructorClasses.js b/webclient/src/InstructorClasses.js index a5af7b2..1ca38a1 100644 --- a/webclient/src/InstructorClasses.js +++ b/webclient/src/InstructorClasses.js @@ -99,7 +99,10 @@ function AttendanceRow(props) { return (
-

{student.student_name}{student.attendance_status === 'Waiting for payment' && ' (Waiting for payment)'}:

+

+ {student.student_name} + {student.attendance_status === 'Waiting for payment' && ' (Waiting for payment)'}: +