diff --git a/progress/views.py b/progress/views.py index 6b3ee94..66f7a6e 100644 --- a/progress/views.py +++ b/progress/views.py @@ -189,15 +189,18 @@ class StudentUpdateProgress(APIView): lesson_token=lesson_token, ) - if not pv.status == ProgressLesson.STATUSES.wait: - if pv.checker == pv.progress.teacher and not comment is None: - pv.status = ProgressLesson.STATUSES.wait - pv.comment_tokens.append(comment) + if pv.status == ProgressLesson.STATUSES.done: + Response(SecureProgressSerializer(pv.progress).data, status=200) - elif pv.checker == pv.progress.user: + if not pv.status == ProgressLesson.STATUSES.wait: + if pv.checker == pv.progress.user: pv.status = ProgressLesson.STATUSES.done pv.finish_date = datetime.datetime.now() + elif not comment is None: + pv.status = ProgressLesson.STATUSES.wait + pv.comment_tokens.append(comment) + else: raise ValueError("Этого никогда не должно происходить, но я уверен, что произойдёт")