From d6e4dd8b2a20f3fd4867e7c5e137be5dd3fb4ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com>
Date: Sat, 23 Aug 2014 14:29:45 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2,=20vo?=
=?UTF-8?q?l.=203:=20=D0=BF=D1=80=D0=B5=D0=B4=D1=80=D0=B5=D0=BB=D0=B8?=
=?UTF-8?q?=D0=B7=D0=BD=D1=8B=D0=B5=20=D0=B8=D0=BD=D1=82=D1=80=D0=B8=D0=B3?=
=?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../application/classes/Controller/Teacher/Index.php | 4 ++--
.../classes/Controller/Teacher/Rating.php | 12 ++++++------
~dev_rating/application/views/base.twig | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/~dev_rating/application/classes/Controller/Teacher/Index.php b/~dev_rating/application/classes/Controller/Teacher/Index.php
index 26eab296e..cd4617070 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Index.php
+++ b/~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;
diff --git a/~dev_rating/application/classes/Controller/Teacher/Rating.php b/~dev_rating/application/classes/Controller/Teacher/Rating.php
index 1611f1076..a30d7ea2a 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Rating.php
+++ b/~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);
diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig
index 5991fbb6e..d59b2352c 100644
--- a/~dev_rating/application/views/base.twig
+++ b/~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>
--
GitLab