diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 3bb192650ba7a044f610d190c8e9d20c083c21b9..19a9e6449e0cc52cb5860f67142819b73fffe25a 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -981,9 +981,7 @@ END // DROP PROCEDURE IF EXISTS GetDisciplineInfoByID// -CREATE PROCEDURE `GetDisciplineInfoByID`( IN `DiscID` INT, - IN `DepID` INT, - IN `FacultyID` INT ) +CREATE PROCEDURE `GetDisciplineInfoByID`( IN `DiscID` INT ) NO SQL BEGIN @@ -995,15 +993,14 @@ BEGIN disciplines.SemesterID, subjects.ID AS 'SubjectID', subjects.Name AS 'SubjectName', - subjects.Abbr AS 'SubjectAbbr' - - + subjects.Abbr AS 'SubjectAbbr', + departments.ID AS 'DepID', + departments.Name AS 'DepName', + departments.FacultyID AS 'FacultyID' FROM `disciplines` INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID INNER JOIN `departments` ON departments.ID = disciplines.DepartmentID - WHERE ( DiscID = 0 OR disciplines.ID = DiscID) AND - ( DepartmentID = 0 OR disciplines.DepartmentID = DepartmentID ) AND - ( FacultyID = 0 OR departments.FacultyID = FacultyID); + WHERE disciplines.ID = DiscID; END //