diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 2719793922327d3fb0b91b5467faf81a3e2b9083..a98490454a340e2d4b56368b8692ef5bb64a1bb7 100644 --- a/db/StoredProcedures.sql +++ b/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 // diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php index e0eb20381e10e5a74f31d0f973dd69c23c18e172..95e27fc28d5ee455782a43d295a876aa41ebe019 100644 --- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php +++ b/~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)