diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index e7e3778f8d92a1c51874131e140280da90aa53bb..f022863de84ce32aabc49d1a24f53a2e5cae6a52 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -963,11 +963,12 @@ BEGIN study_groups.Grade AS 'StudyGroupGrade', study_groups.Name AS 'StudyGroupName' FROM `disciplines_groups` - INNER JOIN `disciplines` ON disciplines_groups.DisciplineID = disciplines.ID + RIGHT JOIN `disciplines` ON disciplines_groups.DisciplineID = disciplines.ID OR + disciplines_groups.DisciplineID IS NULL INNER JOIN `disciplines_teachers` ON disciplines.ID = disciplines_teachers.DisciplineID AND disciplines_teachers.TeacherID = TeacherID INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID - INNER JOIN `study_groups` ON study_groups.ID = disciplines_groups.StudyGroupID + LEFT JOIN `study_groups` ON study_groups.ID = disciplines_groups.StudyGroupID WHERE disciplines.SemesterID = semID ORDER BY disciplines.Grade ASC, subjects.Name ASC, @@ -977,8 +978,6 @@ END // - - DROP PROCEDURE IF EXISTS GetStudentsForDiscipline// CREATE PROCEDURE `GetStudentsForDiscipline` ( IN `TeacherID` INT, IN `DisciplineID` INT