Merge remote-tracking branch 'origin/develop' into dev

Conflicts:
	~dev_rating/modules/account/classes/Kohana/User.php

db/StoredFunctions.sql

@@ -28,7 +28,12 @@ DROP FUNCTION IF EXISTS ChangeMail//
 
 DROP FUNCTION IF EXISTS GetRateForDisc//
 
-drop function if exists InternalIsTeacherBound//
+drop function if exists InternalIsTeacherBounded//
+DROP FUNCTION IF EXISTS SetSemesterID//
+DROP FUNCTION IF EXISTS AddDiscipline//
+
+DROP FUNCTION IF EXISTS GetMaxRateForDisc//
+
 
 
 # -------------------------------------------------------------------------------------------
@@ -262,7 +267,7 @@ BEGIN
     INSERT INTO faculties
         (Name, Abbr) VALUES(pFacultyName, pFacultyAbbr);
     RETURN 0;
-END //
+END//
 
 # -------------------------------------------------------------------------------------------
 # Label: departments
@@ -284,7 +289,6 @@ BEGIN
             departments.ID = LAST_INSERT_ID(departments.ID);
 
     RETURN LAST_INSERT_ID();
-
 END //
 
 # -------------------------------------------------------------------------------------------
@@ -308,9 +312,9 @@ BEGIN
     DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -1;
 
     INSERT INTO `grades`
-    (Num, Degree) VALUES (pGradeNum, pDegree)
-    ON DUPLICATE KEY UPDATE
-        grades.ID = LAST_INSERT_ID(grades.ID);
+        (Num, Degree) VALUES (pGradeNum, pDegree)
+        ON DUPLICATE KEY UPDATE
+            grades.ID = LAST_INSERT_ID(grades.ID);
 
     RETURN LAST_INSERT_ID();
 END //
@@ -343,8 +347,6 @@ BEGIN
 END //
 
 
-
-
 DROP FUNCTION IF EXISTS GetGroup//
 CREATE FUNCTION `GetGroup` (
         `pGradeID` INT,
@@ -811,7 +813,7 @@ BEGIN
     RETURN vSemesterID;
 END //
 
-DROP FUNCTION IF EXISTS AddDiscipline//
+
 DROP FUNCTION IF EXISTS Discipline_Create//
 CREATE FUNCTION `Discipline_Create` (
     `pTeacherID` INT,
@@ -2039,26 +2041,6 @@ END //
 # Label: rating
 # -------------------------------------------------------------------------------------------
 
-# TODO: kill
-DROP FUNCTION IF EXISTS GetMaxRateForDisc//
-CREATE FUNCTION `GetMaxRateForDisc` (
-        `pDisciplineID` INT
-    ) RETURNS int(11)
-    NO SQL
-BEGIN
-    DECLARE vResult INT DEFAULT 0;
-
-    SELECT SUM(submodules.MaxRate)
-        INTO vResult
-        FROM `modules`
-        LEFT JOIN `submodules` ON   submodules.ModuleID = modules.ID
-        WHERE   modules.DisciplineID = pDisciplineID AND
-                submodules.IsUsed != 0 AND
-                (modules.Type = 1 OR ( modules.Type = 2 AND submodules.OrderNum = 1))
-        LIMIT 1;
-    RETURN  (vResult);
-END //
-
 
 # Вычисление максимального балла для submodule
 DROP FUNCTION IF EXISTS CalculateMaxRateForExtra//

db/StoredProcedures.sql

@@ -732,8 +732,7 @@ END //
 DROP PROCEDURE IF EXISTS GetRatesForGroup//
 CREATE PROCEDURE `GetRatesForGroup` (
     IN `pDisciplineID` INT,
-    IN `pGroupID` INT
-)
+    IN `pGroupID` INT)
     NO SQL
 BEGIN
     DECLARE vChecker BOOLEAN DEFAULT FALSE;

~dev_rating/modules/account/classes/Kohana/User.php

@@ -60,11 +60,8 @@ class Kohana_User implements ArrayAccess
         $this->_config['hash_method'] = 'sha256';
         $isSignedIn = $this->isSignedIn();
 
-        if (!isset($this->_session['SemesterID']))
-            $this->_session['SemesterID'] = $this->_model->getCurSemesterID();
-
         if ($isSignedIn) {
-            $id = $this->_session['ID'];
+            $id = $this->_session->get('ID');
             $this->_userInfo = $this->getInfoFromDB($id);
 
             if (self::$_flag != true) {
@@ -140,6 +137,8 @@ class Kohana_User implements ArrayAccess
         $this->_session->set('UserHash', $this->hash($userHash));
         $this->_session->set('PasswordHash', $passwordHash);
         $this->_session->set('start_time', time());
+        $this->_session->set("SemesterID", $this->_model->getCurSemesterID());
+
         return true;
     }