From 5c3820d9733daf0e077664c63cd63e9d73d43709 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Sun, 31 Aug 2014 17:17:08 +0400
Subject: [PATCH] fix
---
db/StoredProcedures.sql | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 22faf6f24..478b47f0a 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -1130,7 +1130,7 @@ CREATE PROCEDURE `GetDisciplineInfoByID`( IN `DiscID` INT )
BEGIN
-- TODO: Inline InternalCheckRate
SELECT disciplines.AuthorID,
- disciplines.GradeID AS 'DisciplineGradeID',
+ disciplines.GradeID AS 'GradeID',
grades.Grade AS 'DisciplineGrade',
grades.Degree AS 'DisciplineDegree',
disciplines.ExamType,
@@ -1212,7 +1212,7 @@ BEGIN
SELECT DISTINCT disciplines.ID AS 'DisciplineID',
disciplines.ExamType AS 'DisciplineType',
- disciplines.GradeID AS 'DisciplineGradeID',
+ disciplines.GradeID AS 'GradeID',
grades.Grade AS 'DisciplineGrade',
grades.Degree AS 'DisciplineDegree',
subjects.ID AS 'SubjectID',
@@ -1220,9 +1220,6 @@ BEGIN
disciplines_teachers.ID AS 'DisciplineTeacherID',
study_groups.ID AS 'StudyGroupID',
study_groups.GroupNum AS 'StudyGroupNum',
- grades2.ID AS 'StudyGroupGradeID',
- grades2.Grade AS 'StudyGroupGrade',
- grades2.Degree AS 'StudyGroupDegree',
study_groups.Name AS 'StudyGroupName',
(TeacherID = disciplines.AuthorID) AS 'isAuthor',
(modules.ID IS NOT NULL) AS 'isMapCreated'
@@ -1236,7 +1233,6 @@ BEGIN
INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID
LEFT JOIN `study_groups` ON study_groups.ID = disciplines_groups.StudyGroupID
LEFT JOIN `modules` ON disciplines.ID = modules.DisciplineID
- LEFT JOIN `grades` grades2 ON grades2.ID = study_groups.GradeID
WHERE disciplines.SemesterID = semID
ORDER BY grades.ID ASC,
subjects.Name ASC,
--
GitLab