diff --git a/~dev_rating/application/views/teacher/discipline/EditStudents.twig b/~dev_rating/application/views/teacher/discipline/EditStudents.twig index a82a80234fd876aa267846e92d6f67c81b9cab8e..1b453b0b3bd1cae84681aa562b5dcc6e45fba230 100644 --- a/~dev_rating/application/views/teacher/discipline/EditStudents.twig +++ b/~dev_rating/application/views/teacher/discipline/EditStudents.twig @@ -6,7 +6,7 @@ {{ HTML.script('media/js/discipline/EditStudents.js')|raw }} {% endblock %} -{% macro outputStudent(Student, HTML) %} +{% macro outputStudent(Student) %} <div id="{{ Student.ID }}" class="Student {% if Student.Type == 'detach' %}StatusUnbind{% else %}StatusBind{% endif %}"> <span class="Name">{{ Student.LastName }} {{ Student.FirstName }} {{ Student.SecondName }}</span> {% if Student.Type == 'detach' %} @@ -17,7 +17,10 @@ </div> {% endmacro %} -{% macro outputGroups(Groups, HTML) %} +{% macro outputGroups(Groups) %} + + {% import _self as me %} + {% for group in Groups %} <div> <div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ group.GroupID }}"> @@ -28,8 +31,9 @@ <div class="GroupContainer"> <div class="hideListAction"></div> {% for student in group.students %} -{# {{ idx.outputStudent(student, HTML) }} #} + {{ me.outputStudent(student) }} + {# <div id="{{ student.ID }}" class="Student {% if student.Type == 'detach' %}StatusUnbind{% else %}StatusBind{% endif %}"> <span class="Name">{{ student.LastName }} {{ student.FirstName }} {{ student.SecondName }}</span> {% if student.Type == 'detach' %} @@ -38,6 +42,7 @@ <button class="action Action_UnbindStudent">Отсоединить студента</button> {% endif %} </div> + #} {% endfor %} </div> </div> @@ -83,12 +88,12 @@ <input type="hidden" class="HiddenInputFacultyID" value="{{ Discipline.FacultyID }}"> <div class="GeneralStudentsList"> <h2 class="BlueTitle">Прикрепленные студенты</h2> - {{ idx.outputGroups(Students, HTML) }} + {{ idx.outputGroups(Students) }} </div> <br> <div class="AttachedStudentsList"> <h2 class="BlueTitle">Еще студенты</h2> - {{ idx.outputGroups(AttachStudents, HTML) }} + {{ idx.outputGroups(AttachStudents) }} </div>