From c5b9fcacbc37115c1c13fd9fb68c883ad9d52dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com>
Date: Sun, 31 Aug 2014 23:15:56 +0400
Subject: [PATCH] Grade -> GradeID

---
 .../classes/Controller/Handler/Map.php           | 16 ++++++++--------
 ~dev_rating/media/css/setRate.css                |  7 +++++--
 ~dev_rating/media/js/construct/edit.js           |  6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/~dev_rating/application/classes/Controller/Handler/Map.php b/~dev_rating/application/classes/Controller/Handler/Map.php
index dd6088883..476700e93 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 a7602be34..eeeea3e7c 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 aa7a05896..9e6348b14 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);
-- 
GitLab