Merge branch 'develop'

db/StoredProcedures.sql

@@ -4128,7 +4128,8 @@ BEGIN
 	-- 						(modules.Type = 'exam' OR modules.Type = 'extra')	
 	-- LEFT JOIN `submodules` ON 	submodules.ModuleID = modules.ID
 	WHERE 	study_groups.ID = StudyGroupID AND 
-			InternalIsStudentAttached(students.ID, DisciplineID);
+			InternalIsStudentAttached(students.ID, DisciplineID)
+	ORDER BY Last ASC;
 
 END //
 

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

@@ -233,8 +233,14 @@ class Controller_Handler_FileCreator extends Controller_Handler
         $sheet->setCellValue($range, "Специальность: ".$data['SpecName']." ".$data['SpecCode']);
         $range = $objPHPExcel->getNamedRange("Teacher")->getRange();
         $sheet->setCellValue($range, $data['LastName']." ".$data['FirstName']." ".$data['SecondName']);
+		
         $range = $objPHPExcel->getNamedRange("Grade")->getRange();
-        $sheet->setCellValue($range, $data['GradeNum']);
+		$degree = $data['Degree'];
+		$gradeName = $data['GradeNum'];
+		if ($degree == 'master')
+			$gradeName = $gradeName."м";
+        $sheet->setCellValue($range, $gradeName);
+		
         $range = $objPHPExcel->getNamedRange("Semester")->getRange();
         $sheet->setCellValue($range, $data['SemesterNum']);
         $range = $objPHPExcel->getNamedRange("Year")->getRange();
@@ -276,12 +282,15 @@ class Controller_Handler_FileCreator extends Controller_Handler
             $fullName = $lastName." ".$firstName." ".$secondName;
             $totalRate = $rate + $bonus;
 			
+			if ($totalRate > 100)
+				$totalRate = 100;
+
             if($totalRate < 60) {
                     $tempRate = " ";
                     $tempStr = "не зачтено";
             } else {
+                    $tempRate = $totalRate;			
                     $tempStr = "зачтено";
-                    $tempRate = $totalRate;
             }
 			
             $sheet  ->setCellValue($indPosition.$row, $index)

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

@@ -81,7 +81,7 @@
 					<span class="downloadExcelStatement" id="group_{{ group.GroupID }}">Скачать ведомость</span>
 				</td>
 			</tr>
-
+{# 
 			{% for student in group.Students %}
 				{% set row = row + 1 %}
 				{% set col = 0 %}
@@ -114,7 +114,7 @@
 					<td class="rateResultCell staticCell">{{ student.RateResult }}</td>
 				</tr>
 			{% endfor %} 
-
+ #}
 
 		{% endfor %}
 	</table>