From 6e9a570dc8caed4094cf918c1c451fffa0b2ac9e Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Mon, 17 Feb 2020 20:34:43 +0100
Subject: [PATCH] only send sum of bits
---
src/account/serializers.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/account/serializers.py b/src/account/serializers.py
index ffd2a12..627ea6c 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
--
GitLab