REF: comments + optimizations

db/StoredProcedures.sql

@@ -9,6 +9,10 @@ DROP PROCEDURE IF EXISTS GetStudyGroupsForDisciplineFull//
 DROP PROCEDURE IF EXISTS GetStudyGroupsForDiscipline//
 DROP PROCEDURE IF EXISTS GetStudyGroups//
 
+DROP PROCEDURE IF EXISTS GetDisciplineInfoByID//
+DROP PROCEDURE IF EXISTS GetMapForDisciplineExam//
+DROP PROCEDURE IF EXISTS GetMapForDiscipline//
+
 # -------------------------------------------------------------------------------------------
 # Label: abbreviations
 # -------------------------------------------------------------------------------------------
@@ -628,10 +632,12 @@ BEGIN
 END //
 
 
-
-
+DROP PROCEDURE IF EXISTS GetMapForStudent//
+DROP PROCEDURE IF EXISTS GetMapForStudentExam//
 DROP PROCEDURE IF EXISTS GetRatesForStudentsGroup//
-CREATE PROCEDURE `GetRatesForStudentsGroup`
+
+DROP PROCEDURE IF EXISTS GetRatesForGroup//
+CREATE PROCEDURE `GetRatesForGroup`
     (   IN `pDisciplineID` INT, IN `pGroupID` INT)
     NO SQL
 BEGIN
@@ -666,9 +672,8 @@ END //
 
 
 
-# TODO: rename GetRatesForStudent
-DROP PROCEDURE IF EXISTS GetMapForStudent//
-CREATE PROCEDURE `GetMapForStudent`
+DROP PROCEDURE IF EXISTS GetRates//
+CREATE PROCEDURE `GetRates`
     (   IN `pStudentID` INT, IN `pDisciplineID` INT)
     NO SQL
 BEGIN
@@ -704,8 +709,8 @@ END //
 
 
 # TODO: rename ~ GetRatesForStudent, Rating
-DROP PROCEDURE IF EXISTS GetMapForStudentExam//
-CREATE PROCEDURE `GetMapForStudentExam`
+DROP PROCEDURE IF EXISTS GetRatesExam//
+CREATE PROCEDURE `GetRatesExam`
     (	IN `pStudentID` INT, IN `pDisciplineID` INT)
     NO SQL
 BEGIN
@@ -727,11 +732,10 @@ BEGIN
 END //
 
 
-# TODO: rename GetRoadMap
 # TODO: order hardcode
 # get roadmap of discipline
-DROP PROCEDURE IF EXISTS GetMapForDiscipline//
-CREATE PROCEDURE `GetMapForDiscipline`
+DROP PROCEDURE IF EXISTS GetRoadmap//
+CREATE PROCEDURE `GetRoadmap`
     (   IN `pDisciplineID`   INT)
     NO SQL
 BEGIN
@@ -755,10 +759,9 @@ BEGIN
 END //
 
 
-# TODO: rename GetRoadMap
 # get roadmap of discipline exam
-DROP PROCEDURE IF EXISTS GetMapForDisciplineExam//
-CREATE PROCEDURE `GetMapForDisciplineExam`
+DROP PROCEDURE IF EXISTS GetRoadmapExam//
+CREATE PROCEDURE `GetRoadmapExam`
     (   IN `pDisciplineID` INT)
     NO SQL
 BEGIN
@@ -781,9 +784,8 @@ BEGIN
 END //
 
 
-# TODO: rename GetDisciplineInfo
-DROP PROCEDURE IF EXISTS GetDisciplineInfoByID//
-CREATE PROCEDURE `GetDisciplineInfoByID`
+DROP PROCEDURE IF EXISTS GetDisciplineInfo//
+CREATE PROCEDURE `GetDisciplineInfo`
     (   IN `pDisciplineID` INT)
     NO SQL
 BEGIN

db/Views.sql

@@ -147,11 +147,10 @@ CREATE OR REPLACE VIEW `view_rating_result` AS
                  (rating_table.Rate IS NULL) ASC,
                  view_roadmap.SubmoduleOrderNum DESC
              LIMIT 1
-            ) AS 'RateExam',
-            (RateRegular + RateExtra + RateExam + RateBonus) AS 'RateResult'
+            ) AS 'RateExam'
         FROM `rating_table`
         LEFT JOIN `view_roadmap` ON view_roadmap.SubmoduleID = rating_table.SubmoduleID
-        GROUP BY view_rating.StudentID, view_rating.DisciplineID;
+        GROUP BY rating_table.StudentID, view_roadmap.DisciplineID;
 
 
 

db/fix.sql

@@ -35,5 +35,9 @@ UPDATE `general_settings` SET general_settings.Name = 'SemesterID' WHERE general
 UPDATE `general_settings` SET general_settings.Name = 'HashKey' WHERE general_settings.ID = 2;
 ALTER TABLE  `general_settings` ADD UNIQUE (`Name`);
 
+# just for fun :/
+UPDATE `modules`
+SET modules.OrderNum = 3141592
+WHERE modules.OrderNum = 3141692;
 
 

~dev_rating/application/classes/Model/Student.php

@@ -10,13 +10,13 @@ class Model_Student extends Model
     
     public function getDisciplineMap($student_id, $subject_id)
     {
-        $sql = "CALL `GetMapForStudent`('$student_id', '$subject_id'); ";
+        $sql = "CALL `GetRates`('$student_id', '$subject_id'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
     
     public function getDisciplineInfoByID($discipline_id)
     {
-        $sql = "CALL `GetDisciplineInfoByID`('$discipline_id'); ";
+        $sql = "CALL `GetDisciplineInfo`('$discipline_id'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
     

~dev_rating/application/classes/Model/Teacher/Map.php

@@ -93,13 +93,13 @@ class Model_Teacher_Map extends Model
 	
     public function getDisciplineInfoByID($discipline_id)
     {
-        $sql = "CALL `GetDisciplineInfoByID`('$discipline_id'); ";
+        $sql = "CALL `GetDisciplineInfo`('$discipline_id'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
     public function getMapForDiscipline($disciplineID)
     {
-        $sql = "CALL `GetMapForDiscipline`('$disciplineID'); ";
+        $sql = "CALL `GetRoadmap`('$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 	

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

@@ -16,25 +16,25 @@ class Model_Teacher_Rating extends Model
     
     public function getMapForDiscipline($disciplineID)
     {
-        $sql = "CALL `GetMapForDiscipline`('$disciplineID'); ";
+        $sql = "CALL `GetRoadmap`('$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
     
     public function getMapForStudent($studentID, $disciplineID)
     {
-        $sql = "CALL `GetMapForStudent`('$studentID', '$disciplineID'); ";
+        $sql = "CALL `GetRates`('$studentID', '$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
     public function getMapForStudentExam($studentID, $disciplineID)
     {
-        $sql = "CALL `GetMapForStudentExam`('$studentID', '$disciplineID'); ";
+        $sql = "CALL `GetRatesExam`('$studentID', '$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
     public function GetMapForDisciplineExam($disciplineID)
     {
-        $sql = "CALL `GetMapForDisciplineExam`('$disciplineID'); ";
+        $sql = "CALL `GetRoadmapExam`('$disciplineID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
     
@@ -52,7 +52,7 @@ class Model_Teacher_Rating extends Model
 
     public function getRatesForStudentsGroup($disciplineID, $groupID)
     {
-        $sql = "CALL `getRatesForStudentsGroup`('$disciplineID', '$groupID')";
+        $sql = "CALL `GetRatesForGroup`('$disciplineID', '$groupID')";
         return DB::query(Database::SELECT, $sql)->execute();
     }