From 91086eee471f1223b01359134a35f68d430df91f 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: Sun, 30 Nov 2014 00:27:02 +0300
Subject: [PATCH] fix
---
.../application/views/teacher/rating.twig | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/~dev_rating/application/views/teacher/rating.twig b/~dev_rating/application/views/teacher/rating.twig
index b09efbc81..a26848402 100644
--- a/~dev_rating/application/views/teacher/rating.twig
+++ b/~dev_rating/application/views/teacher/rating.twig
@@ -33,7 +33,8 @@
<td class="subject" rowspan="3">Ртог</td>
</tr>
<tr class="RatingTableSubmodulesHead">
- {% set CellCount = 0 %} {% set col = 0 %}
+ {% set CellCount = 0 %}
+ {% set col = 0 %}
<td class="title">Мероприятие</td>
{% for i in 1..headerRate.ModulesCount %}
{% set CellCount = CellCount + headerRate[i].SubmodulesCount %}
@@ -46,13 +47,20 @@
{% endfor %}
</tr>
<tr class="RatingTableSubmodulesHeadMaxRate">
- {% set CellCount = 0 %} {% set col = 0 %}
+ {% set CellCount = 0 %}
+ {% set col = 0 %}
<td class="title">Макс. балл</td>
{% for i in 1..headerRate.ModulesCount %}
{% set CellCount = CellCount + headerRate[i].SubmodulesCount %}
{% for j in 1..headerRate[i].SubmodulesCount %}
- {% set col = col + 1 %}
- <td class="subject col_{{ col }}" id="{{ headerRate[i][j].SubmoduleID }}">{{ headerRate[i][j].MaxRate }} <input type="hidden" class="MaxRate" value="{{ headerRate[i][j].MaxRate }}"></td>
+ {% if headerRate[i].ModuleType == "exam" %}
+ <td class="subject" id="{{ headerRate[i][j].SubmoduleID }}">{{ headerRate[i][j].MaxRate }}</td>
+ {% else %}
+ {% set col = col + 1 %}
+ <td class="subject col_{{ col }}" id="{{ headerRate[i][j].SubmoduleID }}">{{ headerRate[i][j].MaxRate }}
+ <input type="hidden" class="MaxRate" value="{{ headerRate[i][j].MaxRate }}">
+ </td>
+ {% endif %}
{% endfor %}
{% endfor %}
</tr>
--
GitLab