Skip to content
Snippets Groups Projects
Commit bebabe55 authored by Владислав Яковлев's avatar Владислав Яковлев Committed by Роман Штейнберг
Browse files

Fix discipline teachers list

parent 13d5b0b2
Branches
Tags
No related merge requests found
{% extends 'base' %} {% extends 'base' %}
{% block media %} {# head -> css, js #} {% block media %} {# head -> css, js #}
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
{{ HTML.style('static/css/student/subject.css')|raw }} {{ HTML.style('static/css/student/subject.css')|raw }}
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<td>{{ event_name }}</td> <td>{{ event_name }}</td>
<td>{{ event_date }}</td> <td>{{ event_date }}</td>
<td>{{ event_ball }} / {{ event_max_ball }}</td> <td>{{ event_ball }} / {{ event_max_ball }}</td>
</tr> </tr>
{% endmacro %} {% endmacro %}
{% import _self as map %} {% import _self as map %}
...@@ -43,8 +43,22 @@ ...@@ -43,8 +43,22 @@
<div class="clearFix"> <div class="clearFix">
<div class="label">Преподаватели:</div> <div class="label">Преподаватели:</div>
<div class="content"> <div class="content">
{% set TeachersLimit = 3 %}
{% for Teacher in Teachers %} {% for Teacher in Teachers %}
<div>{{ Teacher.Name }}</div> {% if loop.index < TeachersLimit or loop.index == TeachersLimit and loop.last %}
<div>{{ Teacher.Name }}</div>
{% else %}
{% if loop.index == TeachersLimit %}
{% set MoreTeachers = Teacher.Name %}
{% else %}
{% set MoreTeachers = MoreTeachers ~ Teacher.Name %}
{% endif %}
{% if loop.last %}
<div><abbr title="{{ MoreTeachers }}">...</abbr></div>
{% else %}
{% set MoreTeachers = MoreTeachers ~ '\n' %}
{% endif %}
{% endif %}
{% else %} {% else %}
{% endfor %} {% endfor %}
...@@ -64,13 +78,13 @@ ...@@ -64,13 +78,13 @@
{% set SecondConjuction = ' и' %} {% set SecondConjuction = ' и' %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% set Hours = [ {% set Hours = [
{ Type: 'Lectures', Text: 'теории' ~ FirstConjuction }, { Type: 'Lectures', Text: 'теории' ~ FirstConjuction },
{ Type: 'Practice', Text: 'практики' ~ SecondConjuction }, { Type: 'Practice', Text: 'практики' ~ SecondConjuction },
{ Type: 'Labs', Text: 'лабораторных занятий' } { Type: 'Labs', Text: 'лабораторных занятий' }
] %} ] %}
{% for Hour in Hours if Discipline[Hour.Type] %} {% for Hour in Hours if Discipline[Hour.Type] %}
{{ Discipline[Hour.Type] }} {{ Discipline[Hour.Type] }}
{{ Rus.NumEnding(Discipline[Hour.Type], ['час', 'часа', 'часов']) }} {{ Rus.NumEnding(Discipline[Hour.Type], ['час', 'часа', 'часов']) }}
...@@ -85,12 +99,12 @@ ...@@ -85,12 +99,12 @@
{% set SemesterRate = 0 %} {% set SemesterRate = 0 %}
{% set SemesterMaxRate = 0 %} {% set SemesterMaxRate = 0 %}
<div class="blockMargin"> <div class="blockMargin">
{% for Module in DisciplineMap.Modules %} {% for Module in DisciplineMap.Modules %}
{% set ModuleRate = 0 %} {% set ModuleRate = 0 %}
{% set ModuleMaxRate = 0 %} {% set ModuleMaxRate = 0 %}
<div class="tableTitle Module"> <div class="tableTitle Module">
{{ Module.Title|default('Модуль ' ~ loop.index) }} {{ Module.Title|default('Модуль ' ~ loop.index) }}
</div> </div>
...@@ -112,7 +126,7 @@ ...@@ -112,7 +126,7 @@
{{ Submodule.Date ? Submodule.Date|date('d.m.Y') : '—' }} {{ Submodule.Date ? Submodule.Date|date('d.m.Y') : '—' }}
</div> </div>
</div> </div>
{% if loop.last %} {% if loop.last %}
<div class="moduleResult"> <div class="moduleResult">
Итого за модуль: {{ ModuleRate }} / {{ ModuleMaxRate }} Итого за модуль: {{ ModuleRate }} / {{ ModuleMaxRate }}
...@@ -123,7 +137,7 @@ ...@@ -123,7 +137,7 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</div> </div>
{% if Discipline.Type == 'exam' %} {% if Discipline.Type == 'exam' %}
<h3 class="blockTitle">Допуск к экзамену</h3> <h3 class="blockTitle">Допуск к экзамену</h3>
<div class="blockMargin"> <div class="blockMargin">
...@@ -148,17 +162,17 @@ ...@@ -148,17 +162,17 @@
<div class="Middle totalRate"> <div class="Middle totalRate">
Промежуточный итог: {{ SemesterRate + ExtraRate }} / {{ SemesterMaxRate }} Промежуточный итог: {{ SemesterRate + ExtraRate }} / {{ SemesterMaxRate }}
</div> </div>
{% set Bonus = Submodules[DisciplineMap.Bonus] %} {% set Bonus = Submodules[DisciplineMap.Bonus] %}
{% set Exam = Submodules[DisciplineMap.Exam] %} {% set Exam = Submodules[DisciplineMap.Exam] %}
<h3 class="blockTitle">Экзамен</h3> <h3 class="blockTitle">Экзамен</h3>
<div class="blockMargin"> <div class="blockMargin">
<div class="tableTitle Extra"> <div class="tableTitle Extra">
Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo; Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;
</div> </div>
{% if Bonus is not empty %} {% if Bonus is not empty %}
<div class="submoduleBlock"> <div class="submoduleBlock">
<div class="submoduleTitle">Бонусные баллы</div> <div class="submoduleTitle">Бонусные баллы</div>
<div class="submoduleRate"> <div class="submoduleRate">
{{ +Bonus.Rate }} / {{ +Bonus.MaxRate }} {{ +Bonus.Rate }} / {{ +Bonus.MaxRate }}
......
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