|
|
|
@ -68,7 +68,7 @@ class CourseProgressDynamicView(APIView): |
|
|
|
@staticmethod |
|
|
|
@staticmethod |
|
|
|
def get(request): |
|
|
|
def get(request): |
|
|
|
course_token = request.GET.get('course_token', '') |
|
|
|
course_token = request.GET.get('course_token', '') |
|
|
|
teacher_email = request.GET.get('teacher_email', '') |
|
|
|
teacher_email = request.GET.get('teacher_email', '').lower() |
|
|
|
from_date = int(request.GET.get('from', '7')) |
|
|
|
from_date = int(request.GET.get('from', '7')) |
|
|
|
to_date = int(request.GET.get('to', '0')) |
|
|
|
to_date = int(request.GET.get('to', '0')) |
|
|
|
only_hw = request.GET.get('only_hw', 'yes') == 'yes' |
|
|
|
only_hw = request.GET.get('only_hw', 'yes') == 'yes' |
|
|
|
@ -82,7 +82,7 @@ class CourseProgressDynamicView(APIView): |
|
|
|
if not course_token is '': |
|
|
|
if not course_token is '': |
|
|
|
progresses = progresses.filter(progress__course_token=course_token) |
|
|
|
progresses = progresses.filter(progress__course_token=course_token) |
|
|
|
|
|
|
|
|
|
|
|
if not (teacher_email is '' or only_hw): |
|
|
|
if not teacher_email is '': |
|
|
|
progresses = progresses.filter(checker__email=teacher_email) |
|
|
|
progresses = progresses.filter(checker__email=teacher_email) |
|
|
|
|
|
|
|
|
|
|
|
res = {} |
|
|
|
res = {} |
|
|
|
|