Skip to content
Snippets Groups Projects
Commit a5ad6ac2 authored by Антон Шалимов's avatar Антон Шалимов
Browse files

Крутое добавление студента

parent 81bbbc10
Branches
Tags
No related merge requests found
......@@ -415,7 +415,7 @@ class Controller_Handler_Map extends Controller_Handler {
$this->post->offsetGet('DisciplineID')
);
$SearchResult = array();
$i = 0;
foreach($SeResult as $row){
$i++;
......
......@@ -19,7 +19,7 @@
<span class="info">Курс {{ Student.Grade }}, Группа {{ Student.GroupNum }}</span>
<span class="Action">Открыть список ▼</span>
</div>
<div class="GroupContainer">
<div class="GroupContainer GroupID_{{ Student.GroupID }}">
{% set NowGroupNum = Student.GroupNum %}
{% endif %}
<div id="{{ Student.StudentID }}" class="Student {% if Student.Type == 'detach' %}StatusUnbind{% else %}StatusBind{% endif %}">
......
......@@ -263,6 +263,11 @@
font-size: 14px;
color: #363636;
}
.StudentsList .Student .From {
float: left;
font-size: 14px;
color: #363636;
}
.StudentsList .Student .action {
float: right;
font-size: 14px;
......
......@@ -528,12 +528,22 @@ $('.AttachedGroupsList').on('click', '.UnbindGroup', function(){
});
// Поиск студентов
function AddStudent(ID, Name, From){
return '\
<div id="'+ ID +'" class="Student StatusUnbind">\
<span class="Name">'+ Name +', '+ From +'</span>\
<span class="action Action_BindStudent">Прикрепить студента</span>\
</div>';
function AddStudent(ID, Name, From, GroupID, Bind){
if (Bind == true)
var Status = 'StatusBind';
else
var Status = 'StatusUnbind';
var r = '\
<div id="'+ ID +'" class="Student '+ Status +' '+ GroupID +'">\
<span class="Name">'+ Name +'</span> \
<span class="From">'+ From +'</span>';
if (Bind == true)
r +='<span class="action Action_UnbindStudent">Отсоединить студента</span>';
else
r +='<span class="action Action_BindStudent">Прикрепить студента</span>';
r +=
'</div>';
return r;
}
// Поиск студентов
......@@ -556,10 +566,11 @@ function CallSearchStudents() {
$('.SearchResult').html('');
if (parseInt(SearchResult.Count) > 0)
for(var i = 1; i <= parseInt(SearchResult.Count); i++) {
var ID = SearchResult[i].StudentID;
var Name = SearchResult[i].StudentLast +' '+ SearchResult[i].StudentFirst +' '+ SearchResult[i].StudentSecond;
var From = 'Курс ' + SearchResult[i].GroupGrade + ', Группа ' + SearchResult[i].GroupNum;
$('.SearchResult').append(AddStudent(ID, Name, From));
var ID = SearchResult[i].StudentID;
var Name = SearchResult[i].StudentLast +' '+ SearchResult[i].StudentFirst +' '+ SearchResult[i].StudentSecond;
var From = 'Курс ' + SearchResult[i].GroupGrade + ', Группа ' + SearchResult[i].GroupNum;
var GroupID = 'GroupID_'+SearchResult[i].GroupID
$('.SearchResult').append(AddStudent(ID, Name, From, GroupID, false));
}
else
$('.SearchResult').html('<p class="notification">Нет результатов</p>');
......@@ -612,6 +623,7 @@ $('.SelectStudyGroup').focusout(function(){
// Прикрепить студента
$('.StudentsList').on('click', '.Action_BindStudent', function(){
var thisObj = $(this);
$(this)
.removeClass('Action_BindStudent')
.addClass('Action_UnbindStudent')
......@@ -629,8 +641,24 @@ $('.StudentsList').on('click', '.Action_BindStudent', function(){
},
function(data){
data = $.parseJSON(data);
if(data.success === true)
if(data.success === true) {
var reg = /GroupID_\d+/;
var GroupID = ''+reg.exec(thisObj.parent().attr('class'));
var ID = thisObj.parent().attr('id');
var Name = thisObj.siblings('.Name').text();
var From = thisObj.siblings('.From').text();
if ($('div').is('.GroupContainer.'+GroupID) === false) {
$('.AttachedStudentsList').append('\
<div class="GradeAndGroupTitle ActionShowHideGroupContainer">\
<span class="info">'+From+'</span>\
<span class="Action">Открыть список ▼</span>\
</div>');
$('.AttachedStudentsList').append('<div class="GroupContainer '+GroupID+'" style="display: block"> </div>');
}
$('.GroupContainer.'+GroupID).append(AddStudent(ID, Name, From, GroupID, true));
thisObj.parent().remove();
EventInspector_ShowMsg('Студент добавлен', 'success');
}
else EventInspector_ShowMsg('Ошибка при добавление студента', 'error');
}
);
......
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