Skip to content
Snippets Groups Projects
Commit 43c1d1cf authored by Anton Bagliy's avatar Anton Bagliy
Browse files

FIX: students editor after subgroups rebase #299

parent feafa312
Branches
No related merge requests found
......@@ -33,19 +33,21 @@
<input type="hidden" class="HiddenInputFacultyID" value="{{ Discipline.FacultyID }}">
<input type="hidden" class="HiddenInputDisciplineID" value="{{ Discipline.ID }}">
<input type="hidden" class="HiddenInputAuthorID" value="{{ Discipline.AuthorID }}">
{# <div class="GeneralStudentsList">
{#
<div class="GeneralStudentsList">
<h2 class="BlueTitle">Основные студенты</h2>
{% for groupID, group in Groups %}
<div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ groupID }}">
<span class="info">{{ Rus[group[0].Degree] }}, курс {{ group[0].GradeNum }} группа {{ group[0].GroupNum }} | {{ GroupsForDiscipline[group[0].GroupID]["SpecName"] }}</span>
<span class="Action">Открыть список ▼</span>
</div>
<div class="GroupContainer">
<div class="hideListAction"></div>
{% for student in group %}
{{ idx.outputStudent(student, DisciplineCreationISAllowed) }}
{% endfor %}
</div>
</div>
{% endfor %}
</div>
......@@ -131,8 +133,7 @@
<div class="SearchSettings">
<p>Выберите подгруппу, в которую хотите добавить студента, а затем воспользуйтесь фильтром по группе и/или
ФИО студента.</p>
<p>Выберите подгруппу, в которую хотите добавить студента, а затем воспользуйтесь фильтром по группе и/или ФИО студента.</p>
<select class="SelectStudyGroup HalfWidth defaultForm">
<option value="0">Выберите группу:</option>
......@@ -141,21 +142,9 @@
{% endfor %}
</select>
{% if DisciplineCreationISAllowed %}
<div class="SearchStudents">
<h2 class="BlueTitle">Поиск студентов</h2>
<select class="SelectSubgroup HalfWidth defaultForm FloatRight">
<div class="SearchSettings">
<select class="SelectGrade defaultForm">
<option value="0">Выберите курс:</option>
{% for Grade in GradesList %}
{% set Title = (Grade['Degree'] == 'master' ? 'Магистратура' : ( Grade['Degree'] == 'bachelor' ? 'Бакалавриат' : (Grade['Degree'] == 'specialist' ? 'Специалитет' : 'Аспирантура'))) %}
<option value="{{ Grade.ID }}" {% if Grade.ID == Discipline.GradeID %}selected{% endif %}>
{{ Title }} {{ Grade.Num }}
</option>
{% endfor %}
</select>
<select class="SelectSubgroup HalfWidth defaultForm FloatRight">
{% for Subgroup in Subgroups %}
<option value="{{ Subgroup.ID }}"> Подгруппа {{ Subgroup.Title }} </option>
{% else %}
......@@ -165,8 +154,7 @@
</select>
<div class="ClearFix">
<input type="text" class="InputStudentName defaultForm FLeft P1Width"
placeholder="Фамилия Имя Отчество"
<input type="text" class="InputStudentName defaultForm FLeft P1Width" placeholder="Фамилия Имя Отчество"
value="">
<div class="defaultForm FRight P2Width Margin10 Top">
<button class="defaultForm BlueButton FullWidth noMargin searchBtn">Поиск</button>
......@@ -183,4 +171,4 @@
</div>
{% endblock %}
{% endblock %}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment