From 72cb6690749a44b4a79246b42161627adf5c0aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com> Date: Sat, 29 Nov 2014 00:03:01 +0300 Subject: [PATCH] blocked exam in rating page --- .../application/classes/Controller/Teacher/Rating.php | 3 +++ ~dev_rating/application/views/teacher/rating.twig | 8 +++++++- ~dev_rating/media/css/rating.css | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/~dev_rating/application/classes/Controller/Teacher/Rating.php b/~dev_rating/application/classes/Controller/Teacher/Rating.php index 82ab188ce..0b5e93a3f 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Rating.php +++ b/~dev_rating/application/classes/Controller/Teacher/Rating.php @@ -50,6 +50,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi { $disciplineHandled[$i]['MaxRate'] += (int) $row['MaxRate']; $disciplineHandled[$i]['ModuleTitle'] = $row['ModuleName']; $disciplineHandled[$i]['ModuleType'] = $row['ModuleType']; + if ($row['ModuleType'] == "exam") + $twig->examSubmoduleID = $row['SubmoduleID']; + $disciplineHandled[$i][$j]['SubmoduleID'] = $row['SubmoduleID']; $disciplineHandled[$i][$j]['Title'] = $row['SubModuleName']; $disciplineHandled[$i][$j]['Description'] = $row['SubmoduleDescription']; diff --git a/~dev_rating/application/views/teacher/rating.twig b/~dev_rating/application/views/teacher/rating.twig index d4bf47f55..813b2b1f4 100644 --- a/~dev_rating/application/views/teacher/rating.twig +++ b/~dev_rating/application/views/teacher/rating.twig @@ -71,7 +71,13 @@ <td class="student" id="{{ student.ID }}">{{ student.Last }} {{ student.First }}</td> {% for i in 1..CellCount %} {% set RateResult = RateResult + student[i].Rate %} - <td id="{{ i }}" class="rateCell"><input type="text" value="{{ student[i].Rate }}"></td> + <td id="{{ i }}" class="rateCell"> + {% if examSubmoduleID != student[i].SubmoduleID %} + <input type="text" value="{{ student[i].Rate }}"> + {% else %} + <p>{{ student[i].Rate }}</p> + {% endif %} + </td> {% endfor %} <td class="row_{{ row }} col_{{ i + 1 }} RateResult">{{ RateResult }}</td> </tr> diff --git a/~dev_rating/media/css/rating.css b/~dev_rating/media/css/rating.css index 5d9c8c638..b65b99085 100644 --- a/~dev_rating/media/css/rating.css +++ b/~dev_rating/media/css/rating.css @@ -91,6 +91,10 @@ td { line-height: 140%; } */ +td p { + width: 100%; + text-align: center +} td input { display: block; margin: 0 auto; -- GitLab