From 3126dbb68ea8d756f22f031ee1778fda4f1cfba6 Mon Sep 17 00:00:00 2001 From: bigboy Date: Tue, 25 Apr 2017 00:45:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D0=B8=D0=B0=D0=BB=D0=B0=20=D0=B8=D0=B7=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=B4=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/views.py | 78 ++++++------------------------------------------ journals/api.py | 9 +----- 2 files changed, 10 insertions(+), 77 deletions(-) diff --git a/courses/views.py b/courses/views.py index 20dfc7a..19494fa 100755 --- a/courses/views.py +++ b/courses/views.py @@ -55,21 +55,7 @@ def course(request, slug): journal.start_date = datetime.datetime.now() journal.save() - waiting_materials = [] - if journal.waiting.exists(): - for n in journal.waiting.all(): - _obj = n.get_obj() - __type = n.get_type() - _type = None - if __type == 'L': - _type = 'lesson' - elif __type == 'H': - _type = 'homework' - elif __type == 'E': - _type = 'exam' - - waiting_materials.append({'obj': _obj, 'type': _type}) - return {'course': journal.get_face(user_fabric(request.user)), 'user': user_fabric(request.user), 'waiting_materials': waiting_materials} + return {'course': journal.get_face(user_fabric(request.user)), 'user': user_fabric(request.user)} @response_decor(template='lesson.html') @@ -86,27 +72,12 @@ def lesson(request, lesson): check_journal(j) lj = LessonJ.objects.get(material=lesson, student=request.user) - waiting_materials = [] - if lj.parent.parent.waiting.exists(): - for n in lj.parent.parent.waiting.all(): - _obj = n.get_obj() - __type = n.get_type() - _type = None - if __type == 'L': - _type = 'lesson' - elif __type == 'H': - _type = 'homework' - elif __type == 'E': - _type = 'exam' - - waiting_materials.append({'obj': _obj, 'type': _type}) - if request.user.is_authenticated() and request.user.is_admin or request.user in lesson.course.teachers.all(): return {'lesson': lj.get_face(user_fabric(request.user)), 'course': {'head': lj.parent.parent.get_head_face(), 'level': lj.parent.parent.course.get_level(), 'journal': lj.parent.parent.get_face(user_fabric(request.user))}, - 'bought': True, 'accept': True, 'waiting_materials': waiting_materials} + 'bought': True, 'accept': True} if not lesson.free and not system_check_bill(lesson.token, request.user, theme_type=lesson.theme._type): return {'redirect': '/access/by_error/'} @@ -122,7 +93,7 @@ def lesson(request, lesson): lj.date = datetime.datetime.now() lj.save() if result: - return {'lesson': lj.get_face(user_fabric(request.user)), 'course': {'head': lj.parent.parent.get_head_face(), 'level': lj.parent.parent.course.get_level(), 'journal': lj.parent.parent.get_face(user_fabric(request.user))}, 'bought': True, 'accept': True, 'waiting_materials': waiting_materials} + return {'lesson': lj.get_face(user_fabric(request.user)), 'course': {'head': lj.parent.parent.get_head_face(), 'level': lj.parent.parent.course.get_level(), 'journal': lj.parent.parent.get_face(user_fabric(request.user))}, 'bought': True, 'accept': True} @response_decor(template='homework.html') @@ -138,27 +109,12 @@ def homework(request, homework): check_journal(j) hj = HomeworkJ.objects.get(material=Homework.objects.get(id=homework), student=request.user) - waiting_materials = [] - if hj.parent.parent.waiting.exists(): - for n in hj.parent.parent.waiting.all(): - _obj = n.get_obj() - __type = n.get_type() - _type = None - if __type == 'L': - _type = 'lesson' - elif __type == 'H': - _type = 'homework' - elif __type == 'E': - _type = 'exam' - - waiting_materials.append({'obj': _obj, 'type': _type}) - if request.user.is_authenticated() and request.user.is_admin: return {'homework': hj.get_face(user_fabric(request.user)), 'course': {'head': hj.parent.parent.get_head_face(), 'level': hj.parent.parent.course.get_level(), - 'journal': hj.parent.parent.get_face(user_fabric(request.user))}, - 'waiting_materials': waiting_materials} + 'journal': hj.parent.parent.get_face(user_fabric(request.user))} + } if not system_check_bill(hj.material.token, request.user, theme_type=hj.material.theme._type): return {'redirect': '/access/by_error/'} @@ -177,8 +133,7 @@ def homework(request, homework): if result: return {'homework': hj.get_face(user_fabric(request.user)), 'course': {'head': hj.parent.parent.get_head_face(), - 'level': hj.parent.parent.course.get_level(), 'journal': hj.parent.parent.get_face(user_fabric(request.user))}, - 'waiting_materials': waiting_materials} + 'level': hj.parent.parent.course.get_level(), 'journal': hj.parent.parent.get_face(user_fabric(request.user))},} @response_decor(template='exam.html') @@ -194,25 +149,10 @@ def exam(request, exam): check_journal(j) exam = ExamJ.objects.get(material=Exam.objects.get(id=exam), student=request.user) - waiting_materials = [] - if exam.parent.parent.waiting.all().exists(): - for n in exam.parent.parent.waiting.all(): - _obj = n.get_obj() - __type = n.get_type() - _type = None - if __type == 'L': - _type = 'lesson' - elif __type == 'H': - _type = 'homework' - elif __type == 'E': - _type = 'exam' - - waiting_materials.append({'obj': _obj, 'type': _type}) - if request.user.is_authenticated() and request.user.is_admin: return {'exam': exam.get_face(user_fabric(request.user)), - 'course': {'head': exam.parent.parent.get_head_face(), 'level': exam.parent.parent.course.get_level()}, - 'waiting_materials': waiting_materials} + 'course': {'head': exam.parent.parent.get_head_face(), 'level': exam.parent.parent.course.get_level()} + } if not system_check_bill(exam.material.token, request.user): return {'redirect': '/access/by_error/'} @@ -229,7 +169,7 @@ def exam(request, exam): exam.save() if result: - return {'exam': exam.get_face(user_fabric(request.user)), 'course': {'head': exam.parent.parent.get_head_face(), 'level': exam.parent.parent.course.get_level()}, 'waiting_materials': waiting_materials} + return {'exam': exam.get_face(user_fabric(request.user)), 'course': {'head': exam.parent.parent.get_head_face(), 'level': exam.parent.parent.course.get_level()}} @response_decor(template='all_achievements.html', without_auth=True) diff --git a/journals/api.py b/journals/api.py index 0dbc18f..78eef8c 100755 --- a/journals/api.py +++ b/journals/api.py @@ -102,14 +102,7 @@ def check_jaccess(request, context): if request.user in journal[0].material.course.teachers.all(): context['code'] = '1' return context - w = journal.first().parent.parent.waiting - if w.exists(): - if w.first().token != journal.first().material.token: - if w.first().token > journal.first().material.token: - context['code'] = '1' - return context - context['code'] = '0' - return context + _before = journal.first().get_before() if journal.first().get_status_flag() != 'N': context['code'] = '1'