From c09c195f7572a21d4c8171bd1c816774b9745657 Mon Sep 17 00:00:00 2001 From: PavelBegunkov <asml.Silence@gmail.com> Date: Sun, 21 Sep 2014 03:42:13 +0400 Subject: [PATCH] another opt --- .../media/js/discipline/CreateDiscipline.js | 14 +++++++------- ~dev_rating/media/js/discipline/EditStudents.js | 10 ++++++---- ~dev_rating/media/js/discipline/general.js | 3 +-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/~dev_rating/media/js/discipline/CreateDiscipline.js b/~dev_rating/media/js/discipline/CreateDiscipline.js index b1e971ed1..a8137ea8c 100644 --- a/~dev_rating/media/js/discipline/CreateDiscipline.js +++ b/~dev_rating/media/js/discipline/CreateDiscipline.js @@ -5,17 +5,17 @@ $(function() { $(".AddDiscipline").click(function(){ $(this).attr("disabled", true); var main = $(".main_content"); - var BonusRate = main.find(".BonusRate").prop("checked"); + var BonusRate = main.find(".BonusRate").first().prop("checked"); $.post( URLdir + 'handler/map/AddDiscipline', { - 'Grade': main.find('.SelectGrade').val(), - 'SubjectID': main.find('.SelectSubject').val(), + 'Grade': main.find('.SelectGrade').first().val(), + 'SubjectID': main.find('.SelectSubject').first().val(), 'BonusRate': BonusRate, - 'ExamType': main.find('input:radio[name=ExamType]:checked').val(), - 'LectionCount': main.find('.InputLectionCount').val(), - 'PracticeCount': main.find('.InputPracticeCount').val(), - 'FacultyID': main.find('.SelectFaculty').val() + 'ExamType': main.find('input:radio[name=ExamType]:checked').first().val(), + 'LectionCount': main.find('.InputLectionCount').first().val(), + 'PracticeCount': main.find('.InputPracticeCount').first().val(), + 'FacultyID': main.find('.SelectFaculty').first().val() }, function(data){ data = $.parseJSON(data); diff --git a/~dev_rating/media/js/discipline/EditStudents.js b/~dev_rating/media/js/discipline/EditStudents.js index 84d429776..f07ee30fd 100644 --- a/~dev_rating/media/js/discipline/EditStudents.js +++ b/~dev_rating/media/js/discipline/EditStudents.js @@ -76,7 +76,7 @@ $('.SelectGrade').change(function(){ URLdir + 'handler/map/GetStudyGroups', { 'FacultyID': FacultyID, - 'GradeID': $('.SelectGrade').val() + 'GradeID': $(this).val() }, function(data){ data = $.parseJSON(data); @@ -101,16 +101,18 @@ $('.InputStudentName').focusout(function(){ }); $('.InputStudentName').keydown(function(e){ if(e.keyCode==13){ - $('.InputStudentName').focusout('focusout'); + $(this).focusout('focusout'); $(this).blur(); } }); $('.SelectGrade').focusout(function(){ - $('.SelectGrade').trigger('change'); + $(this).trigger('change'); }); + + $('.SelectStudyGroup').focusout(function(){ - $('.SelectStudyGroup').trigger('change'); + $(this).trigger('change'); }); // Если студент из поиска diff --git a/~dev_rating/media/js/discipline/general.js b/~dev_rating/media/js/discipline/general.js index af926e312..8a32a96ab 100644 --- a/~dev_rating/media/js/discipline/general.js +++ b/~dev_rating/media/js/discipline/general.js @@ -111,12 +111,11 @@ $(function() { { - var jTemp = $('.HiddenInputFacultyID'); + var jTemp = $('.HiddenInputFacultyID').first(); if (jTemp) { FacultyID = jTemp.val(); // Факультет, к которой привязана дисциплина jTemp.remove(); // Тут даже Шерлок Холмс бессилен } - } }) \ No newline at end of file -- GitLab