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

Grade -> GradeID

parent 7a80e277
Branches
Tags
No related merge requests found
...@@ -70,13 +70,13 @@ class Controller_Handler_Map extends Controller_Handler { ...@@ -70,13 +70,13 @@ class Controller_Handler_Map extends Controller_Handler {
$data['success'] = false; $data['success'] = false;
$this->post -> rule('DisciplineID', 'not_empty') $this->post -> rule('DisciplineID', 'not_empty')
-> rule('DisciplineID', 'digit') -> rule('DisciplineID', 'digit')
-> rule('Grade', 'not_empty') -> rule('GradeID', 'not_empty')
-> rule('Grade', 'digit'); -> rule('GradeID', 'digit');
if($this->post->check()) { if($this->post->check()) {
$result = $this->model->ChangeDisciplineGrade( $result = $this->model->ChangeDisciplineGrade(
$this->user['TeacherID'], $this->user['TeacherID'],
$this->post->offsetGet('DisciplineID'), $this->post->offsetGet('DisciplineID'),
$this->post->offsetGet('Grade') $this->post->offsetGet('GradeID')
); );
if ($result[0]['Num'] == 0) if ($result[0]['Num'] == 0)
$data['success'] = true; $data['success'] = true;
...@@ -473,10 +473,10 @@ class Controller_Handler_Map extends Controller_Handler { ...@@ -473,10 +473,10 @@ class Controller_Handler_Map extends Controller_Handler {
// Получаем список групп (позже нужно будет перенести в другой контроллер)(для поиска) // Получаем список групп (позже нужно будет перенести в другой контроллер)(для поиска)
public function action_GetStudyGroups() { public function action_GetStudyGroups() {
$GroupList['success'] = false; $GroupList['success'] = false;
$this->post -> rule('Grade', 'digit') $this->post -> rule('GradeID', 'digit')
-> rule('FacultyID', 'digit'); -> rule('FacultyID', 'digit');
if($this->post->check()) { 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(); $GroupList = array();
$i = 0; $i = 0;
...@@ -500,14 +500,14 @@ class Controller_Handler_Map extends Controller_Handler { ...@@ -500,14 +500,14 @@ class Controller_Handler_Map extends Controller_Handler {
// Поиск студентов // Поиск студентов
public function action_SearchStudents() { public function action_SearchStudents() {
$this->post -> rule('Grade', 'digit') $this->post -> rule('GradeID', 'digit')
-> rule('GroupN', 'digit') -> rule('GroupN', 'digit')
-> rule('FacultyID', 'digit') -> rule('FacultyID', 'digit')
-> rule('DisciplineID', 'not_empty') -> rule('DisciplineID', 'not_empty')
-> rule('DisciplineID', 'digit'); -> rule('DisciplineID', 'digit');
if($this->post->check()) { if($this->post->check()) {
$SeResult = $this->model->getStudentsNotAttendingDiscipline( $SeResult = $this->model->getStudentsNotAttendingDiscipline(
$this->post->offsetGet('Grade'), $this->post->offsetGet('GradeID'),
$this->post->offsetGet('GroupN'), $this->post->offsetGet('GroupN'),
$this->post->offsetGet('FacultyID'), $this->post->offsetGet('FacultyID'),
$this->post->offsetGet('Last'), $this->post->offsetGet('Last'),
...@@ -516,7 +516,7 @@ class Controller_Handler_Map extends Controller_Handler { ...@@ -516,7 +516,7 @@ class Controller_Handler_Map extends Controller_Handler {
$this->post->offsetGet('DisciplineID') $this->post->offsetGet('DisciplineID')
); );
$SearchResult = array(); $SearchResult = array();
$i = 0; $i = 0;
foreach($SeResult as $row){ foreach($SeResult as $row){
$i++; $i++;
......
.main_content {
overflow-x: auto;
}
.studentsRate { .studentsRate {
width: 95%; width: 95%;
margin: 0 auto; margin: 0 auto;
} }
.title { .title {
font-size: 13px; font-size: 15px;
color: #363636 color: #363636
} }
.subject { .subject {
text-align: center; text-align: center;
font-size: 13px; font-size: 15px;
color: #0183ce color: #0183ce
} }
.student { .student {
......
...@@ -213,7 +213,7 @@ $(function() { ...@@ -213,7 +213,7 @@ $(function() {
'/~dev_rating/handler/map/ChangeDisciplineGrade', '/~dev_rating/handler/map/ChangeDisciplineGrade',
{ {
'DisciplineID': DisciplineID, 'DisciplineID': DisciplineID,
'Grade': $('.SelectDisGrade').val() 'GradeID': $('.SelectDisGrade').val()
}, },
function(data) { function(data) {
data = $.parseJSON(data); data = $.parseJSON(data);
...@@ -643,7 +643,7 @@ function CallSearchStudents() { ...@@ -643,7 +643,7 @@ function CallSearchStudents() {
$.post( $.post(
'/~dev_rating/handler/map/SearchStudents', '/~dev_rating/handler/map/SearchStudents',
{ {
'Grade': $('.SelectGrade').val(), 'GradeID': $('.SelectGrade').val(),
'GroupN': $('.SelectStudyGroup').val(), 'GroupN': $('.SelectStudyGroup').val(),
'FacultyID': FacultyID, 'FacultyID': FacultyID,
'Last': Name[0], 'Last': Name[0],
...@@ -673,7 +673,7 @@ $('.SelectGrade').change(function(){ ...@@ -673,7 +673,7 @@ $('.SelectGrade').change(function(){
'/~dev_rating/handler/map/GetStudyGroups', '/~dev_rating/handler/map/GetStudyGroups',
{ {
'FacultyID': FacultyID, 'FacultyID': FacultyID,
'Grade': $('.SelectGrade').val() 'GradeID': $('.SelectGrade').val()
}, },
function(data){ function(data){
data = $.parseJSON(data); data = $.parseJSON(data);
......
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