diff --git a/~dev_rating/application/classes/Controller/Teacher/Rating.php b/~dev_rating/application/classes/Controller/Teacher/Rating.php index d00ab35dd3deeff805cab8f4ace364db53e769ae..62009e0a880bf3ba16eb1bcd7e627aca387e3981 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Rating.php +++ b/~dev_rating/application/classes/Controller/Teacher/Rating.php @@ -147,6 +147,12 @@ class Controller_Teacher_Rating extends Controller_UserEnvi { $id = $this->request->param('id'); $db = new Model_Teacher_Rating; + // Узнаем ExamType + $dbMap = new Model_Teacher_Map; + $disc_temp = $dbMap->getDisciplineInfoByID($id); + $disciplineInfo['ExamType'] = $disc_temp['ExamType']; + $disciplineInfo['ID'] = $id; + // Шапка таблицы: структура РЈРљР” (модули Рё мероприятия) $structure = $db->GetMapForDisciplineExam($this->UserInfo['TeacherID'], $id); @@ -286,7 +292,7 @@ class Controller_Teacher_Rating extends Controller_UserEnvi { $twig->studyGroupID = $this->GetSGID($id); - $twig->DisciplineID = $id; + $twig->disciplineInfo = $disciplineInfo; $this->response->body($twig); } diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig index 290fb126d5b968ef9c990c09b71b58094adb43b3..814ac708b5a32398cafff85cf6c62edb334a09e5 100644 --- a/~dev_rating/application/views/teacher/exam.twig +++ b/~dev_rating/application/views/teacher/exam.twig @@ -12,6 +12,16 @@ {% block main_content %} <h2 style="margin-left: 2.5%; font-weight: normal; color: #3399CC;">Ркзамен</h2> + {% if disciplineInfo.ExamType == 'exam' %} + <button class="downloadExamTable">Скачать отчёт РїРѕ экзамену</button> + {% else %} + <button class="downloadCreditTable">Скачать отчёт РїРѕ зачету</button> + {% endif %} + + {{ HTML.anchor('rate/'~DisciplineID, + "Перейти Рє оцениванию", + {'title': 'Оценивание', 'class': 'rate_a'})|raw }} + <div class="groupSelectorWrap"> <div class="groupSelectorText">Фильтр:</div> <select class="groupSelector">