From a03609e2f3a5e79dd814e702dd0b7a5f00707b89 Mon Sep 17 00:00:00 2001
From: Shalimov Anton <solidovic@yandex.ru>
Date: Fri, 29 Aug 2014 20:48:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF=D1=80?=
=?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D0=B6=D0=B0=D1=82=D0=B8=D0=B5=20=D0=BD?=
=?UTF-8?q?=D0=B0=20Enter=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
=?UTF-8?q?=D0=B8=D1=86=D0=B0=D1=85=20=D0=9F=D1=80=D0=B8=D0=BA=D1=80=D0=B5?=
=?UTF-8?q?=D0=BF=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B5=D0=BF?=
=?UTF-8?q?=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9=20?=
=?UTF-8?q?=D0=B8=20=D0=9F=D1=80=D0=B8=D0=BA=D1=80=D0=B5=D0=BF=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=83=D0=B4=D0=B5=D0=BD=D1=82?=
=?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../classes/Controller/Handler/Map.php | 2 +-
.../classes/Controller/Teacher/Map.php | 2 --
~dev_rating/media/js/construct/edit.js | 17 +++++++++++++++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/~dev_rating/application/classes/Controller/Handler/Map.php b/~dev_rating/application/classes/Controller/Handler/Map.php
index f73c80a37..7c659b445 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 bfcbfa614..418645f66 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 2cba75abd..a030d011c 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');
--
GitLab