Интерфейс предмета для студента

~dev_rating/application/views/student/subject.twig

@@ -74,22 +74,18 @@
                         </div>
                     {% endif %}
                 {% endfor %}
-            {% if loop.last %}
-                <div class="disciplineResult">
-                    Итого: {{ DisciplineMap.Rate }} / {{ DisciplineMap.MaxRate }}
-                </div>
-            {% endif %}
         {% endfor %}
-        {% if Discipline.Bonus is not empty %}
+        
+        {% if DisciplineMap.Bonus is not empty %}
             <div class="bonusBlock">
                 <div class="bonusTitle">Бонусные баллы</div>
-                <div class="bonusRate">{{ Discipline.Bonus.Rate }} / {{ Discipline.Bonus.MaxRate }}</div>
+                <div class="bonusRate">{{ DisciplineMap.Bonus.Rate }} / {{ DisciplineMap.Bonus.MaxRate }}</div>
                 <div class="bonusPercent">
-                    {{ (Discipline.Bonus.Rate  * 100) // Discipline.Bonus.MaxRate }} %
+                    {{ (DisciplineMap.Bonus.Rate  * 100) // DisciplineMap.Bonus.MaxRate }} %
                 </div>
                 <div class="bonusDate">
-                    {% if Discipline.Bonus.Date != 0 %}
-                        {{ Discipline.Bonus.Date|date('d.m.Y') }}
+                    {% if DisciplineMap.Bonus.Date != 0 %}
+                        {{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
                     {% else %}
                         ---
                     {% endif %}
@@ -97,21 +93,25 @@
             </div>
         {% endif %}
             
-        {% if Discipline.Exam is not empty %}
+        {% if DisciplineMap.Exam is not empty %}
             <div class="examBlock">
                 <div class="examTitle">Экзамен по курсу &laquo;{{ Discipline.Title|default('---') }}&raquo;</div>
-                <div class="examRate">{{ Discipline.Exam.Rate }} / {{ Discipline.Exam.MaxRate }}</div>
+                <div class="examRate">{{ DisciplineMap.Exam.Rate }} / {{ DisciplineMap.Exam.MaxRate }}</div>
                 <div class="examPercent">
-                    {{ (Discipline.Exam.Rate  * 100) // Discipline.Exam.MaxRate }} %
+                    {{ (DisciplineMap.Exam.Rate  * 100) // DisciplineMap.Exam.MaxRate }} %
                 </div>
                 <div class="examDate">
-                    {% if Discipline.Exam.Date != 0 %}
-                        {{ Discipline.Exam.Date|date('d.m.Y') }}
+                    {% if DisciplineMap.Exam.Date != 0 %}
+                        {{ DisciplineMap.Exam.Date|date('d.m.Y') }}
                     {% else %}
                         ---
                     {% endif %}
                 </div>
             </div>
         {% endif %}
+        
+        <div class="disciplineResult">
+            Итого: {{ DisciplineMap.Rate }} / {{ DisciplineMap.MaxRate }}
+        </div>
     </div>
 {% endblock %}
\ No newline at end of file

~dev_rating/media/css/student/subject.css

@@ -53,9 +53,16 @@
 {
     margin-top: 10px;
     padding: 5px;
-    background: #edeaff;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
+    background: #fff;
+    border: 3px solid #ffb100;
+}
+
+.bonusBlock
+{
+    margin-top: 10px;
+    padding: 5px;
+    background: #fff;
+    border: 3px solid #3399cc;
 }
 
 .disciplineResult
@@ -120,7 +127,6 @@
 .examBlock .examTitle
 {
     width: 65%;
-    color: #000;
 }
 
 .examBlock .examRate
@@ -134,6 +140,34 @@
     text-align: center;
 }
 .examBlock .examDate
+{
+    width: 18%;
+    text-align: center;
+}
+
+
+.bonusBlock > div
+{
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.bonusBlock .examTitle
+{
+    width: 65%;
+}
+
+.bonusBlock .examRate
+{
+    width: 10%;
+    text-align: center;
+}
+.bonusBlock .examPercent
+{
+    width: 5%;
+    text-align: center;
+}
+.bonusBlock .examDate
 {
     width: 18%;
     text-align: center;