diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql index 36be3d66daf1139446d3d1754cabfddf458658bd..48fa18f0ac0155cd24f2c6fbe5e34e866dbca05b 100644 --- a/db/StoredProcedures.sql +++ b/db/StoredProcedures.sql @@ -722,7 +722,8 @@ BEGIN EXISTS(SELECT * FROM `disciplines_students` WHERE disciplines_students.DisciplineID = pDisciplineID AND disciplines_students.StudentID = students.ID) - ORDER BY students.LastName ASC; + ORDER BY CONCAT(students.LastName, ' ', students.FirstName, ' ', students.SecondName) ASC, + students.ID ASC; ELSE SELECT students.ID, students.LastName, @@ -740,7 +741,8 @@ BEGIN NOT EXISTS(SELECT * FROM `disciplines_students` WHERE disciplines_students.DisciplineID = pDisciplineID AND disciplines_students.StudentID = students.ID) - ORDER BY students.LastName ASC; + ORDER BY CONCAT(students.LastName, ' ', students.FirstName, ' ', students.SecondName) ASC, + students.ID ASC; END IF; END // diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php index 6c1127f42a6a36b7b30800379a7f5faa8b79d143..b9e46a709ac00e64de34f22147877bf1b0ca05c9 100644 --- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php +++ b/~dev_rating/application/classes/Controller/Handler/FileCreator.php @@ -121,7 +121,6 @@ class Controller_Handler_FileCreator extends Controller_Handler // Ведомость public function action_GenerateFinalForm() { - // TODO CHECK!!! // TODO // parameters $disciplineID = $this->post['disciplineID']; $groupID = $this->post['studyGroupID']; @@ -132,7 +131,7 @@ class Controller_Handler_FileCreator extends Controller_Handler $type = $info[0]['ExamType']; $templateFile = DOCROOT."docs/template $type.xls"; if (!file_exists($templateFile)) { - exit("template wasn't found" . PHP_EOL); // TODO + exit("template wasn't found" . PHP_EOL); } $objPHPExcel = PHPExcel_IOFactory::load($templateFile); $objPHPExcel->setActiveSheetIndex(0);