From 13b94cc6277f076e56344a69866f11f07ed60c96 Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Wed, 19 Jul 2017 18:01:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BC=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- management/api.py | 37 +++++-- templates/cabinet.html | 222 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 7 deletions(-) create mode 100644 templates/cabinet.html diff --git a/management/api.py b/management/api.py index b043656..1a5cf55 100755 --- a/management/api.py +++ b/management/api.py @@ -208,13 +208,21 @@ def open_lessons(request, context): user = User.objects.get(id=request.GET['user']) course = Course.objects.get(id=request.GET['course']) checkbox = True if request.GET.get('homes') == 'on' else False - themes = request.GET['themes'] + themes = request.GET['themes'].split(' ') + themes.remove('') + for t in themes: + t = int(t) + except Exception: return '0' try: teachj, status = TeacherJ.objects.get_or_create(student=user, course=course) - for t in CourseTheme.objects.filter(course=course): + if themes: + course_themes = CourseTheme.objects.filter(course=course, sort__in=themes) + else: + course_themes = CourseTheme.objects.filter(course=course) + for t in course_themes: for l in LessonJ.objects.filter(student=user, parent__material=t): l.success = True l.save() @@ -237,11 +245,20 @@ def open_homes(request, context): try: user = User.objects.get(id=request.GET['user']) course = Course.objects.get(id=request.GET['course']) + themes = request.GET['themes'].split(' ') + themes.remove('') + for t in themes: + t = int(t) + except Exception: return'0' try: - for t in CourseTheme.objects.filter(course=course): + if themes: + course_themes = CourseTheme.objects.filter(course=course, sort__in=themes) + else: + course_themes = CourseTheme.objects.filter(course=course) + for t in course_themes: if HomeworkJ.objects.filter(student=user, parent__material=t).exists(): homej = HomeworkJ.objects.get(student=user, parent__material=t) homej.success = True @@ -253,10 +270,16 @@ def open_homes(request, context): @api_decor(without_auth=False) def change_pass(request, context): - user = User.objects.get(id=request.GET['user']) - password = request.GET.get('pass') + try: + user = User.objects.get(id=request.GET['user']) + password = request.GET.get('pass') + except Exception: + return '0' - user.set_password(password) - user.save() + try: + user.set_password(password) + user.save() + except Exception: + return '1' return '2' diff --git a/templates/cabinet.html b/templates/cabinet.html new file mode 100644 index 0000000..f0f2dc2 --- /dev/null +++ b/templates/cabinet.html @@ -0,0 +1,222 @@ +{% extends 'base_index.html' %} +{% block title %}Рабочий кабинет{% endblock %} +{% block content %} + + +
+
+
Открыть уроки
+
+
+ Введите id пользователя + +
+
+
+ Введите id курса + +
+
+
+ Открыть домашки + +
+
+ Отдельные темы + +
+
+ +
+
+
+
Открыть домашки
+
+
+ Введите id пользователя + +
+
+
+ Введите id курса + +
+
+
+ Отдельные темы + +
+
+ +
+
+ +
+
+
+
Поменять пароль
+
+
+ Введите id пользователя + +
+
+
+ Введите новый пароль + +
+
+ +
+
+
+ + + +{% endblock %}