diff --git a/~dev_rating/application/classes/Controller/Handler/Map.php b/~dev_rating/application/classes/Controller/Handler/Map.php index f73c80a37eec8b10b759a7644ca5507a704c7eab..7c659b445324f89df9129b1b0ae6135e556a84bd 100644 --- a/~dev_rating/application/classes/Controller/Handler/Map.php +++ b/~dev_rating/application/classes/Controller/Handler/Map.php @@ -370,8 +370,8 @@ class Controller_Handler_Map extends Controller_Handler { $this->post -> rule('Grade', 'digit') -> rule('FacultyID', 'digit'); if($this->post->check()) { - $Groups = $this->model->GetStudyGroupsOrdByGroups($this->post->offsetGet('Grade'), $this->post->offsetGet('FacultyID')); + $GroupList = array(); $i = 0; diff --git a/~dev_rating/application/classes/Controller/Teacher/Map.php b/~dev_rating/application/classes/Controller/Teacher/Map.php index bfcbfa6142d6742a7bcd0ea93e98aea793bb1f54..418645f660f0770e8c9d0b4cc05440b216bc5eba 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Map.php +++ b/~dev_rating/application/classes/Controller/Teacher/Map.php @@ -119,8 +119,6 @@ class Controller_Teacher_Map extends Controller_UserEnvi { } private function getMapInfo($map) { - echo Debug::vars($map); - $mapHandled = array(); $maxRate = 0; $i = 0; $module = 0; diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js index 2cba75abd9036e72d93922c48b38eb637fda7248..a030d011c9e5602c0689dc05cc06069a5f087fad 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -548,14 +548,15 @@ $('.SelectGrade').change(function(){ '/~dev_rating/handler/map/GetStudyGroups', { 'FacultyID': FacultyID, - 'Garde': $('.SelectGrade').val() + 'Grade': $('.SelectGrade').val() }, function(data){ data = $.parseJSON(data); + console.log(data); if (data != null && data != undefined) { $('.SelectStudyGroup').html(''); for (i = 1; i <= data.count; i++) { - $('.SelectStudyGroup').append('<option value="'+ data[i].GroupID +'">'+ data[i].GroupNum +'</option>'); + $('.SelectStudyGroup').append('<option value="'+ data[i].GroupID +'">Группа '+ data[i].GroupNum +' - '+ data[i].SpecName +'</option>'); } if (data.count <= 0) @@ -571,6 +572,12 @@ $('.SelectStudyGroup').change(function(){ $('.InputStudentName').focusout(function(){ CallSearchStudents(); }); +$('.InputStudentName').keydown(function(e){ + if(e.keyCode==13){ + $('.InputStudentName').focusout('focusout'); + $(this).blur(); + } +}); $('.SelectGrade').focusout(function(){ $('.SelectGrade').trigger('change'); @@ -705,6 +712,12 @@ $('.SelectDepartment ').change(function(){ $('.InputTeacherName').focusout(function(){ CallSearchTeachers(); }); +$('.InputTeacherName').keydown(function(e){ + if(e.keyCode==13){ + $('.InputTeacherName').focusout('focusout'); + $(this).blur(); + } +}); $('.SelectFaculty').focusout(function(){ $('.SelectFaculty').trigger('change');