Skip to content
Snippets Groups Projects
Commit 21af4296 authored by PavelBegunkov's avatar PavelBegunkov
Browse files

fix #6

parent c2995738
Branches
Tags
No related merge requests found
...@@ -963,11 +963,12 @@ BEGIN ...@@ -963,11 +963,12 @@ BEGIN
study_groups.Grade AS 'StudyGroupGrade', study_groups.Grade AS 'StudyGroupGrade',
study_groups.Name AS 'StudyGroupName' study_groups.Name AS 'StudyGroupName'
FROM `disciplines_groups` 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 INNER JOIN `disciplines_teachers` ON disciplines.ID = disciplines_teachers.DisciplineID AND
disciplines_teachers.TeacherID = TeacherID disciplines_teachers.TeacherID = TeacherID
INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID 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 WHERE disciplines.SemesterID = semID
ORDER BY disciplines.Grade ASC, ORDER BY disciplines.Grade ASC,
subjects.Name ASC, subjects.Name ASC,
...@@ -977,8 +978,6 @@ END // ...@@ -977,8 +978,6 @@ END //
DROP PROCEDURE IF EXISTS GetStudentsForDiscipline// DROP PROCEDURE IF EXISTS GetStudentsForDiscipline//
CREATE PROCEDURE `GetStudentsForDiscipline` ( IN `TeacherID` INT, CREATE PROCEDURE `GetStudentsForDiscipline` ( IN `TeacherID` INT,
IN `DisciplineID` INT IN `DisciplineID` INT
......
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