страница 'Студенты УКД' добавлена доп. кнопка 'Скрыть список'

~dev_rating/application/views/teacher/discipline/EditStudents.twig

@@ -6,6 +6,19 @@
 	{{ HTML.script('media/js/discipline/EditStudents.js')|raw }}
 {% endblock %}
 
+{% macro outputStudent(Student, HTML) %}
+	<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' %}
+			<button class="action Action_BindStudent">Прикрепить студента</button>
+		{% else %}
+			<button class="action Action_UnbindStudent">Отсоединить студента</button>
+		{% endif %}
+	</div>
+{% endmacro %}
+
+{% import 'teacher/discipline/EditStudents' as idx %}
+
 {% block map_content %}
 <div class="StudentsList">
 	<input type="hidden" class="HiddenInputFacultyID" value="{{ Discipline.FacultyID }}">
@@ -13,28 +26,26 @@
 		<h2 class="BlueTitle">Прикрепленные студенты</h2>
 			{% set NowGroupNum = -1 %}
 			{% for Student in Students %}
+
 				{% if NowGroupNum != Student.GroupNum %}
 					{% if not loop.first %}
 						</div>
 					{% endif %}
 					<div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ Student.GroupID }}">
-					<span class="info">Курс {{ Student.GradeNum }}, Группа {{ Student.GroupNum }}</span>
+						<span class="info">{{ Student.Degree ~ ', ' ~ Student.GradeNum }} Курс - Группа {{ Student.GroupNum }}</span>
 						<span class="Action">Открыть список ▼</span>
 					</div>
 					<div class="GroupContainer GroupID_{{ Student.GroupID }}">
+					<div class="hideListAction"></div>
 						{% set NowGroupNum = Student.GroupNum %}
 				{% endif %}
-				<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' %}
-						<button class="action Action_BindStudent">Прикрепить студента</button>
-					{% else %}
-						<button class="action Action_UnbindStudent">Отсоединить студента</button>
-					{% endif %}
-				</div>
+
+				{{ idx.outputStudent(Student, HTML) }}
+
 				{% if loop.last %}
 					</div>
 				{% endif %}
+
 			{% endfor %}
 	</div>
 	<div class="SearchStudents">

~dev_rating/media/css/discipline.css

@@ -380,8 +380,20 @@
 	.StudentsList .GroupContainer {
 		display: none;
 	}
+		.StudentsList .GroupContainer .hideListAction{
+			float: left;
+			background: url(icons/triangle_up.png) no-repeat center center #f9f9f9;
+			width: 40px;
+			height: 100%;
+			margin-top: 10px;
+		}
+		.StudentsList .GroupContainer .hideListAction:hover{
+			background-color: #e1e1e1;;
+		}
 	.StudentsList .Student {
-		margin: 10px 0;
+		float: right;
+		width: 880px;
+		margin-top: 10px;
 		padding: 7px 10px;
 	}
 		.StudentsList .Student .Name {

~dev_rating/media/js/discipline/EditStudents.js

@@ -229,15 +229,30 @@ $('.StudentsList').on('click', 'button.Action_UnbindStudent', function(){
 	);
 });
 
+// Показать/скрыть список студентов
 $('.StudentsList').on('click', '.ActionShowHideGroupContainer', function(){
-	if ($(this).next('.GroupContainer').css('display') == 'none') {
+	var GroupContainer = $(this).next('.GroupContainer');
+	if (GroupContainer.css('display') == 'none') {
 		$(this).children('.Action').text('Скрыть список ▲');
-		$(this).next('.GroupContainer').show();
+		GroupContainer.show();
+		GroupContainer.css('height', GroupContainer.height());
 	}
 	else {
 		$(this).children('.Action').text('Открыть список ▼');
-		$(this).next('.GroupContainer').hide();
+		GroupContainer.hide('normal');
 	}
 });
 
+$('.StudentsList').on('click', '.hideListAction', function(){
+	$(this).parent()
+		.hide('normal');
+		
+	$(this).parent()
+		.prev()
+		.children('.Action')
+		.text('Открыть список ▼');
+});
+
+
+
 });
\ No newline at end of file