Skip to content
Snippets Groups Projects
Commit bbca21ca authored by xamgore's avatar xamgore
Browse files

Merge remote-tracking branch 'origin/feature/db_refactoring' into dev 

Conflicts:
	db/StoredFunctions.sql
	~dev_rating/application/classes/Model/Teacher.php
parents 792e1bbb 4cd9a858
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 691 additions and 614 deletions
db/StoredFunctions.sql
+ 563
− 504
View file @ bbca21ca
This diff is collapsed.
db/StoredProcedures.sql
+ 82
− 75
View file @ bbca21ca
......@@ -18,6 +18,7 @@ DROP PROCEDURE IF EXISTS GetMapForStudentExam//
DROP PROCEDURE IF EXISTS GetRatesForStudentsGroup//
DROP PROCEDURE IF EXISTS CreateFaculty //
DROP PROCEDURE IF EXISTS GetReports//
# -------------------------------------------------------------------------------------------
......@@ -239,7 +240,10 @@ END //
DROP PROCEDURE IF EXISTS GetPersonalInfo//
CREATE PROCEDURE `GetPersonalInfo` ( IN `pUserID` INT )
CREATE PROCEDURE `GetPersonalInfo` (
IN `pUserID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
DECLARE vAccountType INT DEFAULT -1;
......@@ -270,7 +274,7 @@ BEGIN
view_students.FacultyAbbr
FROM `view_students`
WHERE view_students.AccountID = pUserID AND
view_students.SemesterID = @CurrentSemesterID
view_students.SemesterID = pSemesterID
LIMIT 1;
ELSE
SELECT view_teachers.LastName,
......@@ -397,7 +401,10 @@ END //
DROP PROCEDURE IF EXISTS GetStudentsByStudyGroups//
DROP PROCEDURE IF EXISTS GetStudents//
CREATE PROCEDURE `GetStudents` (IN `pGroupID` INT)
CREATE PROCEDURE `GetStudents` (
IN `pGroupID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_students.StudentID AS 'ID',
......@@ -412,7 +419,7 @@ BEGIN
view_students.GroupNum
FROM `view_students`
WHERE view_students.GroupID = pGroupID AND
view_students.SemesterID = @CurrentSemesterID
view_students.SemesterID = pSemesterID
ORDER BY view_students.LastName ASC, view_students.FirstName ASC;
END //
......@@ -421,7 +428,8 @@ DROP PROCEDURE IF EXISTS GetStudentsByFaculty//
CREATE PROCEDURE `GetStudentsByFaculty`
( IN `pFacultyID` INT,
IN `pGradeID` INT,
IN `pGroupID` INT
IN `pGroupID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
......@@ -437,7 +445,7 @@ BEGIN
view_students.GroupNum
FROM `view_students`
WHERE view_students.FacultyID = pFacultyID AND
view_students.SemesterID = @CurrentSemesterID AND
view_students.SemesterID = pSemesterID AND
(pGradeID = 0 OR view_students.GradeID = pGradeID) AND
(pGroupID = 0 OR view_students.GroupID = pGroupID)
ORDER BY view_students.LastName ASC, view_students.FirstName ASC;
......@@ -446,10 +454,14 @@ END //
# students, that don't included in general groups without attached
DROP PROCEDURE IF EXISTS SearchStudents//
CREATE PROCEDURE `SearchStudents`
( IN `pGradeID` INT, IN `pGroupID` INT, IN `pFacultyID` INT,
CREATE PROCEDURE `SearchStudents` (
IN `pGradeID` INT,
IN `pGroupID` INT,
IN `pFacultyID` INT,
IN `pFullName` VARCHAR(100) CHARSET utf8,
IN `pDisciplineID` INT)
IN `pDisciplineID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_students.StudentID AS 'ID',
......@@ -466,7 +478,7 @@ BEGIN
disciplines_students.DisciplineID = pDisciplineID
LEFT JOIN `disciplines_groups` ON disciplines_groups.GroupID = view_students.GroupID AND
disciplines_groups.DisciplineID = pDisciplineID
WHERE view_students.SemesterID = @CurrentSemesterID AND
WHERE view_students.SemesterID = pSemesterID AND
view_students.FacultyID = pFacultyID AND
view_students.GradeID = pGradeID AND
(view_students.GroupID = pGroupID OR pGroupID = 0) AND
......@@ -482,8 +494,10 @@ END //
# all students in general groups, that take course (with attached and detached)
DROP PROCEDURE IF EXISTS GetStudentsForDiscipline//
CREATE PROCEDURE `GetStudentsForDiscipline`
( IN `pDisciplineID` INT)
CREATE PROCEDURE `GetStudentsForDiscipline` (
IN `pDisciplineID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_disciplines_students.StudentID AS 'ID',
......@@ -498,7 +512,7 @@ BEGIN
view_disciplines_students.AttachType AS 'AttachType'
FROM `view_disciplines_students`
WHERE view_disciplines_students.DisciplineID = pDisciplineID AND
view_disciplines_students.SemesterID = @CurrentSemesterID
view_disciplines_students.SemesterID = pSemesterID
ORDER BY (view_disciplines_students.AttachType IS NULL OR
view_disciplines_students.AttachType = 'detach') DESC,
view_disciplines_students.GradeID ASC,
......@@ -511,8 +525,10 @@ END //
# all students takes that course (general groups + attached)
DROP PROCEDURE IF EXISTS GetStudentsForRating//
CREATE PROCEDURE `GetStudentsForRating`
( IN `pDisciplineID` INT)
CREATE PROCEDURE `GetStudentsForRating` (
IN `pDisciplineID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_disciplines_students.StudentID AS 'ID',
......@@ -526,7 +542,7 @@ BEGIN
view_disciplines_students.GroupNum,
(view_disciplines_students.AttachType IS NOT NULL) AS 'IsAttached'
FROM `view_disciplines_students`
WHERE view_disciplines_students.SemesterID = @CurrentSemesterID AND
WHERE view_disciplines_students.SemesterID = pSemesterID AND
view_disciplines_students.DisciplineID = pDisciplineID AND
(view_disciplines_students.AttachType IS NULL OR
view_disciplines_students.AttachType = 'attach')
......@@ -581,7 +597,10 @@ NO SQL
# TODO: haven't reference on it
# all disciplines for faculty in current semester
DROP PROCEDURE IF EXISTS GetDisciplines//
CREATE PROCEDURE `GetDisciplines` ( IN `pFacultyID` INT )
CREATE PROCEDURE `GetDisciplines` (
IN `pFacultyID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_disciplines.DisciplineID AS 'ID',
......@@ -592,7 +611,7 @@ BEGIN
FROM `view_disciplines`
INNER JOIN `view_disciplines_results`
ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
WHERE view_disciplines.SemesterID = @CurrentSemesterID AND
WHERE view_disciplines.SemesterID = pSemesterID AND
view_disciplines.FacultyID = pFacultyID
ORDER BY view_disciplines.SubjectName ASC;
END //
......@@ -602,7 +621,10 @@ END //
# processed format of output (after desequentialization)
# { discipline1 {group1, group2, ...}, discipline2 {groupN, ...}, ... }
DROP PROCEDURE IF EXISTS GetDisciplinesForTeacher//
CREATE PROCEDURE `GetDisciplinesForTeacher`(IN `pTeacherID` INT)
CREATE PROCEDURE `GetDisciplinesForTeacher` (
IN `pTeacherID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT DISTINCT view_disciplines.DisciplineID AS 'ID',
......@@ -626,7 +648,7 @@ BEGIN
LEFT JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID
LEFT JOIN `view_disciplines_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
WHERE disciplines_teachers.TeacherID = pTeacherID AND
view_disciplines.SemesterID = @CurrentSemesterID
view_disciplines.SemesterID = pSemesterID
ORDER BY view_disciplines.GradeID ASC,
view_disciplines.SubjectName ASC,
view_disciplines.DisciplineID ASC,
......@@ -636,7 +658,10 @@ END //
# get all disciplines, that student take.
DROP PROCEDURE IF EXISTS GetDisciplinesForStudent//
CREATE PROCEDURE `GetDisciplinesForStudent`(IN `pStudentID` INT)
CREATE PROCEDURE `GetDisciplinesForStudent` (
IN `pStudentID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT view_disciplines.DisciplineID AS 'ID',
......@@ -657,8 +682,8 @@ BEGIN
LEFT JOIN `view_rating_result` ON view_rating_result.StudentID = pStudentID AND
view_rating_result.DisciplineID = view_disciplines_results.DisciplineID
INNER JOIN `view_teachers` ON view_teachers.TeacherID = view_disciplines.AuthorID
WHERE view_disciplines_students.SemesterID = @CurrentSemesterID AND
view_disciplines.SemesterID = @CurrentSemesterID AND
WHERE view_disciplines_students.SemesterID = pSemesterID AND
view_disciplines.SemesterID = pSemesterID AND
view_disciplines_students.StudentID = pStudentID AND
(view_disciplines_students.AttachType IS NULL OR view_disciplines_students.AttachType != 'detach')
ORDER BY view_disciplines.ExamType ASC, view_disciplines.SubjectName ASC;
......@@ -667,7 +692,10 @@ END //
# get all disciplines for group, including disciplines, where students have attached status
DROP PROCEDURE IF EXISTS GetDisciplinesForGroup//
CREATE PROCEDURE `GetDisciplinesForGroup`(IN `pGroupID` INT)
CREATE PROCEDURE `GetDisciplinesForGroup` (
IN `pGroupID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
(SELECT view_disciplines.DisciplineID AS 'ID',
......@@ -676,7 +704,7 @@ BEGIN
view_disciplines.ExamType AS 'type'
FROM `disciplines_groups`
INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = disciplines_groups.DisciplineID AND
view_disciplines.SemesterID = @CurrentSemesterID
view_disciplines.SemesterID = pSemesterID
WHERE disciplines_groups.GroupID = pGroupID
) UNION DISTINCT
(SELECT view_disciplines.DisciplineID AS 'ID',
......@@ -686,9 +714,9 @@ BEGIN
FROM `disciplines_students`
INNER JOIN `students` ON disciplines_students.StudentID = students.ID
INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = disciplines_students.DisciplineID AND
view_disciplines.SemesterID = @CurrentSemesterID
view_disciplines.SemesterID = pSemesterID
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
students_groups.SemesterID = pSemesterID
WHERE students_groups.GroupID = pGroupID
);
END //
......@@ -700,17 +728,23 @@ END //
# -------------------------------------------------------------------------------------------
DROP PROCEDURE IF EXISTS GetRatesForGroup//
CREATE PROCEDURE `GetRatesForGroup`
( IN `pDisciplineID` INT, IN `pGroupID` INT)
CREATE PROCEDURE `GetRatesForGroup` (
IN `pDisciplineID` INT,
IN `pGroupID` INT
)
NO SQL
BEGIN
DECLARE vChecker BOOLEAN DEFAULT FALSE;
DECLARE vSemesterID INT DEFAULT -1;
SELECT disciplines_groups.ID IS NOT NULL INTO vChecker
FROM `disciplines_groups`
WHERE disciplines_groups.DisciplineID = pDisciplineID AND
disciplines_groups.GroupID = pGroupID
LIMIT 1;
SET vSemesterID = GetDisciplineSemesterID(pDisciplineID);
IF !vChecker THEN
SELECT students.ID,
students.LastName,
......@@ -723,7 +757,7 @@ BEGIN
LEFT JOIN `view_rating_result` ON view_rating_result.DisciplineID = pDisciplineID AND
view_rating_result.StudentID = students.ID
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
students_groups.SemesterID = vSemesterID
WHERE students_groups.GroupID = pGroupID AND
EXISTS(SELECT * FROM `disciplines_students`
WHERE disciplines_students.DisciplineID = pDisciplineID AND
......@@ -742,7 +776,7 @@ BEGIN
LEFT JOIN `view_rating_result` ON view_rating_result.DisciplineID = pDisciplineID AND
view_rating_result.StudentID = students.ID
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
students_groups.SemesterID = vSemesterID
WHERE students_groups.GroupID = pGroupID AND
NOT EXISTS(SELECT * FROM `disciplines_students`
WHERE disciplines_students.DisciplineID = pDisciplineID AND
......@@ -854,18 +888,21 @@ BEGIN
END //
DROP PROCEDURE IF EXISTS GetAttestationData//
CREATE PROCEDURE `GetAttestationData`
( IN `pDisciplineID` INT, IN `pGroupID` INT)
CREATE PROCEDURE `GetAttestationData` (
IN `pDisciplineID` INT,
IN `pGroupID` INT,
IN `pSemesterID` INT
)
NO SQL
BEGIN
SELECT students.ID AS 'StudentID',
SELECT students.ID AS 'StudentID',
rating_table.Rate As 'Rate',
rating_table.Date As 'Date',
submodules.OrderNum As 'OrderNum',
modules.Type As 'Type'
FROM `students`
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
students_groups.SemesterID = pSemesterID
LEFT JOIN `disciplines_groups` ON disciplines_groups.DisciplineID = pDisciplineID AND
disciplines_groups.GroupID = students_groups.GroupID
......@@ -1016,42 +1053,12 @@ END //
# TODO: kill GetRateForDisc
DROP PROCEDURE IF EXISTS GetReports//
CREATE PROCEDURE `GetReports` (IN `pGroupID` INT)
NO SQL
BEGIN
SELECT students.ID AS 'StudentID',
students.LastName,
students.FirstName,
students.SecondName,
disciplines.ID,
GetRateForDisc(students.ID, disciplines.ID) AS 'Rate',
GetMaxRateForDisc(disciplines.ID) AS 'MaxRate'
FROM `students`
LEFT JOIN `disciplines` ON disciplines.ID IN
(
SELECT disciplines_groups.DisciplineID
FROM `disciplines_groups`
WHERE disciplines_groups.GroupID = pGroupID
UNION DISTINCT
SELECT disciplines_students.DisciplineID
FROM `disciplines_students`
INNER JOIN `students` ON disciplines_students.ID = students.ID
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
WHERE students_groups.GroupID = pGroupID
)
INNER JOIN `subjects` ON disciplines.SubjectID = subjects.ID
INNER JOIN `students_groups` ON students_groups.StudentID = students.ID AND
students_groups.SemesterID = @CurrentSemesterID
WHERE students_groups.GroupID = pGroupID;
END //
DROP PROCEDURE IF EXISTS GetFinalFormInfo//
CREATE PROCEDURE `GetFinalFormInfo`
(IN `pDisciplineID` INT, IN `pGroupID` INT)
CREATE PROCEDURE `GetFinalFormInfo` (
IN `pDisciplineID` INT,
IN `pGroupID` INT
)
NO SQL
BEGIN
SELECT study_groups.GroupNum AS 'GroupNum',
......@@ -1088,20 +1095,20 @@ BEGIN
INNER JOIN `teachers` ON teachers.ID = disciplines.AuthorID
INNER JOIN `departments` ON departments.ID = teachers.DepartmentID
INNER JOIN `job_positions` ON job_positions.ID = teachers.JobPositionID
INNER JOIN `semesters` ON semesters.ID = @CurrentSemesterID
INNER JOIN `semesters` ON disciplines.SemesterID
WHERE study_groups.ID = pGroupID
LIMIT 1;
END //
DROP PROCEDURE IF EXISTS GetSession //
CREATE PROCEDURE GetSession (IN pID INT(11), OUT pSessionID VARCHAR(40), OUT pUserLogin VARCHAR(50) CHARSET utf8, OUT pUserPassword VARCHAR(64))
NO SQL
NO SQL
BEGIN
SELECT SessionID, Login, Password
INTO pSessionID, pUserLogin, pUserPassword
FROM sessions
WHERE sessions.ID=pID;
SELECT SessionID, Login, Password
INTO pSessionID, pUserLogin, pUserPassword
FROM sessions
WHERE sessions.ID=pID;
END //
DELIMITER ;
\ No newline at end of file
~dev_rating/application/classes/Model/Discipline.php
+ 2
− 1
View file @ bbca21ca
......@@ -268,7 +268,8 @@ class Model_Discipline extends Model implements JsonSerializable, ArrayAccess
* @return Database_Result
*/
public static function setMilestoneForCredits($teacherID, $facultyID, $milestone) {
$sql = "SELECT `RestrictAfterMilestoneForCredits`('$teacherID', '$facultyID', '$milestone') AS 'Num'";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "SELECT `RestrictAfterMilestoneForCredits`('$teacherID', '$facultyID', '$milestone', $semesterID) AS 'Num'";
return DB::query(Database::SELECT, $sql)->execute();
}
......
~dev_rating/application/classes/Model/Faculty.php
+ 3
− 1
View file @ bbca21ca
......@@ -12,9 +12,11 @@ class Model_Faculty extends Model
/** @return Model_Discipline[] */
public function getDisciplines() {
$sql = "CALL `GetDisciplines`(:id)";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetDisciplines`(:id, :semesterID)";
$query = DB::query(Database::SELECT, $sql)
->param(':id', $this->id)
->param(':semesterID', $semesterID)
->execute();
$list = [];
......
~dev_rating/application/classes/Model/Group.php
+ 3
− 1
View file @ bbca21ca
......@@ -12,9 +12,11 @@ class Model_Group extends Model
/** @return Model_Discipline[] */
public function getDisciplines($lazy = true) {
$sql = "CALL `GetDisciplinesForGroup`(:id)";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetDisciplinesForGroup`(:id, :semesterID)";
$query = DB::query(Database::SELECT, $sql)
->param(':id', $this->id)
->param(':semesterID', $semesterID)
->execute();
$list = [];
......
~dev_rating/application/classes/Model/Rating.php
+ 4
− 2
View file @ bbca21ca
......@@ -3,7 +3,8 @@
class Model_Rating extends Model
{
public static function GetStudentsForRating($disciplineID) {
$sql = "CALL `GetStudentsForRating`('$disciplineID'); ";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetStudentsForRating`('$disciplineID', $semesterID); ";
return DB::query(Database::SELECT, $sql)->execute();
}
......@@ -50,7 +51,8 @@ class Model_Rating extends Model
public static function getAttestationData($disciplineID, $groupID)
{
$sql = "CALL `GetAttestationData`($disciplineID, $groupID)";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetAttestationData`($disciplineID, $groupID, $semesterID)";
return DB::query(Database::SELECT, $sql)->execute();
}
......
~dev_rating/application/classes/Model/Student.php
+ 10
− 3
View file @ bbca21ca
......@@ -12,9 +12,11 @@ class Model_Student extends Model
/** @return Model_Discipline[] */
public function getDisciplines() {
$sql = "CALL `GetDisciplinesForStudent`(:id);";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetDisciplinesForStudent`(:id, :semesterID);";
$query = DB::query(Database::SELECT, $sql)
->param(':id', $this->id)
->param(':semesterID', $semesterID)
->execute();
$list = [];
......@@ -95,10 +97,13 @@ class Model_Student extends Model
* @return $this;
*/
public function toAcademicLeave() {
$sql = "CALL `ControlStudentGroup`(:id, -1, true);";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `ControlStudentGroup`(:id, -1, true, :semesterID);";
DB::query(Database::SELECT, $sql)
->param(':id', $this->id)
->param(':semesterID', $semesterID)
->execute();
return $this;
......@@ -110,11 +115,13 @@ class Model_Student extends Model
* @return $this;
*/
public function returnFromAcademicLeave($group) {
$sql = "CALL `ControlStudentGroup`(:id, :group, false);";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `ControlStudentGroup`(:id, :group, false, :semesterID);";
DB::query(Database::SELECT, $sql)
->param(':id', $this->id)
->param(':group', (int) $group)
->param(':semesterID', $semesterID)
->execute();
return $this;
......
~dev_rating/application/classes/Model/Students.php
+ 8
− 4
View file @ bbca21ca
......@@ -3,7 +3,8 @@
class Model_Students extends Model
{
public static function ofDiscipline($id) {
$sql = "CALL `GetStudentsForDiscipline`('$id'); ";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetStudentsForDiscipline`('$id', $semesterID); ";
return DB::query(Database::SELECT, $sql)->execute();
}
......@@ -12,7 +13,8 @@ class Model_Students extends Model
* @return Database_Result
*/
public static function ofGroup($group) {
$sql = "CALL `GetStudents`('$group'); ";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetStudents`('$group', $semesterID); ";
return DB::query(Database::SELECT, $sql)->execute();
}
......@@ -27,14 +29,16 @@ class Model_Students extends Model
}
public static function byFaculty($facultyID, $gradeID, $groupID) {
$sql = "CALL `GetStudentsByFaculty`('$facultyID', '$gradeID', $groupID); ";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetStudentsByFaculty`('$facultyID', '$gradeID', $groupID, $semesterID); ";
$students = DB::query(Database::SELECT, $sql)->execute();
return self::collect($students);
}
public static function searchStudents($GradeID, $GroupID, $FacultyID, $Name, $DisciplineID) {
$Name = Database::instance()->escape($Name);
$sql = "CALL `SearchStudents`('$GradeID', '$GroupID', '$FacultyID', $Name, '$DisciplineID'); ";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `SearchStudents`('$GradeID', '$GroupID', '$FacultyID', $Name, '$DisciplineID', $semesterID); ";
return DB::query(Database::SELECT, $sql)->execute();
}
......
~dev_rating/application/classes/Model/Teacher.php
+ 3
− 1
View file @ bbca21ca
......@@ -16,8 +16,10 @@ class Model_Teacher extends Model
/** @return Model_Discipline[] */
public function getDisciplines() {
$sql = "CALL `GetDisciplinesForTeacher`(:id); ";
$semesterID = User::instance()->SemesterID;
$sql = "CALL `GetDisciplinesForTeacher`(:id, :semesterID); ";
$query = DB::query(Database::SELECT, $sql)
->param(':semesterID', $semesterID)
->param(':id', $this->ID)
->execute();
......
~dev_rating/modules/account/classes/Kohana/User.php
+ 1
− 4
View file @ bbca21ca
......@@ -82,10 +82,7 @@ class Kohana_User implements ArrayAccess
}
public function SetSemester($semesterID) {
$res = $this->_model->SetSemesterID($semesterID);
if ($res >= 0) {
$this->_session->set("SemesterID", "$semesterID");
}
$this->_session->set("SemesterID", "$semesterID");
}
......
~dev_rating/modules/account/classes/Model/Kohana/Account.php
+ 12
− 18
View file @ bbca21ca
......@@ -66,6 +66,10 @@ class Model_Kohana_Account extends Model
public function createTeacherByDepName($lastName, $firstName, $secondName, $departmentID, $facultyID, $activationCode)
{
if ($departmentID == '') {
return -1;
}
$db = Database::instance();
$lastName = $db->escape($lastName);
$secondName = $db->escape($secondName);
......@@ -115,7 +119,8 @@ class Model_Kohana_Account extends Model
public static function getPersonalInfo($id)
{
$sql = "CALL `GetPersonalInfo`('$id');";
$semesterID = User::instance()->offsetGet('SemesterID');
$sql = "CALL `GetPersonalInfo`('$id', $semesterID);";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query[0];
}
......@@ -130,7 +135,7 @@ class Model_Kohana_Account extends Model
public function changeMail($id, $mail)
{
$mail = Database::instance()->escape($mail);
$sql = "SELECT `ChangeMail`('$id', $mail) AS Num;";
$sql = "SELECT `ChangeAccountData`('$id', $mail, 'email') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num');
}
......@@ -138,7 +143,7 @@ class Model_Kohana_Account extends Model
public function changeLogin($id, $login)
{
$login = Database::instance()->escape($login);
$sql = "SELECT `ChangeLogin`('$id', $login) AS Num;";
$sql = "SELECT `ChangeAccountData`('$id', $login, 'login') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num');
}
......@@ -146,7 +151,7 @@ class Model_Kohana_Account extends Model
public function changePassword($id, $password)
{
$password = Database::instance()->escape($password);
$sql = "SELECT `ChangePassword`('$id', $password) AS Num;";
$sql = "SELECT `ChangeAccountData`('$id', $password, 'password') AS Num;";
$query = DB::query(Database::SELECT, $sql)->execute();
return $query->get('Num');
}
......@@ -154,7 +159,7 @@ class Model_Kohana_Account extends Model
public function getAccNumByLogin($login)
{
$login = Database::instance()->escape($login);
$sql = "SELECT `GetAccCountByLogin`($login) AS Num;";
$sql = "SELECT `CheckAccountExistence`($login, 'login') AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num');
}
......@@ -162,7 +167,7 @@ class Model_Kohana_Account extends Model
public function getAccNumByMail($email)
{
$email = Database::instance()->escape($email);
$sql = "SELECT `GetAccCountByMail`($email) AS Num;";
$sql = "SELECT `CheckAccountExistence`($email, 'email') AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
return $res->get('Num');
}
......@@ -170,7 +175,7 @@ class Model_Kohana_Account extends Model
public function isActivationCodeValid($code)
{
$code = Database::instance()->escape($code);
$sql = "SELECT `GetAccCountByCode`($code) AS Num;";
$sql = "SELECT `CheckAccountExistence`($code, 'code') AS Num;";
$res = DB::query(Database::SELECT, $sql)->execute();
$count = $res[0]['Num'];
......@@ -237,15 +242,4 @@ class Model_Kohana_Account extends Model
return $id;
}
public function SetSemesterID($semesterID)
{
$sql = "SELECT `SetSemesterID`('$semesterID') AS `Num`; ";
$res = DB::query(Database::SELECT, $sql)->execute();
$id = 0;
foreach ($res as $value) {
$id = $value['Num'];
}
return $id;
}
}
\ No newline at end of file
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