diff --git a/~dev_rating/application/classes/Controller/Handler/Map.php b/~dev_rating/application/classes/Controller/Handler/Map.php index dd60888831ceed50c924c4c3fe8718991e946030..476700e93c59d5ad7d522eea720d9bca0680c8c8 100644 --- a/~dev_rating/application/classes/Controller/Handler/Map.php +++ b/~dev_rating/application/classes/Controller/Handler/Map.php @@ -70,13 +70,13 @@ class Controller_Handler_Map extends Controller_Handler { $data['success'] = false; $this->post -> rule('DisciplineID', 'not_empty') -> rule('DisciplineID', 'digit') - -> rule('Grade', 'not_empty') - -> rule('Grade', 'digit'); + -> rule('GradeID', 'not_empty') + -> rule('GradeID', 'digit'); if($this->post->check()) { $result = $this->model->ChangeDisciplineGrade( $this->user['TeacherID'], $this->post->offsetGet('DisciplineID'), - $this->post->offsetGet('Grade') + $this->post->offsetGet('GradeID') ); if ($result[0]['Num'] == 0) $data['success'] = true; @@ -473,10 +473,10 @@ class Controller_Handler_Map extends Controller_Handler { // Получаем список групп (позже нужно будет перенести в другой контроллер)(для поиска) public function action_GetStudyGroups() { $GroupList['success'] = false; - $this->post -> rule('Grade', 'digit') + $this->post -> rule('GradeID', 'digit') -> rule('FacultyID', 'digit'); if($this->post->check()) { - $Groups = $this->model->GetStudyGroupsOrdByGroups($this->post->offsetGet('Grade'), $this->post->offsetGet('FacultyID')); + $Groups = $this->model->GetStudyGroupsOrdByGroups($this->post->offsetGet('GradeID'), $this->post->offsetGet('FacultyID')); $GroupList = array(); $i = 0; @@ -500,14 +500,14 @@ class Controller_Handler_Map extends Controller_Handler { // Поиск студентов public function action_SearchStudents() { - $this->post -> rule('Grade', 'digit') + $this->post -> rule('GradeID', 'digit') -> rule('GroupN', 'digit') -> rule('FacultyID', 'digit') -> rule('DisciplineID', 'not_empty') -> rule('DisciplineID', 'digit'); if($this->post->check()) { $SeResult = $this->model->getStudentsNotAttendingDiscipline( - $this->post->offsetGet('Grade'), + $this->post->offsetGet('GradeID'), $this->post->offsetGet('GroupN'), $this->post->offsetGet('FacultyID'), $this->post->offsetGet('Last'), @@ -516,7 +516,7 @@ class Controller_Handler_Map extends Controller_Handler { $this->post->offsetGet('DisciplineID') ); $SearchResult = array(); - + $i = 0; foreach($SeResult as $row){ $i++; diff --git a/~dev_rating/media/css/setRate.css b/~dev_rating/media/css/setRate.css index a7602be341c0260717adcd46e372437f1c7456e8..eeeea3e7cb394db96411666ff73208fdf1c1a0a5 100644 --- a/~dev_rating/media/css/setRate.css +++ b/~dev_rating/media/css/setRate.css @@ -1,14 +1,17 @@ +.main_content { + overflow-x: auto; +} .studentsRate { width: 95%; margin: 0 auto; } .title { - font-size: 13px; + font-size: 15px; color: #363636 } .subject { text-align: center; - font-size: 13px; + font-size: 15px; color: #0183ce } .student { diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js index aa7a058968d8dfe128a45278013f1d89d4de9235..9e6348b149d1971bb2a31bf6dbdcff62e9ebd629 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -213,7 +213,7 @@ $(function() { '/~dev_rating/handler/map/ChangeDisciplineGrade', { 'DisciplineID': DisciplineID, - 'Grade': $('.SelectDisGrade').val() + 'GradeID': $('.SelectDisGrade').val() }, function(data) { data = $.parseJSON(data); @@ -643,7 +643,7 @@ function CallSearchStudents() { $.post( '/~dev_rating/handler/map/SearchStudents', { - 'Grade': $('.SelectGrade').val(), + 'GradeID': $('.SelectGrade').val(), 'GroupN': $('.SelectStudyGroup').val(), 'FacultyID': FacultyID, 'Last': Name[0], @@ -673,7 +673,7 @@ $('.SelectGrade').change(function(){ '/~dev_rating/handler/map/GetStudyGroups', { 'FacultyID': FacultyID, - 'Grade': $('.SelectGrade').val() + 'GradeID': $('.SelectGrade').val() }, function(data){ data = $.parseJSON(data);