From e6780272ee84802248a5a180a23b2c627f42f3ed Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Thu, 3 Sep 2015 12:37:03 +0300
Subject: [PATCH] Code style
---
.../views/teacher/discipline/rating/exam.twig | 24 ++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/~dev_rating/application/views/teacher/discipline/rating/exam.twig b/~dev_rating/application/views/teacher/discipline/rating/exam.twig
index 9f107200c..6444f371e 100644
--- a/~dev_rating/application/views/teacher/discipline/rating/exam.twig
+++ b/~dev_rating/application/views/teacher/discipline/rating/exam.twig
@@ -136,8 +136,12 @@
{% set row = row + 1 %}
{% set col = 1 %}
<tr id="row_{{ row }}" class="group_{{ group.GroupID }}">
- <td id="student_{{ student.ID }}" class="studentCell staticCell">{{ student.LastName }} {{ student.FirstName }}</td>
- <td class="semesterRateResultCell staticCell">{{ student.RateSemesterResult }}</td>
+ <td id="student_{{ student.ID }}" class="studentCell staticCell">
+ {{ student.LastName }} {{ student.FirstName }}
+ </td>
+ <td class="semesterRateResultCell staticCell">
+ {{ student.RateSemesterResult }}
+ </td>
{% set autoPassNotAdded = true %}
{% for r in student.Rates %}
@@ -173,13 +177,13 @@
{% if r.ModuleType == 'exam' %}
<td class="absenceCell {{ td_class }}" id="absence_{{col}}_{{row}}">
<input type="checkbox" class="absenceCheck"
- {% if r.ExamPeriodOption == 'absence' %} checked="true" {% endif %}>
+ {{ r.ExamPeriodOption == 'absence' ? 'checked="true"' }}>
</td>
{% if autoPassNotAdded %}
<td class="autoPass {{ td_class }}" id="autopass_{{col}}_{{row}}">
<input type="checkbox" class="autoPassCheck"
- {% if r.ExamPeriodOption == 'pass' %} checked="true" {% endif %}>
+ {{ r.ExamPeriodOption == 'pass' ? 'checked="true"' }}>
</td>
{% set autoPassNotAdded = false %}
{% endif %}
@@ -187,8 +191,16 @@
{% endfor %}
- <td class="bonus staticCell" >{% if student.Bonus is null %}0{% else %}{{ student.Bonus }}{% endif %} </td>
- <td class="rateResultCell staticCell">{% if student.RateResult + student.Bonus > 100 %} 100+ {% else %} {{ student.RateResult + student.Bonus }} {% endif %}</td>
+ <td class="bonus staticCell" >
+ {{ student.Bonus is null ? 0 : student.Bonus }}
+ </td>
+ <td class="rateResultCell staticCell">
+ {% if student.RateResult + student.Bonus > 100 %}
+ 100+
+ {% else %}
+ {{ student.RateResult + student.Bonus }}
+ {% endif %}
+ </td>
</tr>
{% endfor %}
{% endfor %}
--
GitLab