From 993cda852168b7c68bb992155996d2ca1003b7a3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 21 Dec 2017 16:45:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=B6=D1=83=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D1=8B=20(=D1=82=D0=B5=D0=BC,=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=D0=BE=D0=B2,=20=D0=BA=D1=83=D1=80=D1=81=D0=BE?= =?UTF-8?q?=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access/serializers.py | 7 ++++++- csv/load_courses.py | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/access/serializers.py b/access/serializers.py index 4924d53..97e455c 100644 --- a/access/serializers.py +++ b/access/serializers.py @@ -7,15 +7,20 @@ from achievements.serialers import DiplomaSerializer, AchievementsSerializer class PivotProgressSerializer(serializers.ModelSerializer): status = serializers.SerializerMethodField() + teacher = serializers.SerializerMethodField() class Meta: model = PivotProgressVertex - exclude = ('id',) + exclude = ('id', 'progress') @staticmethod def get_status(self): return self.get_status_display() + @staticmethod + def get_teacher(self): + return self.teacher.get_full_name() + class ProgressSerializer(serializers.ModelSerializer): vertexes = serializers.SerializerMethodField() diff --git a/csv/load_courses.py b/csv/load_courses.py index 5f3c605..dc522b1 100644 --- a/csv/load_courses.py +++ b/csv/load_courses.py @@ -87,6 +87,7 @@ if __name__ == '__main__': video=row.pop('video', None), materials=materials, topic=topic, + free=row['free'], description=description, title=title, token=''.join(random.choice(string.ascii_letters) for x in range(15))