From 4e71cb108f3f2c0db0bd7c85ed3303158fa0a5fe Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Thu, 20 Jul 2017 18:30:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B8=D0=BF=D0=BB=D0=BE=D0=BC=D0=BE=D0=B2=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 +++--- management/urls.py | 3 +++ management/views.py | 42 ++++++++++++++++++++++++++++++++++++++++-- templates/cabinet.html | 41 +++++++++++++++++++++++++++++++++++------ 4 files changed, 81 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e858c2..3664577 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ # This file is a template, and might need editing before it works on your project. # Official docker image. -#image: docker:latest -#services: -# - docker:dind +image: docker:latest +services: + - docker:dind variables: CHANNEL: "skillbox" SERVER_URL: "lms.test.spicycms.com" diff --git a/management/urls.py b/management/urls.py index eb1b4bd..3a467c5 100755 --- a/management/urls.py +++ b/management/urls.py @@ -38,9 +38,12 @@ urlpatterns = [ url(r'reports_api/now_second_hw/$', reports.now_second_hw), url(r'self_sent_letter/$', api.self_sent_letter), url(r'workcabinet/$', views.render_management_cabinet), + url(r'diplomscabinet/$', views.render_diplom_cabinet), url(r'find_user/$', api.find_user), url(r'find_course/$', api.find_course), url(r'open_lessons/$', api.open_lessons), url(r'open_homes/$', api.open_homes), url(r'change_pass/$', api.change_pass), + url(r'open_diploms/$', api.open_diploms), + ] diff --git a/management/views.py b/management/views.py index 32ac4c5..5afab30 100755 --- a/management/views.py +++ b/management/views.py @@ -9,7 +9,8 @@ from finance.models import Bill, ServiceRequest, Price from management.models import News, Faq, FaqTitle from courses.models import Course, CourseTheme from management.reports import get_now_success_hw, get_second_success_hw - +from access.models import User +from finance.models import Bill, Price @response_decor(template='super_bill.html') def super_bill(request): @@ -133,4 +134,41 @@ def progress_report(request): @response_decor(template='cabinet.html') def render_management_cabinet(request): - return {} \ No newline at end of file + return {} + + +from .forms import UploadFileForm + +@response_decor(template='diplomscab.html') +def render_diplom_cabinet(request): + context = {} + if request.method == 'POST': + + form = UploadFileForm(request.POST, request.FILES) + print(form) + for l in request.FILES['file'].readlines(): + try: + user = User.objects.get(email=l.rstrip().lower()) + except User.DoesNotExist: + context['error'] = 'Плохая почта %s' % l + + try: + data = form.cleaned_data + id_ = int(data['service_id']) + service = Price.objects.get(id=id_) + bill = Bill.objects.create(user=user, status='F', service=service) + bill.save() + except Exception: + context['error'] = 'Не получилось создать счет для %s' % l + + + context['form'] = form + print(context) + return context + else: + form = UploadFileForm() + + context['form'] = form + print(context) + return context + diff --git a/templates/cabinet.html b/templates/cabinet.html index f0f2dc2..166568d 100644 --- a/templates/cabinet.html +++ b/templates/cabinet.html @@ -2,7 +2,7 @@ {% block title %}Рабочий кабинет{% endblock %} {% block content %}