страница оценивание: у мигрантов кроме группы пишется курс

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

@@ -15,9 +15,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
         if($discipline->count() == 0)
             throw HTTP_Exception::factory (404, "Для дисциплины с ID $id не создана УКД или такой дисциплины не существует!");
         
-	$disciplineHandled = array();
+		$disciplineHandled = array();
         $maxRate = 0; $i = 0; $module = 0;
-        
+
         foreach($discipline as $row)
         {
             if($row['ModuleID'] != $module)
@@ -58,7 +58,14 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
 			$studentsHandled[$i]['FirstName'] = $row['FirstName'];
 			$studentsHandled[$i]['SecondName'] = $row['SecondName'];
 			$studentsHandled[$i]['Grade'] = $row['Grade'];
+			if ($row['Degree'] == 'bachelor')
+				$studentsHandled[$i]['GradeTitle'] = $row['Grade'].' курс';
+			if ($row['Degree'] == 'specialist')
+				$studentsHandled[$i]['GradeTitle'] = $row['Grade'].' курс';
+			if ($row['Grade'] == 'master')
+				$studentsHandled[$i]['GradeTitle'] = 'Магистратура, '.$row['Grade'].' год';
 			$studentsHandled[$i]['GroupNum'] = $row['GroupNum'];
+			$studentsHandled[$i]['isAttached'] = $row['isAttached'];
 			$rate = $db->getMapForStudent($row['StudentID'], $id);
 			$j = 0;
 			foreach($rate as $r) {

~dev_rating/application/views/teacher/setRate.twig

@@ -90,7 +90,7 @@
 			{% if student.GroupNum != GroupNum %}	
 				{% set GroupNum = student.GroupNum %}
 				<tr>
-					<td class="group" colspan="{{ CellCount + 2 }}">{{ student.GroupNum }} группа</td>
+					<td class="group" colspan="{{ CellCount + 2 }}">{% if student.isAttached == 1 %} {{ student.GradeTitle }}, {% endif %}{{ student.GroupNum }} группа</td>
 				</tr>
 			{% endif %}
 			<tr>