diff --git a/src/account/serializers.py b/src/account/serializers.py index ffd2a12a78efdc422d9d1be74905b0c0ec157180..627ea6cd25b27977ab2b6df835f0b5f25d0f206a 100644 --- a/src/account/serializers.py +++ b/src/account/serializers.py @@ -129,20 +129,19 @@ class ProfileSerializer_Staff(serializers.ModelSerializer): class MonitoringSerializer(serializers.ModelSerializer): full_name = serializers.SerializerMethodField() email = serializers.SerializerMethodField() + bits = serializers.SerializerMethodField() class Meta: model = models.Profile read_only_fields = ( 'full_name', 'email', - 'events_visited', - 'homework_bits', + 'bits', ) fields = ( 'full_name', 'email', - 'events_visited', - 'homework_bits', + 'bits', ) def get_full_name(self, obj): @@ -150,3 +149,8 @@ class MonitoringSerializer(serializers.ModelSerializer): def get_email(self, obj): return obj.user.email + + def get_bits(self, obj): + if obj.homework_bits is None: + return obj.events_visited + return obj.homework_bits + obj.events_visited