From 727f3765224a6ab5a0ffcce05966388b97421a33 Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Wed, 31 Dec 2014 02:09:52 +0300
Subject: [PATCH] FIX: getRatesForStudentsGroup; FIX: rates in excel.
---
db/StoredProcedures.sql | 3 ++-
.../classes/Controller/Handler/FileCreator.php | 13 +++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 271979392..a98490454 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 e0eb20381..95e27fc28 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)
--
GitLab