fix: sort and seek

db/StoredProcedures.sql

@@ -2080,7 +2080,7 @@ BEGIN
 				modules.Name 			AS 'ModuleName', 
 				modules.Type  			AS 'ModuleType',
 				submodules.ID 			AS 'SubmoduleID', 
-				submodules.Name 		AS 'SubModuleName', 
+				submodules.Name 		AS 'SubModuleName',  
 				submodules.Description 	AS 'SubmoduleDescription', 
 				submodules.MaxRate,
 				submodules.Type 		AS 'SubmoduleControl'
@@ -2090,8 +2090,10 @@ BEGIN
 		INNER JOIN `subjects` 	ON disciplines.SubjectID = subjects.ID
 		WHERE 	modules.DisciplineID = DisciplineID AND
 				(modules.Type != 2 OR submodules.OrderNum = 1)
-		ORDER BY modules.OrderNum ASC, 
-				 submodules.OrderNum ASC;
+		ORDER BY 	modules.Type ^ 1 ASC,
+					-- 1, 3, 2, 4 ASC
+					modules.OrderNum ASC, 
+					submodules.OrderNum ASC;
  	END IF;
 END //
 

~dev_rating/application/classes/Controller/Teacher/Rating.php

@@ -121,9 +121,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
                 $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['Rate'] = $r['Rate'];
                 $rateHandled[$i_g]['Students'][$i_s]['RateResult'] += $r['Rate'];
 
-                if ($r['ModuleType'] == 'exam' || $r['ModuleType'] == 'extra')
+                /* if ($r['ModuleType'] == 'exam' || $r['ModuleType'] == 'extra')
                     $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['SubmoduleID'] = -1;
-                else
+                else */
                     $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['SubmoduleID'] = $r['SubmoduleID'];
             }
         }

~dev_rating/media/css/rating.css

@@ -172,7 +172,7 @@ div#tdInfo_wrap {
 
 /* todo */
 .downloadExcelStatement {
-	color: #0183ce;
+	color: #CE0101;
 	font-weight: bold;
 }