FIX: GetRatesForGroupByStage

db/StoredProcedures.sql

@@ -747,15 +747,15 @@ BEGIN
 END //
 
 
-DROP PROCEDURE IF EXISTS GetRatesForGroup2//
-CREATE PROCEDURE `GetRatesForGroup2`
+DROP PROCEDURE IF EXISTS GetRatesForGroupByStage//
+CREATE PROCEDURE `GetRatesForGroupByStage`
     ( IN `pDisciplineID` INT, IN `pGroupID` INT, IN `pMilestone` INT)
     NO SQL
 BEGIN
     SELECT  view_disciplines_students.StudentID,
-        view_disciplines_students.LastName,
-        view_disciplines_students.FirstName,
-        view_disciplines_students.SecondName,
+        view_disciplines_students.LastName As LastName,
+        view_disciplines_students.FirstName As FirstName,
+        view_disciplines_students.SecondName As SecondName,
         SUM(rating_table.Rate*(view_roadmap.ModuleType = 'regular')) AS 'intermediate',
         SUM(rating_table.Rate*(view_roadmap.ModuleType = 'bonus')) AS 'bonus',
         SUM(rating_table.Rate*(view_roadmap.ModuleType = 'extra')) AS 'extra',
@@ -770,12 +770,12 @@ BEGIN
         LEFT JOIN `rating_table` ON rating_table.StudentID = view_disciplines_students.StudentID AND
                                     rating_table.SubmoduleID = view_roadmap.SubmoduleID
     WHERE   view_disciplines_students.DisciplineID = pDisciplineID AND
-            view_disciplines_students.SemesterID = @CurrentSemesterID AND
             view_disciplines_students.GroupID = pGroupID AND
             NOT view_disciplines_students.AttachType <=> 'detach' AND
             ( (view_roadmap.ModuleType != 'exam' AND view_roadmap.ModuleType != 'extra')
               OR view_roadmap.SubmoduleOrderNum < pMilestone )
-    GROUP BY view_disciplines_students.StudentID;
+    GROUP BY view_disciplines_students.StudentID
+    ORDER BY LastName ASC, FirstName ASC, SecondName ASC;
 END //