FIX: phrases and rates in final form

db/StoredProcedures.sql

@@ -770,8 +770,8 @@ BEGIN
       LEFT JOIN `view_roadmap` ON view_roadmap.DisciplineID = view_disciplines_students.DisciplineID
       LEFT JOIN `rating_table` ON rating_table.StudentID = view_disciplines_students.StudentID AND
                                   rating_table.SubmoduleID = view_roadmap.SubmoduleID
-      LEFT JOIN `exam_period_options` ON exam_period_options.submoduleID = rating_table.SubmoduleID AND
-                                         exam_period_options.StudentID = rating_table.StudentID
+      LEFT JOIN `exam_period_options` ON exam_period_options.submoduleID = view_roadmap.SubmoduleID AND
+                                         exam_period_options.StudentID = view_disciplines_students.StudentID
     WHERE   view_disciplines_students.DisciplineID = pDisciplineID AND
             view_disciplines_students.GroupID = pGroupID AND
             NOT view_disciplines_students.AttachType <=> 'detach' AND

~dev_rating/application/classes/Controller/Handler/FileCreator.php

@@ -685,12 +685,12 @@ class Controller_Handler_FileCreator extends Controller_Handler
     {
         // особые случаи: неявка и автомат
         if ($option == 'absence')
-            return array('', 'неявка', '');
+            return array('', 'н/я', '');
         if ($option == 'pass') {
             if ($examAdmission == 60)
                 return array($totalRateValue, 'удовл', '0');
             else
-                return array('', 'неверное число баллов в семестре', '');
+                return array('', 'автомат не допустим', '');
         }
 
         // стандартная ситуация с оцениванием