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

FIX: stupid phpMyAdmin :/

parent a9011fe7
Branches
Tags
No related merge requests found
......@@ -770,22 +770,22 @@ CREATE PROCEDURE `GetRoadmapExam`
( IN `pDisciplineID` INT)
NO SQL
BEGIN
SELECT view_disciplines.SubjectID,
view_disciplines.SubjectName,
view_roadmap.ModuleID,
view_roadmap.ModuleName,
view_roadmap.ModuleType,
view_roadmap.SubmoduleID,
view_roadmap.SubmoduleName,
view_roadmap.SubmoduleRate AS 'MaxRate',
view_roadmap.SubmoduleType
FROM `view_roadmap`
INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = pDisciplineID
WHERE view_roadmap.DisciplineID = pDisciplineID AND
(view_roadmap.ModuleType = 'exam' OR view_roadmap.ModuleType = 'extra')
ORDER BY InternalOrderModuleTypesForSession(view_roadmap.ModuleType) ASC,
view_roadmap.ModuleOrderNum ASC,
view_roadmap.SubmoduleOrderNum ASC;
SELECT view_disciplines.SubjectID,
view_disciplines.SubjectName,
view_roadmap.ModuleID,
view_roadmap.ModuleName,
view_roadmap.ModuleType,
view_roadmap.SubmoduleID,
view_roadmap.SubmoduleName,
view_roadmap.SubmoduleRate AS 'MaxRate',
view_roadmap.SubmoduleType
FROM `view_roadmap`
INNER JOIN `view_disciplines` ON view_disciplines.DisciplineID = pDisciplineID
WHERE view_roadmap.DisciplineID = pDisciplineID AND
(view_roadmap.ModuleType = 'exam' OR view_roadmap.ModuleType = 'extra')
ORDER BY InternalOrderModuleTypesForSession(view_roadmap.ModuleType) ASC,
view_roadmap.ModuleOrderNum ASC,
view_roadmap.SubmoduleOrderNum ASC;
END //
......@@ -819,15 +819,11 @@ BEGIN
END //
# -------------------------------------------------------------------------------------------
# Label: requests
# -------------------------------------------------------------------------------------------
# DROP PROCEDURE IF EXISTS GetRequests//
# DROP PROCEDURE IF EXISTS GetRequests
# CREATE PROCEDURE `GetRequests` ( IN `AccountID` INT,
# IN `Type` INT # 0 to me, 1 - from me, 3 - all
# )
......@@ -848,7 +844,7 @@ END //
# WHERE ((Type & 1) != 0 AND requests.To = AccountID) OR
# ((Type & 2) != 0 AND requests.From = AccountID)
# ORDER BY requests.To = AccountID DESC, requests.Type ASC, requests.ID ASC;
# END//
# END
......
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