Skip to content
Snippets Groups Projects
Commit 04c87eec authored by PavelBegunkov's avatar PavelBegunkov
Browse files

reorder students

parent 14b5cd1c
Branches
Tags
No related merge requests found
...@@ -942,6 +942,8 @@ BEGIN ...@@ -942,6 +942,8 @@ BEGIN
LIMIT 1; LIMIT 1;
SET semID = GetCurSemesterID(); SET semID = GetCurSemesterID();
-- TODO: проверка на привязку студента
SELECT modules.ID AS 'ModuleID', SELECT modules.ID AS 'ModuleID',
modules.Name AS 'ModuleName', modules.Name AS 'ModuleName',
submodules.ID AS 'SubmoduleID', submodules.ID AS 'SubmoduleID',
...@@ -1247,7 +1249,7 @@ BEGIN ...@@ -1247,7 +1249,7 @@ BEGIN
students.ID = disciplines_students.StudentID students.ID = disciplines_students.StudentID
WHERE disciplines_groups.StudyGroupID IS NOT NULL OR WHERE disciplines_groups.StudyGroupID IS NOT NULL OR
disciplines_students.StudentID IS NOT NULL disciplines_students.StudentID IS NOT NULL
ORDER BY study_groups.Grade ASC, study_groups.GroupNum; ORDER BY study_groups.Grade ASC, study_groups.GroupNum ASC, students.LastName ASC, students.FirstName ASC, students.SecondName ASC;
ELSE ELSE
SELECT NULL AS 'StudentID', SELECT NULL AS 'StudentID',
...@@ -1585,7 +1587,7 @@ BEGIN ...@@ -1585,7 +1587,7 @@ BEGIN
( ( disciplines_students.Type IS NULL OR disciplines_students.Type != 'detach' ) AND ( ( disciplines_students.Type IS NULL OR disciplines_students.Type != 'detach' ) AND
disciplines_groups.StudyGroupID IS NOT NULL disciplines_groups.StudyGroupID IS NOT NULL
) )
ORDER BY study_groups.Grade ASC, study_groups.GroupNum ASC; ORDER BY study_groups.Grade ASC, study_groups.GroupNum ASC, students.LastName ASC, students.FirstName ASC, students.SecondName ASC;
ELSE ELSE
SELECT NULL AS 'StudentID', SELECT NULL AS 'StudentID',
NULL AS 'LastName', NULL AS 'LastName',
...@@ -1813,6 +1815,7 @@ BEGIN ...@@ -1813,6 +1815,7 @@ BEGIN
disciplines.SubjectID = SubjectID disciplines.SubjectID = SubjectID
WHERE disciplines.ID = DisciplineID; WHERE disciplines.ID = DisciplineID;
-- TODO: добавить проверки на изменение
IF ExamType = 'exam' THEN IF ExamType = 'exam' THEN
SET checker = AddModuleExam(TeacherID, DisciplineID); SET checker = AddModuleExam(TeacherID, DisciplineID);
ELSE ELSE
......
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