Коммит bfda9560 создал по автору Кабанин Денис Андреевич's avatar Кабанин Денис Андреевич
Просмотр файлов

Merge branch '160-баг-фикс-в-разделе-проектов' into issue147_project-ui

владельцы 9d4e6db7 c6731ab6
Скрыть пробелы
Построчно Рядом
portal/management/models.py
Просмотр файла @ bfda9560
...@@ -20,6 +20,9 @@ class User(AbstractUser): ...@@ -20,6 +20,9 @@ class User(AbstractUser):
def set_full_name(self): def set_full_name(self):
self.full_Name = self.last_name + self.first_name + self.middle_name self.full_Name = self.last_name + self.first_name + self.middle_name
def get_full_name(self) -> str:
return self.last_name+' '+self.first_name+' '+self.middle_name;
def save_photo(self, *args, **kwargs): def save_photo(self, *args, **kwargs):
super().save() super().save()
img = Image.open(self.avatar.path) img = Image.open(self.avatar.path)
......
portal/projects/migrations/0003_project__level.py 0 → 100644
Просмотр файла @ bfda9560
# Generated by Django 4.2.3 on 2023-09-02 18:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("projects", "0002_file_name_project__type"),
]
operations = [
migrations.AddField(
model_name="project",
name="_level",
field=models.CharField(max_length=10, null=True),
),
]
portal/projects/models.py
Просмотр файла @ bfda9560
...@@ -16,7 +16,9 @@ class Project(Model): ...@@ -16,7 +16,9 @@ class Project(Model):
_statuses = ["send request", "on work", "send to verification", "done"] _statuses = ["send request", "on work", "send to verification", "done"]
_status = CharField(max_length=30) _status = CharField(max_length=30)
_subjects = CharField(max_length=100, null=True) _subjects = CharField(max_length=100, null=True)
_types = ['Проект', 'НОУ'] _levels = ['Проект', 'НОУ']
_level = CharField(max_length=10, null=True)
_types = ['Исследовательский', 'Информационный', 'Прикладной', 'Ролевой(игровой)', 'Социальный', 'Технологическийт (инженерный)', 'Бизнес-план']
_type = CharField(max_length=10, null=True) _type = CharField(max_length=10, null=True)
problem = CharField(max_length=1000, null=True) problem = CharField(max_length=1000, null=True)
relevance = CharField(max_length=1000, null=True) relevance = CharField(max_length=1000, null=True)
...@@ -47,12 +49,21 @@ class Project(Model): ...@@ -47,12 +49,21 @@ class Project(Model):
return self._status return self._status
def set_type(self, project_type): def set_type(self, project_type):
print(project_type, project_type in self._types, self._types)
if project_type in self._types: if project_type in self._types:
self._type = project_type self._type = project_type
self.save() self.save()
def get_type(self): def get_type(self):
return self._type return self._type
def set_level(self, project_level):
if project_level in self._levels:
self._level = project_level
self.save()
def get_level(self):
return self._level
# эта константа показывает сколько версий может быть у одного файла # эта константа показывает сколько версий может быть у одного файла
......
portal/projects/templatetags/run.py удалено 100644 → 0
Просмотр файла @ 9d4e6db7
from django.template import Library
register = Library()
@register.filter(is_safe=True)
def run(func):
return func
\ No newline at end of file
portal/projects/views.py
Просмотр файла @ bfda9560
...@@ -42,24 +42,12 @@ def index(request: HttpRequest): ...@@ -42,24 +42,12 @@ def index(request: HttpRequest):
context_projects = [] context_projects = []
for project in projects: for project in projects:
# files = list(File.objects.filter(project=project, version=1)) files = list(File.objects.filter(project=project, version=1))
# variables = vars(project) variables = vars(project)
# values = {key : val for key, val in zip(variables.keys(), variables.values()) if key != '_state'} values = {key : val for key, val in zip(variables.keys(), variables.values()) if key != '_state'}
# pp = ProjectPack(**values) pp = ProjectPack(**values)
# pp.files = files pp.files = files
full_teacher_name = project.teacher.last_name + ' ' + project.teacher.first_name[0] + '. ' + project.teacher.middle_name[0] + '.' context_projects.append(pp)
full_student_name = project.student.last_name + ' ' + project.student.first_name[0] + '. ' + project.student.middle_name[0] + '.'
some_project = {
"name" : project.name,
"descr": project.description,
"status": project.get_status(),
"type": project.get_type(),
"subjects" : project.get_subjects(),
"teacher" : full_teacher_name,
"student": full_student_name,
"id" : project.id,
}
context_projects.append(some_project)
return render(request, "projects/index.html", context={'projects': context_projects, return render(request, "projects/index.html", context={'projects': context_projects,
'has_projects': len(context_projects) > 0}) 'has_projects': len(context_projects) > 0})
...@@ -82,6 +70,7 @@ def index(request: HttpRequest): ...@@ -82,6 +70,7 @@ def index(request: HttpRequest):
"status": project.get_status(), "status": project.get_status(),
"subjects" : project.get_subjects(), "subjects" : project.get_subjects(),
"description": project.description, "description": project.description,
"project_level": project.get_level(),
"project_type": project.get_type(), "project_type": project.get_type(),
'problem': project.problem, 'problem': project.problem,
"relevance": project.relevance, "relevance": project.relevance,
...@@ -209,19 +198,20 @@ def correct_project(request: HttpRequest): ...@@ -209,19 +198,20 @@ def correct_project(request: HttpRequest):
return render(request, "NotEnoughPermissions.html") return render(request, "NotEnoughPermissions.html")
name = request.POST.get("name", -1) name = request.POST.get("name", -1)
description = request.POST.get("description", -1) description = request.POST.get("description", -1)
project_type = request.POST.get('project-type', -1) project_level = request.POST.get('project-level', -1)
problem = request.POST.get('problem', -1) problem = request.POST.get('problem', -1)
relevance = request.POST.get('relevance', -1) relevance = request.POST.get('relevance', -1)
target = request.POST.get('target', -1) target = request.POST.get('target', -1)
tasks = request.POST.get('tasks', -1) tasks = request.POST.get('tasks', -1)
expected_results = request.POST.get('expected-results', -1) expected_results = request.POST.get('expected-results', -1)
project_type = request.POST.get('project-type', -1) project_type = request.POST.get('project-type', -1)
print(project_type)
if name != -1: if name != -1:
project.name = name project.name = name
if description != -1: if description != -1:
project.description = description project.description = description
if project_type != -1: if project_level != -1:
project.set_type(project_type) project.set_level(project_level)
if problem != -1: if problem != -1:
project.problem = problem project.problem = problem
if relevance != -1: if relevance != -1:
......
portal/static/css/projects/index.css
Просмотр файла @ bfda9560
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
.list{ .list{
position: absolute; position: absolute;
z-index: 2; z-index: 5;
width: 100%; width: 100%;
max-height: 200px; max-height: 200px;
overflow-y: auto; overflow-y: auto;
......
portal/static/css/projects/project_page_work.css
Просмотр файла @ bfda9560
...@@ -141,13 +141,13 @@ ...@@ -141,13 +141,13 @@
align-items: center; align-items: center;
} }
.type-line { .level-line {
width: 60%; width: 60%;
height: 1px; height: 1px;
background: rgba(0,0,0,0.3); background: rgba(0,0,0,0.3);
} }
.type-label { .level-label {
padding-top: 55px; padding-top: 55px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -158,11 +158,21 @@ ...@@ -158,11 +158,21 @@
cursor: pointer; cursor: pointer;
} }
.type-label:last-child { .level-label:last-child {
background-image: url("../../img/project/noy.svg"); background-image: url("../../img/project/noy.svg");
background-size: 45px 45px; background-size: 45px 45px;
} }
.type-label {
display: flex;
flex-direction: column;
align-items: center;
min-width: 50px;
cursor: pointer;
display: flex;
flex-direction: row;
}
.form-input { .form-input {
margin-bottom: 15px; margin-bottom: 15px;
display: block; display: block;
......
portal/static/js/global/list.js
Просмотр файла @ bfda9560
...@@ -12,6 +12,7 @@ window.onclick = function(event) { ...@@ -12,6 +12,7 @@ window.onclick = function(event) {
if (event.target.matches('.list-li')){ if (event.target.matches('.list-li')){
let text = event.target.innerHTML; let text = event.target.innerHTML;
event.target.parentNode.parentNode.childNodes[1].innerHTML = text; event.target.parentNode.parentNode.childNodes[1].innerHTML = text;
event.target.parentNode.parentNode.childNodes[1].onchange();
$('.list').css({'display':'none'}); $('.list').css({'display':'none'});
} }
else if (!event.target.matches('.list-p')) { else if (!event.target.matches('.list-p')) {
......
portal/static/js/projects/index.js
Просмотр файла @ bfda9560
...@@ -74,4 +74,37 @@ $('.done').hover(function () { ...@@ -74,4 +74,37 @@ $('.done').hover(function () {
$(block.childNodes[1].childNodes).removeClass('dn2'); $(block.childNodes[1].childNodes).removeClass('dn2');
$(block.childNodes[1].childNodes).removeClass('dn3'); $(block.childNodes[1].childNodes).removeClass('dn3');
}, 400); }, 400);
}); });
\ No newline at end of file
function filter(){
let text = document.querySelector(".search-input").value.toLowerCase();
let group = document.getElementById("filter-group").innerText;
let type = document.getElementById("filter-role").innerText;
$('.project').each(function(i, element){
if(contains_text(element, text) && match_group(element, group) && match_type(element, type)){
element.style.display = 'flex';
}
else{
element.style.display = 'none';
}
});
}
function contains_text(element, text){
return element.querySelector('.title').textContent.toLowerCase().includes(text) || element.querySelector('.student').textContent.toLowerCase().includes(text);
}
function match_group(element, group){
if (group == "Не указано"){
return true;
}
return element.querySelector('.student-group').textContent == group;
}
function match_type(element, type){
if (type == "Не указано"){
return true;
}
return element.querySelector('.project-type').textContent == type;
}
\ No newline at end of file
portal/static/js/projects/project_page_on_work.js
Просмотр файла @ bfda9560
...@@ -61,21 +61,33 @@ function checking(name, is_click) { ...@@ -61,21 +61,33 @@ function checking(name, is_click) {
} }
} }
} else if (name == 'cb5') { } else if (name == 'cb5') {
if ($('.file-name')[0].innerText != '') { if (is_click) {
let content_status = $('.content-status')[4]; let content_status = $('.content-status')[4];
$(content_status).html(ok); $(content_status).html(ok);
$('.next-btn').css({'pointer-events' : 'auto'});
} else { } else {
let content_status = $('.content-status')[4]; let content_status = $('.content-status')[4];
$(content_status).html(not_ok); $(content_status).html(not_ok);
if (!is_opened) {
$('.next-btn').css({'pointer-events' : 'none'});
}
} }
} else if (name == 'cb6') {
if ($('.file-name')[1].innerText != '') { if ($('.file-name')[0].innerText != '') {
let content_status = $('.content-status')[5]; let content_status = $('.content-status')[5];
$(content_status).html(ok); $(content_status).html(ok);
} else { } else {
let content_status = $('.content-status')[5]; let content_status = $('.content-status')[5];
$(content_status).html(not_ok); $(content_status).html(not_ok);
} }
if ($('.file-name')[1].innerText != '') {
let content_status = $('.content-status')[6];
$(content_status).html(ok);
} else {
let content_status = $('.content-status')[6];
$(content_status).html(not_ok);
}
} }
} }
...@@ -108,7 +120,7 @@ if (is_opened) { ...@@ -108,7 +120,7 @@ if (is_opened) {
checking('cb' + num_of_cb); checking('cb' + num_of_cb);
if (num_of_cb != 5) { if (num_of_cb != 6) {
if ($($(new_cb)[0].childNodes[3].childNodes[1]).attr('class') == 'not_ok') { if ($($(new_cb)[0].childNodes[3].childNodes[1]).attr('class') == 'not_ok') {
if (!is_opened) { if (!is_opened) {
$('.next-btn').css({'pointer-events' : 'none'}); $('.next-btn').css({'pointer-events' : 'none'});
...@@ -119,7 +131,7 @@ if (is_opened) { ...@@ -119,7 +131,7 @@ if (is_opened) {
if (num_of_cb == 4) { if (num_of_cb == 4) {
$('.skip-btn').css({'display' : 'block'}); $('.skip-btn').css({'display' : 'block'});
} }
else if (num_of_cb == 5) { else if (num_of_cb == 6) {
$('.next-btn').css({ $('.next-btn').css({
'background-url' : 'none', 'background-url' : 'none',
'text-align' : 'center' 'text-align' : 'center'
...@@ -137,7 +149,7 @@ if (is_opened) { ...@@ -137,7 +149,7 @@ if (is_opened) {
$(new_cb).addClass('content-block-open'); $(new_cb).addClass('content-block-open');
num_of_cb++; num_of_cb++;
if (num_of_cb != 5) { if (num_of_cb != 6) {
if ($($(new_cb)[0].childNodes[3].childNodes[1]).attr('class') == 'not_ok') { if ($($(new_cb)[0].childNodes[3].childNodes[1]).attr('class') == 'not_ok') {
if (!is_opened) { if (!is_opened) {
$('.next-btn').css({'pointer-events' : 'none'}); $('.next-btn').css({'pointer-events' : 'none'});
...@@ -146,7 +158,7 @@ if (is_opened) { ...@@ -146,7 +158,7 @@ if (is_opened) {
} }
if (num_of_cb == 5) { if (num_of_cb == 6) {
$('.next-btn').css({ $('.next-btn').css({
'background-url' : 'none', 'background-url' : 'none',
'text-align' : 'center' 'text-align' : 'center'
...@@ -159,17 +171,26 @@ if (is_opened) { ...@@ -159,17 +171,26 @@ if (is_opened) {
} }
} }
// выбор типа проекта //установление типа проекта
$('.project-type').each(function(i, item) {
if (item.value == project_type){
item.checked = true;
item.onchange();
}
});
// выбор уровня проекта
$('.project-type').on('click',function() { $('.project-level').on('click',function() {
if ($(this).attr('id') == 'noy') { if ($(this).attr('id') == 'noy') {
$('.input-cb2').val('НОУ'); $('.input-cb5').val('НОУ');
} else if ($(this).attr('id') == 'project') { } else if ($(this).attr('id') == 'project') {
$('.input-cb2').val('Проект'); $('.input-cb5').val('Проект');
} }
}); });
let projec_type = $('.input-cb2').val(); let projec_type = $('.input-cb5').val();
if (projec_type == 'НОУ') { if (projec_type == 'НОУ') {
$('#noy').click(); $('#noy').click();
......
portal/templates/projects/index.html
Просмотр файла @ bfda9560
...@@ -32,18 +32,13 @@ ...@@ -32,18 +32,13 @@
{% if user.role == "Учитель" or user.role == 'Администратор' %} {% if user.role == "Учитель" or user.role == 'Администратор' %}
<div class="main-nav"> <div class="main-nav">
<div class="top-nav"> <div class="top-nav">
<form class="search" method="POST"> <div class="search">
{% csrf_token %}
{% if name_filter_have %}
<input class="search-input" type="text" placeholder="Поиск..." name="search_names" <input class="search-input" type="text" placeholder="Поиск..." name="search_names"
value="{{ name_filter }}"> value="{% if name_filter_have %}{{ name_filter }}{% endif %}"
{% else %} oninput="filter(this.value);" >
<input class="search-input" type="text" placeholder="Поиск..." name="search_names"> </div>
{% endif %}
<input class="search-button" type="submit" name="search_butt">
</form>
</div> </div>
<form class="filter" method="POST"> <div class="filter">
{% csrf_token %} {% csrf_token %}
<div class="div-list"> <div class="div-list">
<p class="list-name">Группа:</p> <p class="list-name">Группа:</p>
...@@ -51,7 +46,7 @@ ...@@ -51,7 +46,7 @@
{% if group_filter_have %} {% if group_filter_have %}
<p class="list-p" id="filter-group">{{ group_filter }}</p> <p class="list-p" id="filter-group">{{ group_filter }}</p>
{% else %} {% else %}
<p class="list-p" id="filter-group">Не указано</p> <p class="list-p" id="filter-group" onchange="filter();">Не указано</p>
{% endif %} {% endif %}
<ul class="list"> <ul class="list">
<li class="list-li">Не указано</li> <li class="list-li">Не указано</li>
...@@ -87,7 +82,7 @@ ...@@ -87,7 +82,7 @@
{% if role_filter_have %} {% if role_filter_have %}
<p class="list-p" id="filter-role">{{ role_filter }}</p> <p class="list-p" id="filter-role">{{ role_filter }}</p>
{% else %} {% else %}
<p class="list-p" id="filter-role">Не указано</p> <p class="list-p" id="filter-role" onchange="filter();">Не указано</p>
{% endif %} {% endif %}
<ul class="list sub-list"> <ul class="list sub-list">
<li class="list-li">Не указано</li> <li class="list-li">Не указано</li>
...@@ -96,17 +91,15 @@ ...@@ -96,17 +91,15 @@
</ul> </ul>
</div> </div>
</div> </div>
<input type="number" class="input-filter input-filter-group" name="group_filter"> <input type="number" class="input-filter input-filter-group" name="group_filter" >
<input type="text" class="input-filter input-filter-type" name="type_filter"> <input type="text" class="input-filter input-filter-type" name="type_filter" >
<input class="btn btn-filter" type="submit" value="Применить" name="filter_submit" />
</form> </div>
</div> </div>
{% endif %} {% endif %}
<div class="content"> <div class="content">
{% load run %}
{% for project in projects %} {% for project in projects %}
{% if project.status == 'send request' %} {% if project.get_status == 'send request' %}
<a class="project project{{project.id}} send-request" href="./?id={{ project.id }}"> <a class="project project{{project.id}} send-request" href="./?id={{ project.id }}">
<div class="anim anim-send-request"> <div class="anim anim-send-request">
<div class="ball"></div> <div class="ball"></div>
...@@ -117,14 +110,16 @@ ...@@ -117,14 +110,16 @@
<h2 class="title">{{ project.name }}</h2> <h2 class="title">{{ project.name }}</h2>
<span class="subtitle">{{ project.subjects }}</span> <span class="subtitle">{{ project.subjects }}</span>
{% if user.role == 'Ученик' %} {% if user.role == 'Ученик' %}
<span>{{ project.teacher }}</span> <span>{{ project.teacher.get_full_name }}</span>
{% else %} {% else %}
<span>{{ project.student }}</span> <span class="student">{{ project.student.getPName }}</span>
<span hidden class="student-group">{{project.student.group}}</span>
{% endif %} {% endif %}
<span hidden class="project-type">{{project.get_level}}</span>
</div> </div>
</a> </a>
<!-- для проектов на этапе разработки --> <!-- для проектов на этапе разработки -->
{% elif project.status == 'on work' %} {% elif project.get_status == 'on work' %}
<a class="project project{{project.id}} on-work" href="./?id={{ project.id }}"> <a class="project project{{project.id}} on-work" href="./?id={{ project.id }}">
<div class="anim-on-work"> <div class="anim-on-work">
<div class="gear gear1"> <div class="gear gear1">
...@@ -141,13 +136,15 @@ ...@@ -141,13 +136,15 @@
<h2 class="title">{{ project.name }}</h2> <h2 class="title">{{ project.name }}</h2>
<span class="subtitle">{{ project.type }} <div class="sub-ball"></div> {{ project.subjects }}</span> <span class="subtitle">{{ project.type }} <div class="sub-ball"></div> {{ project.subjects }}</span>
{% if user.role == 'Ученик' %} {% if user.role == 'Ученик' %}
<span>{{ project.teacher }}</span> <span>{{ project.teacher.get_full_name }}</span>
{% else %} {% else %}
<span>{{ project.student }}</span> <span class="student">{{ project.student.getPName }}</span>
<span hidden class="student-group">{{project.student.group}}</span>
{% endif %} {% endif %}
<span hidden class="project-type">{{project.get_level}}</span>
</div> </div>
</a> </a>
{% elif project.status == 'done' %} {% elif project.get_status == 'done' %}
<!-- для выполненных проектов --> <!-- для выполненных проектов -->
<a class="project project{{project.id}} done" href="./?id={{ project.id }}"> <a class="project project{{project.id}} done" href="./?id={{ project.id }}">
<div class="anim-done"> <div class="anim-done">
...@@ -165,10 +162,12 @@ ...@@ -165,10 +162,12 @@
<h2 class="title">{{ project.name }}</h2> <h2 class="title">{{ project.name }}</h2>
<span class="subtitle">{{ project.type }} <div class="sub-ball"></div> {{ project.subjects }}</span> <span class="subtitle">{{ project.type }} <div class="sub-ball"></div> {{ project.subjects }}</span>
{% if user.role == 'Ученик' %} {% if user.role == 'Ученик' %}
<span>{{ project.teacher }}</span> <span>{{ project.teacher.get_full_name }}</span>
{% else %} {% else %}
<span>{{ project.student }}</span> <span class="student">{{ project.student.getPName }}</span>
<span hidden class="student-group">{{project.student.group}}</span>
{% endif %} {% endif %}
<span hidden class="project-type">{{project.get_level}}</span>
</div> </div>
</a> </a>
{% endif %} {% endif %}
......
portal/templates/projects/project_page.html
Просмотр файла @ bfda9560
...@@ -161,19 +161,34 @@ ...@@ -161,19 +161,34 @@
Название – это краткое, запоминающееся и отражающее суть проекта выражение, которое привлекает внимание и вызывает интерес у целевой аудитории. Название – это краткое, запоминающееся и отражающее суть проекта выражение, которое привлекает внимание и вызывает интерес у целевой аудитории.
</p> </p>
</div> </div>
<div class="content-block cb2"> <div class="content-block cb2">
<div class="content-div"> <div class="content-div" >
<span class="span">Тип проекта*: <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="question"><path d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z" fill="#b8b8b8" ></path></svg></span> <span class="span">Тип проекта*: <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="question"><path d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z" fill="#b8b8b8" ></path></svg></span>
<div class="content-type"> <div class="content-type" style="flex-direction: column;">
<label class="type-label"> <label class="type-label">
<input type="radio" id="project" onchange="checking('cb2', true)" value="Проект" class="project-type" name="type"> Проект <input type="radio" class='project-type' value="Исследовательский" name="project-type" onchange="checking('cb2', true)">
</label> Исследовательский</label>
<div class="type-line"></div>
<label class="type-label"> <label class="type-label">
<input type="radio" id="noy" onchange="checking('cb2', true)" value="НОУ" class="project-type" name="type"> НОУ <input type="radio" class='project-type' value="Информационный" name="project-type" onchange="checking('cb2', true)">
</label> Информационный</label>
<label class="type-label">
<input type="radio" class='project-type' value="Прикладной" name="project-type" onchange="checking('cb2', true)">
Прикладной</label>
<label class="type-label">
<input type="radio" class='project-type' value="Ролевой(игровой)" name="project-type" onchange="checking('cb2', true)">
Ролевой(игровой)</label>
<label class="type-label">
<input type="radio" class='project-type' value="Социальный" name="project-type" onchange="checking('cb2', true)">
Социальный</label>
<label class="type-label">
<input type="radio" class='project-type' value="Технологический (инженерный)" name="project-type" onchange="checking('cb2', true)">
Технологический (инженерный)</label>
<label class="type-label">
<input type="radio" class='project-type' value="Бизнес-план" name="project-type" onchange="checking('cb2', true)">
Бизнес-план</label>
<!-- Инфу брал отсюда https://lyc507u.mskobr.ru/users_files/lyc507u/%D0%BB%D0%BE%D0%BA%D0%B0%D0%BB%D1%8C%D0%BD%D1%8B%D0%B5%20%D0%B0%D0%BA%D1%82%D1%8B/%D0%9F%D0%BE%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5%20%D0%BE%20%D0%BF%D1%80%D0%BE%D0%B5%D0%BA%D1%82%D0%BD%D0%BE%D0%B9%20%D0%B4%D0%B5%D1%8F%D1%82%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D1%81%D1%82%D0%B8%202019.pdf -->
</div> </div>
<input type="hidden" name="project-type" class="input-cb2" value="{{ project_type }}">
</div> </div>
<div class="content-status"> <div class="content-status">
<svg class="not_ok" fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"> <path d="M3.89705 4.05379L3.96967 3.96967C4.23594 3.7034 4.6526 3.6792 4.94621 3.89705L5.03033 3.96967L10 8.939L14.9697 3.96967C15.2359 3.7034 15.6526 3.6792 15.9462 3.89705L16.0303 3.96967C16.2966 4.23594 16.3208 4.6526 16.1029 4.94621L16.0303 5.03033L11.061 10L16.0303 14.9697C16.2966 15.2359 16.3208 15.6526 16.1029 15.9462L16.0303 16.0303C15.7641 16.2966 15.3474 16.3208 15.0538 16.1029L14.9697 16.0303L10 11.061L5.03033 16.0303C4.76406 16.2966 4.3474 16.3208 4.05379 16.1029L3.96967 16.0303C3.7034 15.7641 3.6792 15.3474 3.89705 15.0538L3.96967 14.9697L8.939 10L3.96967 5.03033C3.7034 4.76406 3.6792 4.3474 3.89705 4.05379L3.96967 3.96967L3.89705 4.05379Z" fill="#e24a4a" /> </svg> <svg class="not_ok" fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"> <path d="M3.89705 4.05379L3.96967 3.96967C4.23594 3.7034 4.6526 3.6792 4.94621 3.89705L5.03033 3.96967L10 8.939L14.9697 3.96967C15.2359 3.7034 15.6526 3.6792 15.9462 3.89705L16.0303 3.96967C16.2966 4.23594 16.3208 4.6526 16.1029 4.94621L16.0303 5.03033L11.061 10L16.0303 14.9697C16.2966 15.2359 16.3208 15.6526 16.1029 15.9462L16.0303 16.0303C15.7641 16.2966 15.3474 16.3208 15.0538 16.1029L14.9697 16.0303L10 11.061L5.03033 16.0303C4.76406 16.2966 4.3474 16.3208 4.05379 16.1029L3.96967 16.0303C3.7034 15.7641 3.6792 15.3474 3.89705 15.0538L3.96967 14.9697L8.939 10L3.96967 5.03033C3.7034 4.76406 3.6792 4.3474 3.89705 4.05379L3.96967 3.96967L3.89705 4.05379Z" fill="#e24a4a" /> </svg>
...@@ -249,6 +264,28 @@ ...@@ -249,6 +264,28 @@
</div> </div>
<div class="content-block cb5"> <div class="content-block cb5">
<div class="content-div">
<span class="span">Уровень проекта*: <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="question"><path d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z" fill="#b8b8b8" ></path></svg></span>
<div class="content-type">
<label class="level-label">
<input type="radio" id="project" onchange="checking('cb5', true)" value="Проект" class="project-level" name="level"> Проект
</label>
<div class="level-line"></div>
<label class="level-label">
<input type="radio" id="noy" onchange="checking('cb5', true)" value="НОУ" class="project-level" name="level"> НОУ
</label>
</div>
<input type="hidden" name="project-level" class="input-cb5" value="{{ project_level}}">
</div>
<div class="content-status">
<svg class="not_ok" fill="none" height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"> <path d="M3.89705 4.05379L3.96967 3.96967C4.23594 3.7034 4.6526 3.6792 4.94621 3.89705L5.03033 3.96967L10 8.939L14.9697 3.96967C15.2359 3.7034 15.6526 3.6792 15.9462 3.89705L16.0303 3.96967C16.2966 4.23594 16.3208 4.6526 16.1029 4.94621L16.0303 5.03033L11.061 10L16.0303 14.9697C16.2966 15.2359 16.3208 15.6526 16.1029 15.9462L16.0303 16.0303C15.7641 16.2966 15.3474 16.3208 15.0538 16.1029L14.9697 16.0303L10 11.061L5.03033 16.0303C4.76406 16.2966 4.3474 16.3208 4.05379 16.1029L3.96967 16.0303C3.7034 15.7641 3.6792 15.3474 3.89705 15.0538L3.96967 14.9697L8.939 10L3.96967 5.03033C3.7034 4.76406 3.6792 4.3474 3.89705 4.05379L3.96967 3.96967L3.89705 4.05379Z" fill="#e24a4a" /> </svg>
</div>
<p class="help">
Уровень школьного проекта может быть НОУ (научное общество учащихся) или обычным проектом. <br><br> НОУ - добровольное общественное объединение учащихся 2-11 классов, которые стремятся к более глубокому познанию достижений в различных областях науки. <br><br> Обычный проект может быть любого характера: исследовательский, социальный, технический и т. д., и основывается на интересах и тематике ученика.
</p>
</div>
<div class="content-block cb6">
<div class="content-div"> <div class="content-div">
<span class="span">Файлы: <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="question"><path d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z" fill="#b8b8b8" ></path></svg></span> <span class="span">Файлы: <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" class="question"><path d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z" fill="#b8b8b8" ></path></svg></span>
<ul class="file-list"> <ul class="file-list">
...@@ -259,7 +296,7 @@ ...@@ -259,7 +296,7 @@
Реферат Реферат
<span class="file-name">{{abstract.name}}</span> <span class="file-name">{{abstract.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#1f68e9ba"><path d="M19,13 L19,10 L19,10 L13,3 L2.00276013,3 C0.896666251,3 0,3.89833832 0,5.00732994 L0,27.9926701 C0,29.1012878 0.890925393,30 1.99742191,30 L17.0025781,30 C18.1057238,30 19,29.1017876 19,28.0092049 L19,26 L29.0057181,26 C30.6594143,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6594313,13 29.0057181,13 L19,13 L19,13 L19,13 Z M18,26 L18,28.0066023 C18,28.5550537 17.5523026,29 17.0000398,29 L1.9999602,29 C1.45470893,29 1,28.5543187 1,28.004543 L1,4.99545703 C1,4.45526288 1.44573523,4 1.9955775,4 L12,4 L12,8.99408095 C12,10.1134452 12.8944962,11 13.9979131,11 L18,11 L18,13 L5.99428189,13 C4.34058566,13 3,14.3422643 3,15.9987856 L3,23.0012144 C3,24.6573979 4.3405687,26 5.99428189,26 L18,26 L18,26 L18,26 Z M13,4.5 L13,8.99121523 C13,9.54835167 13.4506511,10 13.9967388,10 L17.6999512,10 L13,4.5 L13,4.5 Z M6.00732994,14 C4.89871223,14 4,14.9001762 4,15.992017 L4,23.007983 C4,24.1081436 4.89833832,25 6.00732994,25 L28.9926701,25 C30.1012878,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.1016617,14 28.9926701,14 L6.00732994,14 L6.00732994,14 Z M6,16 L6,23 L8.9951185,23 C10.102384,23 11,22.1134452 11,20.9940809 L11,18.0059191 C11,16.8980806 10.1061002,16 8.9951185,16 L6,16 L6,16 Z M7,17 L7,22 L9.00104344,22 C9.55275191,22 10,21.5562834 10,21.0001925 L10,17.9998075 C10,17.4476291 9.55733967,17 9.00104344,17 L7,17 L7,17 Z M14.0048815,16 C12.897616,16 12,16.8865548 12,18.0059191 L12,20.9940809 C12,22.1019194 12.8938998,23 14.0048815,23 L14.9951185,23 C16.102384,23 17,22.1134452 17,20.9940809 L17,18.0059191 C17,16.8980806 16.1061002,16 14.9951185,16 L14.0048815,16 L14.0048815,16 Z M13.9989566,17 C13.4472481,17 13,17.4437166 13,17.9998075 L13,21.0001925 C13,21.5523709 13.4426603,22 13.9989566,22 L15.0010434,22 C15.5527519,22 16,21.5562834 16,21.0001925 L16,17.9998075 C16,17.4476291 15.5573397,17 15.0010434,17 L13.9989566,17 L13.9989566,17 Z M22.9999916,21 C22.9968339,22.1165689 22.1004316,23 20.9951185,23 L20.0048815,23 C18.8938998,23 18,22.1019194 18,20.9940809 L18,18.0059191 C18,16.8865548 18.897616,16 20.0048815,16 L20.9951185,16 C22.1041209,16 22.9968142,16.8948834 22.9999915,18 L22,18 C22,17.4476291 21.5573397,17 21.0010434,17 L19.9989566,17 C19.4472481,17 19,17.4437166 19,17.9998075 L19,21.0001925 C19,21.5523709 19.4426603,22 19.9989566,22 L21.0010434,22 C21.5527519,22 22,21.5562834 22,21.0001925 L22.9999923,21 L22.9999916,21 L22.9999916,21 Z M26,19.5 L24,16 L25,16 L26.5,18.625 L28,16 L29,16 L27,19.5 L29,23 L28,23 L26.5,20.375 L25,23 L24,23 L26,19.5 L26,19.5 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#1f68e9ba"><path d="M19,13 L19,10 L19,10 L13,3 L2.00276013,3 C0.896666251,3 0,3.89833832 0,5.00732994 L0,27.9926701 C0,29.1012878 0.890925393,30 1.99742191,30 L17.0025781,30 C18.1057238,30 19,29.1017876 19,28.0092049 L19,26 L29.0057181,26 C30.6594143,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6594313,13 29.0057181,13 L19,13 L19,13 L19,13 Z M18,26 L18,28.0066023 C18,28.5550537 17.5523026,29 17.0000398,29 L1.9999602,29 C1.45470893,29 1,28.5543187 1,28.004543 L1,4.99545703 C1,4.45526288 1.44573523,4 1.9955775,4 L12,4 L12,8.99408095 C12,10.1134452 12.8944962,11 13.9979131,11 L18,11 L18,13 L5.99428189,13 C4.34058566,13 3,14.3422643 3,15.9987856 L3,23.0012144 C3,24.6573979 4.3405687,26 5.99428189,26 L18,26 L18,26 L18,26 Z M13,4.5 L13,8.99121523 C13,9.54835167 13.4506511,10 13.9967388,10 L17.6999512,10 L13,4.5 L13,4.5 Z M6.00732994,14 C4.89871223,14 4,14.9001762 4,15.992017 L4,23.007983 C4,24.1081436 4.89833832,25 6.00732994,25 L28.9926701,25 C30.1012878,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.1016617,14 28.9926701,14 L6.00732994,14 L6.00732994,14 Z M6,16 L6,23 L8.9951185,23 C10.102384,23 11,22.1134452 11,20.9940809 L11,18.0059191 C11,16.8980806 10.1061002,16 8.9951185,16 L6,16 L6,16 Z M7,17 L7,22 L9.00104344,22 C9.55275191,22 10,21.5562834 10,21.0001925 L10,17.9998075 C10,17.4476291 9.55733967,17 9.00104344,17 L7,17 L7,17 Z M14.0048815,16 C12.897616,16 12,16.8865548 12,18.0059191 L12,20.9940809 C12,22.1019194 12.8938998,23 14.0048815,23 L14.9951185,23 C16.102384,23 17,22.1134452 17,20.9940809 L17,18.0059191 C17,16.8980806 16.1061002,16 14.9951185,16 L14.0048815,16 L14.0048815,16 Z M13.9989566,17 C13.4472481,17 13,17.4437166 13,17.9998075 L13,21.0001925 C13,21.5523709 13.4426603,22 13.9989566,22 L15.0010434,22 C15.5527519,22 16,21.5562834 16,21.0001925 L16,17.9998075 C16,17.4476291 15.5573397,17 15.0010434,17 L13.9989566,17 L13.9989566,17 Z M22.9999916,21 C22.9968339,22.1165689 22.1004316,23 20.9951185,23 L20.0048815,23 C18.8938998,23 18,22.1019194 18,20.9940809 L18,18.0059191 C18,16.8865548 18.897616,16 20.0048815,16 L20.9951185,16 C22.1041209,16 22.9968142,16.8948834 22.9999915,18 L22,18 C22,17.4476291 21.5573397,17 21.0010434,17 L19.9989566,17 C19.4472481,17 19,17.4437166 19,17.9998075 L19,21.0001925 C19,21.5523709 19.4426603,22 19.9989566,22 L21.0010434,22 C21.5527519,22 22,21.5562834 22,21.0001925 L22.9999923,21 L22.9999916,21 L22.9999916,21 Z M26,19.5 L24,16 L25,16 L26.5,18.625 L28,16 L29,16 L27,19.5 L29,23 L28,23 L26.5,20.375 L25,23 L24,23 L26,19.5 L26,19.5 Z"/></g></g></svg>
<input type="file" class="file-input" name="abstract" id="abstract" onchange="file_name(this, 0); checking('cb5')"/> <input type="file" class="file-input" name="abstract" id="abstract" onchange="file_name(this, 0); checking('cb6')"/>
</a> </a>
</label> </label>
<div class="file-setting"> <div class="file-setting">
...@@ -290,7 +327,7 @@ ...@@ -290,7 +327,7 @@
<label class="file-label docx">Реферат <label class="file-label docx">Реферат
<span class="file-name">{{abstract.name}}</span> <span class="file-name">{{abstract.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#1f68e9ba"><path d="M19,13 L19,10 L19,10 L13,3 L2.00276013,3 C0.896666251,3 0,3.89833832 0,5.00732994 L0,27.9926701 C0,29.1012878 0.890925393,30 1.99742191,30 L17.0025781,30 C18.1057238,30 19,29.1017876 19,28.0092049 L19,26 L29.0057181,26 C30.6594143,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6594313,13 29.0057181,13 L19,13 L19,13 L19,13 Z M18,26 L18,28.0066023 C18,28.5550537 17.5523026,29 17.0000398,29 L1.9999602,29 C1.45470893,29 1,28.5543187 1,28.004543 L1,4.99545703 C1,4.45526288 1.44573523,4 1.9955775,4 L12,4 L12,8.99408095 C12,10.1134452 12.8944962,11 13.9979131,11 L18,11 L18,13 L5.99428189,13 C4.34058566,13 3,14.3422643 3,15.9987856 L3,23.0012144 C3,24.6573979 4.3405687,26 5.99428189,26 L18,26 L18,26 L18,26 Z M13,4.5 L13,8.99121523 C13,9.54835167 13.4506511,10 13.9967388,10 L17.6999512,10 L13,4.5 L13,4.5 Z M6.00732994,14 C4.89871223,14 4,14.9001762 4,15.992017 L4,23.007983 C4,24.1081436 4.89833832,25 6.00732994,25 L28.9926701,25 C30.1012878,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.1016617,14 28.9926701,14 L6.00732994,14 L6.00732994,14 Z M6,16 L6,23 L8.9951185,23 C10.102384,23 11,22.1134452 11,20.9940809 L11,18.0059191 C11,16.8980806 10.1061002,16 8.9951185,16 L6,16 L6,16 Z M7,17 L7,22 L9.00104344,22 C9.55275191,22 10,21.5562834 10,21.0001925 L10,17.9998075 C10,17.4476291 9.55733967,17 9.00104344,17 L7,17 L7,17 Z M14.0048815,16 C12.897616,16 12,16.8865548 12,18.0059191 L12,20.9940809 C12,22.1019194 12.8938998,23 14.0048815,23 L14.9951185,23 C16.102384,23 17,22.1134452 17,20.9940809 L17,18.0059191 C17,16.8980806 16.1061002,16 14.9951185,16 L14.0048815,16 L14.0048815,16 Z M13.9989566,17 C13.4472481,17 13,17.4437166 13,17.9998075 L13,21.0001925 C13,21.5523709 13.4426603,22 13.9989566,22 L15.0010434,22 C15.5527519,22 16,21.5562834 16,21.0001925 L16,17.9998075 C16,17.4476291 15.5573397,17 15.0010434,17 L13.9989566,17 L13.9989566,17 Z M22.9999916,21 C22.9968339,22.1165689 22.1004316,23 20.9951185,23 L20.0048815,23 C18.8938998,23 18,22.1019194 18,20.9940809 L18,18.0059191 C18,16.8865548 18.897616,16 20.0048815,16 L20.9951185,16 C22.1041209,16 22.9968142,16.8948834 22.9999915,18 L22,18 C22,17.4476291 21.5573397,17 21.0010434,17 L19.9989566,17 C19.4472481,17 19,17.4437166 19,17.9998075 L19,21.0001925 C19,21.5523709 19.4426603,22 19.9989566,22 L21.0010434,22 C21.5527519,22 22,21.5562834 22,21.0001925 L22.9999923,21 L22.9999916,21 L22.9999916,21 Z M26,19.5 L24,16 L25,16 L26.5,18.625 L28,16 L29,16 L27,19.5 L29,23 L28,23 L26.5,20.375 L25,23 L24,23 L26,19.5 L26,19.5 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#1f68e9ba"><path d="M19,13 L19,10 L19,10 L13,3 L2.00276013,3 C0.896666251,3 0,3.89833832 0,5.00732994 L0,27.9926701 C0,29.1012878 0.890925393,30 1.99742191,30 L17.0025781,30 C18.1057238,30 19,29.1017876 19,28.0092049 L19,26 L29.0057181,26 C30.6594143,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6594313,13 29.0057181,13 L19,13 L19,13 L19,13 Z M18,26 L18,28.0066023 C18,28.5550537 17.5523026,29 17.0000398,29 L1.9999602,29 C1.45470893,29 1,28.5543187 1,28.004543 L1,4.99545703 C1,4.45526288 1.44573523,4 1.9955775,4 L12,4 L12,8.99408095 C12,10.1134452 12.8944962,11 13.9979131,11 L18,11 L18,13 L5.99428189,13 C4.34058566,13 3,14.3422643 3,15.9987856 L3,23.0012144 C3,24.6573979 4.3405687,26 5.99428189,26 L18,26 L18,26 L18,26 Z M13,4.5 L13,8.99121523 C13,9.54835167 13.4506511,10 13.9967388,10 L17.6999512,10 L13,4.5 L13,4.5 Z M6.00732994,14 C4.89871223,14 4,14.9001762 4,15.992017 L4,23.007983 C4,24.1081436 4.89833832,25 6.00732994,25 L28.9926701,25 C30.1012878,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.1016617,14 28.9926701,14 L6.00732994,14 L6.00732994,14 Z M6,16 L6,23 L8.9951185,23 C10.102384,23 11,22.1134452 11,20.9940809 L11,18.0059191 C11,16.8980806 10.1061002,16 8.9951185,16 L6,16 L6,16 Z M7,17 L7,22 L9.00104344,22 C9.55275191,22 10,21.5562834 10,21.0001925 L10,17.9998075 C10,17.4476291 9.55733967,17 9.00104344,17 L7,17 L7,17 Z M14.0048815,16 C12.897616,16 12,16.8865548 12,18.0059191 L12,20.9940809 C12,22.1019194 12.8938998,23 14.0048815,23 L14.9951185,23 C16.102384,23 17,22.1134452 17,20.9940809 L17,18.0059191 C17,16.8980806 16.1061002,16 14.9951185,16 L14.0048815,16 L14.0048815,16 Z M13.9989566,17 C13.4472481,17 13,17.4437166 13,17.9998075 L13,21.0001925 C13,21.5523709 13.4426603,22 13.9989566,22 L15.0010434,22 C15.5527519,22 16,21.5562834 16,21.0001925 L16,17.9998075 C16,17.4476291 15.5573397,17 15.0010434,17 L13.9989566,17 L13.9989566,17 Z M22.9999916,21 C22.9968339,22.1165689 22.1004316,23 20.9951185,23 L20.0048815,23 C18.8938998,23 18,22.1019194 18,20.9940809 L18,18.0059191 C18,16.8865548 18.897616,16 20.0048815,16 L20.9951185,16 C22.1041209,16 22.9968142,16.8948834 22.9999915,18 L22,18 C22,17.4476291 21.5573397,17 21.0010434,17 L19.9989566,17 C19.4472481,17 19,17.4437166 19,17.9998075 L19,21.0001925 C19,21.5523709 19.4426603,22 19.9989566,22 L21.0010434,22 C21.5527519,22 22,21.5562834 22,21.0001925 L22.9999923,21 L22.9999916,21 L22.9999916,21 Z M26,19.5 L24,16 L25,16 L26.5,18.625 L28,16 L29,16 L27,19.5 L29,23 L28,23 L26.5,20.375 L25,23 L24,23 L26,19.5 L26,19.5 Z"/></g></g></svg>
<input type="file" class="file-input" name="abstract" onchange="file_name(this, 0); checking('cb5')"/> <input type="file" class="file-input" name="abstract" onchange="file_name(this, 0); checking('cb6')"/>
</label> </label>
{% endif %} {% endif %}
<div class="content-status"> <div class="content-status">
...@@ -304,7 +341,7 @@ ...@@ -304,7 +341,7 @@
Презентация Презентация
<span class="file-name">{{presentation.name}}</span> <span class="file-name">{{presentation.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#d5731ee3"><path d="M21,13 L21,10 L21,10 L15,3 L4.00276013,3 C2.89666625,3 2,3.89833832 2,5.00732994 L2,27.9926701 C2,29.1012878 2.89092539,30 3.99742191,30 L19.0025781,30 C20.1057238,30 21,29.1017876 21,28.0092049 L21,26 L28.9931517,26 C30.6537881,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6640085,13 28.9931517,13 L21,13 L21,13 L21,13 Z M20,26 L20,28.0066023 C20,28.5550537 19.5523026,29 19.0000398,29 L3.9999602,29 C3.45470893,29 3,28.5543187 3,28.004543 L3,4.99545703 C3,4.45526288 3.44573523,4 3.9955775,4 L14,4 L14,8.99408095 C14,10.1134452 14.8944962,11 15.9979131,11 L20,11 L20,13 L12.0068483,13 C10.3462119,13 9,14.3422643 9,15.9987856 L9,23.0012144 C9,24.6573979 10.3359915,26 12.0068483,26 L20,26 L20,26 L20,26 Z M15,4.5 L15,8.99121523 C15,9.54835167 15.4506511,10 15.9967388,10 L19.6999512,10 L15,4.5 L15,4.5 Z M11.9945615,14 C10.8929956,14 10,14.9001762 10,15.992017 L10,23.007983 C10,24.1081436 10.9023438,25 11.9945615,25 L29.0054385,25 C30.1070044,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.0976562,14 29.0054385,14 L11.9945615,14 L11.9945615,14 Z M18,18 L18,23 L19,23 L19,20 L20.9951185,20 C22.102384,20 23,19.1122704 23,18 C23,16.8954305 22.1061002,16 20.9951185,16 L18,16 L18,18 L18,18 Z M19,17 L19,19 L21.0010434,19 C21.5527519,19 22,18.5561352 22,18 C22,17.4477153 21.5573397,17 21.0010434,17 L19,17 L19,17 Z M12,18 L12,23 L13,23 L13,20 L14.9951185,20 C16.102384,20 17,19.1122704 17,18 C17,16.8954305 16.1061002,16 14.9951185,16 L12,16 L12,18 L12,18 Z M13,17 L13,19 L15.0010434,19 C15.5527519,19 16,18.5561352 16,18 C16,17.4477153 15.5573397,17 15.0010434,17 L13,17 L13,17 Z M26,17 L26,23 L27,23 L27,17 L29,17 L29,16 L24,16 L24,17 L26,17 L26,17 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#d5731ee3"><path d="M21,13 L21,10 L21,10 L15,3 L4.00276013,3 C2.89666625,3 2,3.89833832 2,5.00732994 L2,27.9926701 C2,29.1012878 2.89092539,30 3.99742191,30 L19.0025781,30 C20.1057238,30 21,29.1017876 21,28.0092049 L21,26 L28.9931517,26 C30.6537881,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6640085,13 28.9931517,13 L21,13 L21,13 L21,13 Z M20,26 L20,28.0066023 C20,28.5550537 19.5523026,29 19.0000398,29 L3.9999602,29 C3.45470893,29 3,28.5543187 3,28.004543 L3,4.99545703 C3,4.45526288 3.44573523,4 3.9955775,4 L14,4 L14,8.99408095 C14,10.1134452 14.8944962,11 15.9979131,11 L20,11 L20,13 L12.0068483,13 C10.3462119,13 9,14.3422643 9,15.9987856 L9,23.0012144 C9,24.6573979 10.3359915,26 12.0068483,26 L20,26 L20,26 L20,26 Z M15,4.5 L15,8.99121523 C15,9.54835167 15.4506511,10 15.9967388,10 L19.6999512,10 L15,4.5 L15,4.5 Z M11.9945615,14 C10.8929956,14 10,14.9001762 10,15.992017 L10,23.007983 C10,24.1081436 10.9023438,25 11.9945615,25 L29.0054385,25 C30.1070044,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.0976562,14 29.0054385,14 L11.9945615,14 L11.9945615,14 Z M18,18 L18,23 L19,23 L19,20 L20.9951185,20 C22.102384,20 23,19.1122704 23,18 C23,16.8954305 22.1061002,16 20.9951185,16 L18,16 L18,18 L18,18 Z M19,17 L19,19 L21.0010434,19 C21.5527519,19 22,18.5561352 22,18 C22,17.4477153 21.5573397,17 21.0010434,17 L19,17 L19,17 Z M12,18 L12,23 L13,23 L13,20 L14.9951185,20 C16.102384,20 17,19.1122704 17,18 C17,16.8954305 16.1061002,16 14.9951185,16 L12,16 L12,18 L12,18 Z M13,17 L13,19 L15.0010434,19 C15.5527519,19 16,18.5561352 16,18 C16,17.4477153 15.5573397,17 15.0010434,17 L13,17 L13,17 Z M26,17 L26,23 L27,23 L27,17 L29,17 L29,16 L24,16 L24,17 L26,17 L26,17 Z"/></g></g></svg>
<input type="file" class="file-input" name="presentation" onchange="file_name(this, 1); checking('cb5')" id="presentation"/> <input type="file" class="file-input" name="presentation" onchange="file_name(this, 1); checking('cb6')" id="presentation"/>
</a> </a>
</label> </label>
<div class="file-setting"> <div class="file-setting">
...@@ -336,7 +373,7 @@ ...@@ -336,7 +373,7 @@
Презентация Презентация
<span class="file-name">{{presentation.name}}</span> <span class="file-name">{{presentation.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#d5731ee3"><path d="M21,13 L21,10 L21,10 L15,3 L4.00276013,3 C2.89666625,3 2,3.89833832 2,5.00732994 L2,27.9926701 C2,29.1012878 2.89092539,30 3.99742191,30 L19.0025781,30 C20.1057238,30 21,29.1017876 21,28.0092049 L21,26 L28.9931517,26 C30.6537881,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6640085,13 28.9931517,13 L21,13 L21,13 L21,13 Z M20,26 L20,28.0066023 C20,28.5550537 19.5523026,29 19.0000398,29 L3.9999602,29 C3.45470893,29 3,28.5543187 3,28.004543 L3,4.99545703 C3,4.45526288 3.44573523,4 3.9955775,4 L14,4 L14,8.99408095 C14,10.1134452 14.8944962,11 15.9979131,11 L20,11 L20,13 L12.0068483,13 C10.3462119,13 9,14.3422643 9,15.9987856 L9,23.0012144 C9,24.6573979 10.3359915,26 12.0068483,26 L20,26 L20,26 L20,26 Z M15,4.5 L15,8.99121523 C15,9.54835167 15.4506511,10 15.9967388,10 L19.6999512,10 L15,4.5 L15,4.5 Z M11.9945615,14 C10.8929956,14 10,14.9001762 10,15.992017 L10,23.007983 C10,24.1081436 10.9023438,25 11.9945615,25 L29.0054385,25 C30.1070044,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.0976562,14 29.0054385,14 L11.9945615,14 L11.9945615,14 Z M18,18 L18,23 L19,23 L19,20 L20.9951185,20 C22.102384,20 23,19.1122704 23,18 C23,16.8954305 22.1061002,16 20.9951185,16 L18,16 L18,18 L18,18 Z M19,17 L19,19 L21.0010434,19 C21.5527519,19 22,18.5561352 22,18 C22,17.4477153 21.5573397,17 21.0010434,17 L19,17 L19,17 Z M12,18 L12,23 L13,23 L13,20 L14.9951185,20 C16.102384,20 17,19.1122704 17,18 C17,16.8954305 16.1061002,16 14.9951185,16 L12,16 L12,18 L12,18 Z M13,17 L13,19 L15.0010434,19 C15.5527519,19 16,18.5561352 16,18 C16,17.4477153 15.5573397,17 15.0010434,17 L13,17 L13,17 Z M26,17 L26,23 L27,23 L27,17 L29,17 L29,16 L24,16 L24,17 L26,17 L26,17 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#d5731ee3"><path d="M21,13 L21,10 L21,10 L15,3 L4.00276013,3 C2.89666625,3 2,3.89833832 2,5.00732994 L2,27.9926701 C2,29.1012878 2.89092539,30 3.99742191,30 L19.0025781,30 C20.1057238,30 21,29.1017876 21,28.0092049 L21,26 L28.9931517,26 C30.6537881,26 32,24.6577357 32,23.0012144 L32,15.9987856 C32,14.3426021 30.6640085,13 28.9931517,13 L21,13 L21,13 L21,13 Z M20,26 L20,28.0066023 C20,28.5550537 19.5523026,29 19.0000398,29 L3.9999602,29 C3.45470893,29 3,28.5543187 3,28.004543 L3,4.99545703 C3,4.45526288 3.44573523,4 3.9955775,4 L14,4 L14,8.99408095 C14,10.1134452 14.8944962,11 15.9979131,11 L20,11 L20,13 L12.0068483,13 C10.3462119,13 9,14.3422643 9,15.9987856 L9,23.0012144 C9,24.6573979 10.3359915,26 12.0068483,26 L20,26 L20,26 L20,26 Z M15,4.5 L15,8.99121523 C15,9.54835167 15.4506511,10 15.9967388,10 L19.6999512,10 L15,4.5 L15,4.5 Z M11.9945615,14 C10.8929956,14 10,14.9001762 10,15.992017 L10,23.007983 C10,24.1081436 10.9023438,25 11.9945615,25 L29.0054385,25 C30.1070044,25 31,24.0998238 31,23.007983 L31,15.992017 C31,14.8918564 30.0976562,14 29.0054385,14 L11.9945615,14 L11.9945615,14 Z M18,18 L18,23 L19,23 L19,20 L20.9951185,20 C22.102384,20 23,19.1122704 23,18 C23,16.8954305 22.1061002,16 20.9951185,16 L18,16 L18,18 L18,18 Z M19,17 L19,19 L21.0010434,19 C21.5527519,19 22,18.5561352 22,18 C22,17.4477153 21.5573397,17 21.0010434,17 L19,17 L19,17 Z M12,18 L12,23 L13,23 L13,20 L14.9951185,20 C16.102384,20 17,19.1122704 17,18 C17,16.8954305 16.1061002,16 14.9951185,16 L12,16 L12,18 L12,18 Z M13,17 L13,19 L15.0010434,19 C15.5527519,19 16,18.5561352 16,18 C16,17.4477153 15.5573397,17 15.0010434,17 L13,17 L13,17 Z M26,17 L26,23 L27,23 L27,17 L29,17 L29,16 L24,16 L24,17 L26,17 L26,17 Z"/></g></g></svg>
<input type="file" class="file-input" name="presentation" onchange="file_name(this, 1); checking('cb5')"/> <input type="file" class="file-input" name="presentation" onchange="file_name(this, 1); checking('cb6')"/>
</label> </label>
{% endif %} {% endif %}
<div class="content-status"> <div class="content-status">
...@@ -344,17 +381,17 @@ ...@@ -344,17 +381,17 @@
</div> </div>
</li> </li>
<li class="file-item"> <li class="file-item">
{% if annotation is not None %} {% if defence is not None %}
<label class="file-label txt"> <label class="file-label txt">
<a href="{% url 'download_file' %}?file_id={{annotation.id}}" title="Загрузить файл" class="download-link"> <a href="{% url 'download_file' %}?file_id={{defence.id}}" title="Загрузить файл" class="download-link">
Аннотация Защита
<span class="file-name">{{annotation.name}}</span> <span class="file-name">{{defence.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#929292"><path d="M19.5,3 L9.00276013,3 C7.89666625,3 7,3.89833832 7,5.00732994 L7,27.9926701 C7,29.1012878 7.89092539,30 8.99742191,30 L24.0025781,30 C25.1057238,30 26,29.1017876 26,28.0092049 L26,10.5 L26,10 L20,3 L19.5,3 L19.5,3 L19.5,3 Z M19,4 L8.9955775,4 C8.44573523,4 8,4.45526288 8,4.99545703 L8,28.004543 C8,28.5543187 8.45470893,29 8.9999602,29 L24.0000398,29 C24.5523026,29 25,28.5550537 25,28.0066023 L25,11 L20.9979131,11 C19.8944962,11 19,10.1134452 19,8.99408095 L19,4 L19,4 Z M20,4.5 L20,8.99121523 C20,9.54835167 20.4506511,10 20.9967388,10 L24.6999512,10 L20,4.5 L20,4.5 Z M10,10 L10,11 L15,11 L15,10 L10,10 L10,10 Z M10,7 L10,8 L17,8 L17,7 L10,7 L10,7 Z M10,13 L10,14 L23,14 L23,13 L10,13 L10,13 Z M10,16 L10,17 L20,17 L20,16 L10,16 L10,16 Z M10,19 L10,20 L23,20 L23,19 L10,19 L10,19 Z M10,22 L10,23 L19,23 L19,22 L10,22 L10,22 Z M10,25 L10,26 L23,26 L23,25 L10,25 L10,25 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#929292"><path d="M19.5,3 L9.00276013,3 C7.89666625,3 7,3.89833832 7,5.00732994 L7,27.9926701 C7,29.1012878 7.89092539,30 8.99742191,30 L24.0025781,30 C25.1057238,30 26,29.1017876 26,28.0092049 L26,10.5 L26,10 L20,3 L19.5,3 L19.5,3 L19.5,3 Z M19,4 L8.9955775,4 C8.44573523,4 8,4.45526288 8,4.99545703 L8,28.004543 C8,28.5543187 8.45470893,29 8.9999602,29 L24.0000398,29 C24.5523026,29 25,28.5550537 25,28.0066023 L25,11 L20.9979131,11 C19.8944962,11 19,10.1134452 19,8.99408095 L19,4 L19,4 Z M20,4.5 L20,8.99121523 C20,9.54835167 20.4506511,10 20.9967388,10 L24.6999512,10 L20,4.5 L20,4.5 Z M10,10 L10,11 L15,11 L15,10 L10,10 L10,10 Z M10,7 L10,8 L17,8 L17,7 L10,7 L10,7 Z M10,13 L10,14 L23,14 L23,13 L10,13 L10,13 Z M10,16 L10,17 L20,17 L20,16 L10,16 L10,16 Z M10,19 L10,20 L23,20 L23,19 L10,19 L10,19 Z M10,22 L10,23 L19,23 L19,22 L10,22 L10,22 Z M10,25 L10,26 L23,26 L23,25 L10,25 L10,25 Z"/></g></g></svg>
<input type="file" class="file-input" name="annotation" onchange="file_name(this, 2)" id="annotation"/> <input type="file" class="file-input" name="defence" onchange="file_name(this, 2)" id="defence"/>
</a> </a>
</label> </label>
<div class="file-setting"> <div class="file-setting">
<button type="button" onclick="show_window('comments{{annotation.id}}')" title="Посмотреть комментарии"> <button type="button" onclick="show_window('comments{{defence.id}}')" title="Посмотреть комментарии">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20" <svg fill="none" height="20" viewBox="0 0 20 20" width="20"
xmlns="http://www.w3.org/2000/svg"> xmlns="http://www.w3.org/2000/svg">
<path <path
...@@ -362,7 +399,7 @@ ...@@ -362,7 +399,7 @@
fill=" #5A88FF" /> fill=" #5A88FF" />
</svg> </svg>
</button> </button>
<button type="button" class="btn-old-files" onclick="show_window('old-files{{annotation.id}}')" <button type="button" class="btn-old-files" onclick="show_window('old-files{{defence.id}}')"
title="Посмотреть предыдущие версии файла"> title="Посмотреть предыдущие версии файла">
<svg fill="none" height="20" viewBox="0 0 20 20" width="20" <svg fill="none" height="20" viewBox="0 0 20 20" width="20"
xmlns="http://www.w3.org/2000/svg"> xmlns="http://www.w3.org/2000/svg">
...@@ -371,7 +408,7 @@ ...@@ -371,7 +408,7 @@
fill="#88cc5a" /> fill="#88cc5a" />
</svg> </svg>
</button> </button>
<label for="annotation" class="btns-label" title="Обновить файл"> <label for="defence" class="btns-label" title="Обновить файл">
<svg viewBox="0 0 512 512" fill="#ff6d1b"> <svg viewBox="0 0 512 512" fill="#ff6d1b">
<path d="M64,256H34A222,222,0,0,1,430,118.15V85h30V190H355V160h67.27A192.21,192.21,0,0,0,256,64C150.13,64,64,150.13,64,256Zm384,0c0,105.87-86.13,192-192,192A192.21,192.21,0,0,1,89.73,352H157V322H52V427H82V393.85A222,222,0,0,0,478,256Z"/> <path d="M64,256H34A222,222,0,0,1,430,118.15V85h30V190H355V160h67.27A192.21,192.21,0,0,0,256,64C150.13,64,64,150.13,64,256Zm384,0c0,105.87-86.13,192-192,192A192.21,192.21,0,0,1,89.73,352H157V322H52V427H82V393.85A222,222,0,0,0,478,256Z"/>
</svg> </svg>
...@@ -379,10 +416,10 @@ ...@@ -379,10 +416,10 @@
</div> </div>
{% else %} {% else %}
<label class="file-label txt"> <label class="file-label txt">
Аннотация Защита
<span class="file-name">{{annotation.name}}</span> <span class="file-name">{{defence.name}}</span>
<svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#929292"><path d="M19.5,3 L9.00276013,3 C7.89666625,3 7,3.89833832 7,5.00732994 L7,27.9926701 C7,29.1012878 7.89092539,30 8.99742191,30 L24.0025781,30 C25.1057238,30 26,29.1017876 26,28.0092049 L26,10.5 L26,10 L20,3 L19.5,3 L19.5,3 L19.5,3 Z M19,4 L8.9955775,4 C8.44573523,4 8,4.45526288 8,4.99545703 L8,28.004543 C8,28.5543187 8.45470893,29 8.9999602,29 L24.0000398,29 C24.5523026,29 25,28.5550537 25,28.0066023 L25,11 L20.9979131,11 C19.8944962,11 19,10.1134452 19,8.99408095 L19,4 L19,4 Z M20,4.5 L20,8.99121523 C20,9.54835167 20.4506511,10 20.9967388,10 L24.6999512,10 L20,4.5 L20,4.5 Z M10,10 L10,11 L15,11 L15,10 L10,10 L10,10 Z M10,7 L10,8 L17,8 L17,7 L10,7 L10,7 Z M10,13 L10,14 L23,14 L23,13 L10,13 L10,13 Z M10,16 L10,17 L20,17 L20,16 L10,16 L10,16 Z M10,19 L10,20 L23,20 L23,19 L10,19 L10,19 Z M10,22 L10,23 L19,23 L19,22 L10,22 L10,22 Z M10,25 L10,26 L23,26 L23,25 L10,25 L10,25 Z"/></g></g></svg> <svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><g fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g fill="#929292"><path d="M19.5,3 L9.00276013,3 C7.89666625,3 7,3.89833832 7,5.00732994 L7,27.9926701 C7,29.1012878 7.89092539,30 8.99742191,30 L24.0025781,30 C25.1057238,30 26,29.1017876 26,28.0092049 L26,10.5 L26,10 L20,3 L19.5,3 L19.5,3 L19.5,3 Z M19,4 L8.9955775,4 C8.44573523,4 8,4.45526288 8,4.99545703 L8,28.004543 C8,28.5543187 8.45470893,29 8.9999602,29 L24.0000398,29 C24.5523026,29 25,28.5550537 25,28.0066023 L25,11 L20.9979131,11 C19.8944962,11 19,10.1134452 19,8.99408095 L19,4 L19,4 Z M20,4.5 L20,8.99121523 C20,9.54835167 20.4506511,10 20.9967388,10 L24.6999512,10 L20,4.5 L20,4.5 Z M10,10 L10,11 L15,11 L15,10 L10,10 L10,10 Z M10,7 L10,8 L17,8 L17,7 L10,7 L10,7 Z M10,13 L10,14 L23,14 L23,13 L10,13 L10,13 Z M10,16 L10,17 L20,17 L20,16 L10,16 L10,16 Z M10,19 L10,20 L23,20 L23,19 L10,19 L10,19 Z M10,22 L10,23 L19,23 L19,22 L10,22 L10,22 Z M10,25 L10,26 L23,26 L23,25 L10,25 L10,25 Z"/></g></g></svg>
<input type="file" class="file-input" name="annotation" onchange="file_name(this, 2)"/> <input type="file" class="file-input" name="defence" onchange="file_name(this, 2)"/>
</label> </label>
{% endif %} {% endif %}
</li> </li>
...@@ -560,19 +597,19 @@ ...@@ -560,19 +597,19 @@
</div> </div>
<div> <div>
<div id="comments{{annotation.id}}" class="comment-window"> <div id="comments{{defence.id}}" class="comment-window">
{% if annotation.comment is not None %} {% if defence.comment is not None %}
<div>{{annotation.comment}}</div> <div>{{defence.comment}}</div>
{%else%} {%else%}
<form method="POST" action="{% url 'add_comment' %}" class="comment-form"> <form method="POST" action="{% url 'add_comment' %}" class="comment-form">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="file_id" value="{{annotation.id}}" /> <input type="hidden" name="file_id" value="{{defence.id}}" />
<textarea name="comment" class="textarea comment-textarea" placeholder="Введите комментарий" <textarea name="comment" class="textarea comment-textarea" placeholder="Введите комментарий"
onkeyup="textarea_size(this)" required></textarea> onkeyup="textarea_size(this)" required></textarea>
<input type="submit" value="Отправить комментарий" class="comment-btn"> <input type="submit" value="Отправить комментарий" class="comment-btn">
</form> </form>
{%endif%} {%endif%}
<button class="btn-exit" onclick="exit('comments{{annotation.id}}')"> <button class="btn-exit" onclick="exit('comments{{defence.id}}')">
<svg width="25" height="25" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" class="btn-exit-svg"> <svg width="25" height="25" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" class="btn-exit-svg">
<path <path
d="m114 100 49-49a9.9 9.9 0 0 0-14-14l-49 49-49-49a9.9 9.9 0 0 0-14 14l49 49-49 49a9.9 9.9 0 0 0 14 14l49-49 49 49a9.9 9.9 0 0 0 14-14Z" d="m114 100 49-49a9.9 9.9 0 0 0-14-14l-49 49-49-49a9.9 9.9 0 0 0-14 14l49 49-49 49a9.9 9.9 0 0 0 14 14l49-49 49 49a9.9 9.9 0 0 0 14-14Z"
...@@ -580,8 +617,8 @@ ...@@ -580,8 +617,8 @@
</svg> </svg>
</button> </button>
</div> </div>
<div id="old-files{{annotation.id}}" class="old-files"> <div id="old-files{{defence.id}}" class="old-files">
<button class="btn-exit" onclick="exit('old-files{{annotation.id}}')" type="button"> <button class="btn-exit" onclick="exit('old-files{{defence.id}}')" type="button">
<svg width="25" height="25" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" class="btn-exit-svg"> <svg width="25" height="25" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" class="btn-exit-svg">
<path <path
d="m114 100 49-49a9.9 9.9 0 0 0-14-14l-49 49-49-49a9.9 9.9 0 0 0-14 14l49 49-49 49a9.9 9.9 0 0 0 14 14l49-49 49 49a9.9 9.9 0 0 0 14-14Z" d="m114 100 49-49a9.9 9.9 0 0 0-14-14l-49 49-49-49a9.9 9.9 0 0 0-14 14l49 49-49 49a9.9 9.9 0 0 0 14 14l49-49 49 49a9.9 9.9 0 0 0 14-14Z"
...@@ -590,7 +627,7 @@ ...@@ -590,7 +627,7 @@
</button> </button>
<h2 class="old-files-title">Предыдущие версии файла</h2> <h2 class="old-files-title">Предыдущие версии файла</h2>
<ul class="old-files-list"> <ul class="old-files-list">
{% for old_file in old_annotation %} {% for old_file in old_defence %}
<li class="old-files-item"> <li class="old-files-item">
<a href="{% url 'download_file' %}?file_id={{old_file.id}}" <a href="{% url 'download_file' %}?file_id={{old_file.id}}"
class="old-files-link">{{old_file.name}}</a> class="old-files-link">{{old_file.name}}</a>
...@@ -753,6 +790,8 @@ ...@@ -753,6 +790,8 @@
update_files_url = "{% url 'update_file' %}"; update_files_url = "{% url 'update_file' %}";
let subjects = {{ all_subjects_names | js}}; let subjects = {{ all_subjects_names | js}};
let project_type = {{project_type | js}};
</script> </script>
{% if status == 'on work' %} {% if status == 'on work' %}
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать