diff --git a/progress/views.py b/progress/views.py index 43705f4..e70e22e 100644 --- a/progress/views.py +++ b/progress/views.py @@ -75,6 +75,7 @@ class CourseProgressDynamicView(APIView): if request.user.is_authenticated() and request.user.is_staff: progresses = ProgressLesson.objects.all() + waiters = ProgressLesson.objects.filter(status='wait') if only_hw: progresses = progresses.filter(checker=F('progress__teacher')) @@ -83,6 +84,7 @@ class CourseProgressDynamicView(APIView): progresses = progresses.filter(progress__course_token=course_token) if not teacher_email is '': + waiters = waiters.filter(checker__email=teacher_email) progresses = progresses.filter(checker__email=teacher_email) res = {} @@ -106,6 +108,7 @@ class CourseProgressDynamicView(APIView): res['finish'] = progresses_finish res['start'] = progresses_start + res['in_progress'] = waiters.count() return Response(res, status=200) return Response('Доступно только персоналу', status=403)