migrate update

feature/fix_generate_pass
Andrey 8 years ago
parent bc4abd2e63
commit f54864c225
  1. 4
      progress/tasks.py
  2. 6
      progress/views.py

@ -12,13 +12,13 @@ def add_next_lesson(progress):
for lesson, is_hw in lesson_list: for lesson, is_hw in lesson_list:
if is_hw: if is_hw:
pl = ProgressLesson.objects.create( pl, _c = ProgressLesson.objects.get_or_create(
progress=progress, progress=progress,
lesson_token=lesson, lesson_token=lesson,
checker=progress.teacher, checker=progress.teacher,
) )
else: else:
pl = ProgressLesson.objects.create( pl, _c = ProgressLesson.objects.get_or_create(
progress=progress, progress=progress,
lesson_token=lesson, lesson_token=lesson,
checker=progress.user, checker=progress.user,

@ -133,7 +133,7 @@ class TeacherUpdateProgress(APIView):
res = {"current": ProgressLessonSerializer(pv).data} res = {"current": ProgressLessonSerializer(pv).data}
if pv.status == ProgressLesson.STATUSES.done: if pv.status == ProgressLesson.STATUSES.done:
# TODO: Ассинхроннаязадача для celery # TODO: Ассинхроннаязадача для celery
res['next'] = add_next_lesson(p) res['next'] = ProgressLessonSerializer(add_next_lesson(p)).data
return Response(res, status=200) return Response(res, status=200)
@ -163,8 +163,8 @@ class StudentUpdateProgress(APIView):
lesson_token=lesson_token, lesson_token=lesson_token,
) )
if not pv.status == ProgressLesson.STATUSES.wait \
and not pv.status == ProgressLesson.STATUSES.done: if not pv.status == ProgressLesson.STATUSES.wait:
if pv.checker == p.teacher: if pv.checker == p.teacher:
pv.status = ProgressLesson.STATUSES.wait pv.status = ProgressLesson.STATUSES.wait

Loading…
Cancel
Save