From ea6a5bb963ce45335c4c42298fee75caa17c2092 Mon Sep 17 00:00:00 2001 From: RomanSteinberg <romanofficial@yandex.ru> Date: Wed, 24 Jun 2015 16:34:45 +0300 Subject: [PATCH] FIX: credit final form and print select options --- .../application/classes/Controller/Handler/FileCreator.php | 4 ++-- ~dev_rating/application/views/teacher/exam.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php index 7b4541be3..c8a70e8ff 100644 --- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php +++ b/~dev_rating/application/classes/Controller/Handler/FileCreator.php @@ -681,8 +681,8 @@ class Controller_Handler_FileCreator extends Controller_Handler return $this->formRateOfFive($attestationAdmission, $ratesSet['Exam'], $total, $examHold, $ratesSet['Option']); case 'grading_credit': { // emulate exam to call formRateOfFive - $ratesSet['exam'] = 22; - $ratesSet['semester'] -= 22; + $ratesSet['Exam'] = 22; + $ratesSet['Semester'] -= 22; $attestationAdmission -= 22; $res = $this->formRateOfFive($attestationAdmission, $ratesSet['Exam'], $total, $examHold); $t = $res[1]; diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig index 0573d9b11..140e55b2d 100644 --- a/~dev_rating/application/views/teacher/exam.twig +++ b/~dev_rating/application/views/teacher/exam.twig @@ -124,8 +124,8 @@ {% if group.isAttached == 1 %} {{ group.GradeTitle }} {% endif %}{{ group.GroupNum }} РіСЂСѓРїРїР°. <span class="downloadExcelStatement" id="group_{{ group.GroupID }}">Скачать ведомость</span> <select id="stageSelector_{{ group.GroupID }}" class="stageSelector"> - <option value="0">До экзамена</option> - <option value="1" selected="selected">Ркзамен</option> + <option value="0">До аттестации</option> + <option value="1" selected="selected">Аттестация</option> <option value="2">Пересдача 1</option> <option value="3">Пересдача 2</option> </select> -- GitLab