Не подтверждена Коммит a5e2470c создал по автору AdLeGeR's avatar AdLeGeR Зафиксировано автором GitHub
Просмотр файлов

Merge pull request #115 from RushanCources/issue106_project-ui 

Issue106 project UI
владельцы 62b98e68 93e2b5e4
Скрыть пробелы
Построчно Рядом
portal/management/views.py
Просмотр файла @ a5e2470c
......@@ -158,7 +158,6 @@ def profile(request):
close_projects_packs = [ProjectsPack(project) for project in close_projects_st]
request_projects_packs = [ProjectsPack(project) for project in request_projects_st]
else:
open_projects_T = Project.objects.filter(teacher=request.user, _status = "on work")
close_projects_T = Project.objects.filter(teacher=request.user, _status = "done")
request_projects_T = Project.objects.filter(teacher=request.user, _status = "send request")
......
portal/projects/views.py
Просмотр файла @ a5e2470c
......@@ -127,13 +127,28 @@ def check_post_request(*need_values):
return decorator
@check_post_request('teacher', 'name', "subject")
@check_post_request('teacher', 'name', "subject", "teacher-checkbox")
def create(request: HttpRequest):
teacher_id = request.POST.get("teacher")
subject = request.POST.get("subject")
name = request.POST.get("name")
is_another_teacher = request.POST.get('teacher-checkbox')
print(is_another_teacher)
try:
teacher = User.objects.get(id=teacher_id)
if is_another_teacher == 'on':
another_teacher = request.POST.get("new-teacher")
last_user = User.objects.last()
if last_user is None:
new_id = 1
else:
new_id = last_user.pk + 1
teacher: User = User.objects.create_user(username=new_id, first_name=another_teacher.split()[0],
last_name=another_teacher.split()[1], middle_name=another_teacher.split()[2],
role='Учитель', id=new_id)
teacher.set_password(User.objects.make_random_password(30))
teacher.save()
else:
teacher = User.objects.get(id=teacher_id)
if teacher.role != "Учитель":
return render(request, "WrongData.html")
project = Project.objects.create(name=name, teacher=teacher, student=request.user)
......@@ -219,7 +234,7 @@ def download_file(request: HttpRequest):
if check_what_user_not_have_access(request, file_object.project):
return render(request, "NotEnoughPermissions.html")
filepath = file_object.file.path
return FileResponse(open(filepath, 'rb'))
return FileResponse(open(filepath, 'rb'), as_attachment=True)
except File.DoesNotExist:
return render(request, "WrongData.html")
except BaseException as e:
......
portal/templates/projects/create.html
Просмотр файла @ a5e2470c
......@@ -25,13 +25,13 @@
<h3 class="h3 tea">Учитель</h3>
<div class="teachers">
<div class="teacher teacher-open">
<select name="teacher" id="selTea" class="wf select2" required>
<select name="teacher" id="selTea" class="wf select2">
{% for teacher in teachers %}
<option value="{{ teacher.id }}" class="opG opt">{{ teacher.fullName }}</option>
{% endfor %}
</select>
</div>
<input type="text" class="new-teacher wf" placeholder="ФИО учителя">
<input type="text" class="new-teacher wf" placeholder="ФИО учителя" name="new-teacher">
</div>
<div class="checkbox">
<input type="checkbox" name="teacher-checkbox" id="teacher-checkbox" onclick="checkbox()">
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать