Исправление багов, vol. 3: предрелизные интриги

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

@@ -65,10 +65,10 @@ class Controller_Teacher_Index extends Controller_UserEnvi {
         foreach ($teachers as $teacher)
         {
             $i++;
-            $teachersHandled[$i] = $teacher['LastName'].' '.UTF8::substr($teacher['FirstName'], 0, 1).'. ';
+            $teachersHandled[$i] = $teacher['TeacherLast'].' '.UTF8::substr($teacher['TeacherFirst'], 0, 1).'. ';
             if(!empty($teacher['TeacherSecond']))
             {
-                $teachersHandled[$i] .= UTF8::substr($teacher['SecondName'], 0, 1).'.';
+                $teachersHandled[$i] .= UTF8::substr($teacher['TeacherSecond'], 0, 1).'.';
             }
         }
         return $teachersHandled;

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

@@ -56,9 +56,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
 				// Не Мигранты
                 $i++;
                 $studentsHandled[$i]['StudentID'] = $row['StudentID'];
-                $studentsHandled[$i]['LastName'] = $row['LastName'];
-                $studentsHandled[$i]['FirstName'] = $row['FirstName'];
-                $studentsHandled[$i]['SecondName'] = $row['SecondName'];
+                $studentsHandled[$i]['LastName'] = $row['StudentLast'];
+                $studentsHandled[$i]['FirstName'] = $row['StudentFirst'];
+                $studentsHandled[$i]['SecondName'] = $row['StudentSecond'];
 				$studentsHandled[$i]['Grade'] = $row['Grade'];
 				$studentsHandled[$i]['GroupNum'] = $row['GroupNum'];
                 $rate = $db->getMapForStudent($row['StudentID'], $id);
@@ -75,9 +75,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
 				$MigrantsCount++;
 				$MigrantsHandled[$MigrantsCount]['StudentID'] = $row['StudentID'];
                 $MigrantsHandled[$MigrantsCount]['StudentID'] = $row['StudentID'];
-                $MigrantsHandled[$MigrantsCount]['LastName'] = $row['LastName'];
-				$MigrantsHandled[$MigrantsCount]['FirstName'] = $row['FirstName'];
-				$MigrantsHandled[$MigrantsCount]['SecondName'] = $row['SecondName'];
+                $MigrantsHandled[$MigrantsCount]['LastName'] = $row['StudentLast'];
+				$MigrantsHandled[$MigrantsCount]['FirstName'] = $row['StudentFirst'];
+				$MigrantsHandled[$MigrantsCount]['SecondName'] = $row['StudentSecond'];
 				$MigrantsHandled[$MigrantsCount]['Grade'] = $row['Grade'];
 				$MigrantsHandled[$MigrantsCount]['GroupNum'] = $row['GroupNum'];
 				$rate = $db->getMapForStudent($row['StudentID'], $id);

~dev_rating/application/views/base.twig

@@ -19,7 +19,7 @@
 				{{ User.FacultyName }}
 			</div>
 			<div class="top_user">
-				{{ User.FirstName }} {{ User.LastName }}
+				{{ User.First }} {{ User.Last }} | 
 				{{ HTML.anchor('settings', 'Настройки', {'title': 'Настройки аккаунта'})|raw }}
 				{{ HTML.anchor('sign/out', 'Выход', {'title': 'Выход из системы'})|raw }}
 			</div>