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()