From 429cd2c5f0f395581b73cee456a5f29ed1dc99e6 Mon Sep 17 00:00:00 2001 From: PavelBegunkov <asml.Silence@gmail.com> Date: Sun, 21 Sep 2014 19:31:29 +0400 Subject: [PATCH] ... --- .../media/js/discipline/EditStudents.js | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/~dev_rating/media/js/discipline/EditStudents.js b/~dev_rating/media/js/discipline/EditStudents.js index 54c716794..82b4cde28 100644 --- a/~dev_rating/media/js/discipline/EditStudents.js +++ b/~dev_rating/media/js/discipline/EditStudents.js @@ -56,18 +56,25 @@ function CallSearchStudents() 'DisciplineID': DisciplineID }, function(data){ - SearchResult = $.parseJSON(data); + var SearchResult = $.parseJSON(data); + var jSearch = $('.SearchResult').first(); + var counter = parseInt(SearchResult.Count); $('.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; - var GroupID = 'GroupID_'+SearchResult[i].GroupID - $('.SearchResult').append(AddStudentInSearchBox(ID, Name, From, GroupID, false)); + if (counter <= 0) + jSearch.html('<p class="notification">Нет результатов... Возможно, студенты, соответствующие критериям поиска, уже прикреплены.</p>'); + else + { + var data = ''; + for(var i = 1; i <= counter; ++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; + var GroupID = 'GroupID_'+SearchResult[i].GroupID; + data += AddStudentInSearchBox(ID, Name, From, GroupID, false); } - else - $('.SearchResult').html('<p class="notification">Нет результатов... Возможно, студенты, соответствующие критериям поиска, уже прикреплены.</p>'); + jSearch.html($.parseHTML(data)); + } } ); } @@ -117,7 +124,8 @@ $('.SelectStudyGroup').focusout(function(){ }); // Если студент из поиска -function BindStudentFromSearch(thisObj) { +function BindStudentFromSearch(thisObj) +{ var reg = /GroupID_\d+/; var GroupID = ''+reg.exec(thisObj.parent().attr('class')); var ID = thisObj.parent().attr('id'); -- GitLab