diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 6c2aa2b398e25e7a5ec673f091031c025bc9b664..d35790833c2bea4ff92c8db3c3ee9f11182d5167 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -4023,8 +4023,8 @@ END // -DROP PROCEDURE IF EXISTS GetRatesForStudentGroups// -CREATE PROCEDURE `GetRatesForStudentGroups` ( IN `TeacherID` INT, +DROP PROCEDURE IF EXISTS GetRatesForStudentsGroup// +CREATE PROCEDURE `GetRatesForStudentsGroup` ( IN `TeacherID` INT, IN `DisciplineID` INT, IN `StudyGroupID` INT ) @@ -4074,6 +4074,7 @@ BEGIN specializations.ID AS 'SpecID', specializations.Name AS 'SpecName', specializations.Abbr AS 'SpecAbbr', + specializations.Code AS 'SpecCode', faculties.ID AS 'FacultyID', faculties.Name AS 'FacultyName', faculties.Abbr AS 'FacultyAbbr', @@ -4082,9 +4083,9 @@ BEGIN subjects.Name AS 'SubjectName', subjects.Abbr AS 'SubjectAbbr', teachers.ID AS 'AuthorID', - teachers.LastName AS 'Last', - teachers.FirstName AS 'First', - teachers.SecondName AS 'Second', + teachers.LastName AS 'LastName', + teachers.FirstName AS 'FirstName', + teachers.SecondName AS 'SecondName', job_positions.Name AS 'JobPosition', departments.ID AS 'DepID', departments.Name AS 'DepName', diff --git a/db/Structure.sql b/db/Structure.sql index 87217dbca28e1f0831f6e9372e8fb6de06496130..91cd7209e4121d8a5f300e5074c2301f0dce3024 100644 --- a/db/Structure.sql +++ b/db/Structure.sql @@ -344,6 +344,7 @@ CREATE TABLE IF NOT EXISTS `specializations` ( `ID` int(11) NOT NULL AUTO_INCREMENT, `Name` varchar(50) NULL, `Abbr` varchar(20) NULL, + `Code` varchar(12) NULL, `FacultyID` int(11) NOT NULL, PRIMARY KEY (`ID`), UNIQUE KEY `Name` (`Name`,`FacultyID`), diff --git a/db/fix.sql b/db/fix.sql index 776e92145cbea33e62596615762eef7c00be6fc8..72a4e56bff7796c0aaf96b898ad3b6f93d215f67 100644 --- a/db/fix.sql +++ b/db/fix.sql @@ -175,6 +175,7 @@ FROM `disciplines`// INSERT INTO `rating`.`page_access` (`ID`, `Pagename`, `Bitmask`) VALUES (NULL, 'teacher:exam', '6'); +ALTER TABLE `specializations` ADD `Code` varchar(12) NULL; DROP FUNCTION IF EXISTS AddSubmodule//