From 32ab1e876493050778471b95132ea6c1f1b7e5a5 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Feb 2018 17:30:18 +0300 Subject: [PATCH] =?UTF-8?q?update=20api=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE?= =?UTF-8?q?=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- progress/serializers.py | 7 ++++++- progress/views.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/progress/serializers.py b/progress/serializers.py index ac0c0dd..269f97e 100644 --- a/progress/serializers.py +++ b/progress/serializers.py @@ -35,6 +35,7 @@ class ProgressAnalyticSerializer(serializers.ModelSerializer): class ProgressLessonSerializer(serializers.ModelSerializer): teacher = serializers.SerializerMethodField() student = serializers.SerializerMethodField() + course_token = serializers.SerializerMethodField() class Meta: model = ProgressLesson @@ -46,4 +47,8 @@ class ProgressLessonSerializer(serializers.ModelSerializer): @staticmethod def get_student(self): - return self.progress.user.get_full_name() \ No newline at end of file + return self.progress.user.get_full_name() + + @staticmethod + def get_course_token(self): + return self.progress.course_token \ No newline at end of file diff --git a/progress/views.py b/progress/views.py index 2ae6bbf..f27f131 100644 --- a/progress/views.py +++ b/progress/views.py @@ -123,10 +123,10 @@ class UpdateProgress(APIView): raise ValueError("Этого никогда не должно происходить, но я уверен, что произойдёт") elif not is_student and pv.status == ProgressLesson.STATUSES.wait: - if action == "fail": + if action == "no": pv.status = ProgressLesson.STATUSES.fail - elif action == "done": + elif action == "yes": pv.status = ProgressLesson.STATUSES.done pv.finish_date = datetime.datetime.now()