From 08f0b82c2cf48a4c61d40eed871090ff471884fd Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Mon, 18 May 2015 19:04:31 +0300
Subject: [PATCH] FIX: record order in AttestationData and getRatesForGroup
should be equal
---
db/StoredProcedures.sql | 6 ++++--
.../application/classes/Controller/Handler/FileCreator.php | 3 +--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 36be3d66d..48fa18f0a 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 6c1127f42..b9e46a709 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);
--
GitLab