Reduce bonus fields

~dev_rating/application/classes/Controller/Student/Subject.php

@@ -33,8 +33,6 @@ class Controller_Student_Subject extends Controller_Environment_Student
         $disMap = [];              # not sure, what it is about :(
         $examRate = 0;             # completely legacy code, baby
         $extraRate = 0;
-        $bonusRate = 0;
-        $bonusMaxRate = 0;
         $examMaxRate = 0;
         $disMap['Extra']['Rate'] = 0;
         $submodules = [];
@@ -53,15 +51,14 @@ class Controller_Student_Subject extends Controller_Environment_Student
                     break;
 
                 case 'bonus':
-                    $bonusRate += $row['Rate'];
-                    $bonusMaxRate += (int)$row['MaxRate'];
+                    $disMap['Bonus'] = $row['SubmoduleID'];
 
-                    $disMap['Bonus'] = array(
+                    $submodules[$row['SubmoduleID']] = [
                         'Description' => $row['Description'],
-                        'Rate'        => (int)$row['Rate'],
-                        'MaxRate'     => (int)$row['MaxRate'],
+                        'Rate'        => $row['Rate'],
+                        'MaxRate'     => $row['MaxRate'],
                         'Date'        => $row['Date'],
-                    );
+                    ];
                     break;
 
                 case 'extra':
@@ -90,8 +87,6 @@ class Controller_Student_Subject extends Controller_Environment_Student
 
         $disMap['ExamRate'] = (int)$examRate;
         $disMap['ExamMaxRate'] = (int)$examMaxRate;
-        $disMap['BonusRate'] = (int)$bonusRate;
-        $disMap['BonusMaxRate'] = (int)$bonusMaxRate;
         $disMap['ExtraRate'] = (int)$extraRate;
 
         return ['Modules' => $disMap, 'Submodules' => $submodules];

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

@@ -147,25 +147,27 @@
     <div class="Middle totalRate">
         Промежуточный итог: {{ SemesterRate + DisciplineMap.ExtraRate }} / {{ SemesterMaxRate }}
     </div>
-
+        
+    {% set Bonus = Submodules[DisciplineMap.Bonus] %}
+        
     <h3 class="blockTitle">Экзамен</h3>
     <div class="blockMargin">
         <div class="tableTitle Extra">
             Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;
         </div>
-        {% if DisciplineMap.Bonus is not empty %}
-        <div class="submoduleBlock">
+        {% if Bonus is not empty %}
+        <div class="submoduleBlock">            
             <div class="submoduleTitle">Бонусные баллы</div>
             <div class="submoduleRate">
-                {{ DisciplineMap.Bonus.Rate }} / {{ DisciplineMap.Bonus.MaxRate }}
+                {{ +Bonus.Rate }} / {{ +Bonus.MaxRate }}
             </div>
             <div class="submodulePercent">
-                {% if DisciplineMap.Bonus.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Bonus.Rate  * 100) // DisciplineMap.Bonus.MaxRate }} %
+                {% if Bonus.MaxRate == 0 %} 0 {% else %} {{ (Bonus.Rate * 100) // Bonus.MaxRate }} %
                 {% endif %}
             </div>
             <div class="submoduleDate">
-                {% if DisciplineMap.Bonus.Date != 0 %}
-                    {{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
+                {% if Bonus.Date != 0 %}
+                    {{ Bonus.Date|date('d.m.Y') }}
                 {% else %}
                     —
                 {% endif %}
@@ -191,7 +193,7 @@
     </div>
 
     <div class="Final totalRate">
-        {% set Rating = SemesterRate + DisciplineMap.Extra.Rate + DisciplineMap.Bonus.Rate + DisciplineMap.Exam.Rate %}
+        {% set Rating = SemesterRate + DisciplineMap.Extra.Rate + Bonus.Rate + DisciplineMap.Exam.Rate %}
         Итоговый рейтинг: {{ min(Rating, 100) }} / 100
     </div>
 
@@ -204,7 +206,7 @@
             {% else %}
                 Поздравляем, Вы получили зачет по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;!
             {% endif %}
-            {% if ExtraRate or not Admission or DisciplineMap.Bonus is not empty %}
+            {% if ExtraRate or not Admission or Bonus is not empty %}
             <div class="tableTitle Extra">
                 Зачет по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;
             </div>
@@ -218,19 +220,19 @@
                     </div>
                 </div>
             {% endif %}
-            {% if DisciplineMap.Bonus is not empty %}
+            {% if Bonus is not empty %}
                 <div class="submoduleBlock">
                     <div class="submoduleTitle">Бонусные баллы</div>
                     <div class="submoduleRate">
-                        {{ DisciplineMap.Bonus.Rate }} / {{ DisciplineMap.Bonus.MaxRate }}
+                        {{ +Bonus.Rate }} / {{ +Bonus.MaxRate }}
                     </div>
                     <div class="submodulePercent">
-                        {% if DisciplineMap.Bonus.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Bonus.Rate  * 100) // DisciplineMap.Bonus.MaxRate }} %
+                        {% if Bonus.MaxRate == 0 %} 0 {% else %} {{ (Bonus.Rate * 100) // Bonus.MaxRate }} %
                         {% endif %}
                     </div>
                     <div class="submoduleDate">
-                        {% if DisciplineMap.Bonus.Date != 0 %}
-                            {{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
+                        {% if Bonus.Date != 0 %}
+                            {{ Bonus.Date|date('d.m.Y') }}
                         {% else %}
                             —
                         {% endif %}
@@ -241,7 +243,7 @@
         </div>
 
         <div class="Final totalRate">
-            {% set Rating = SemesterRate + DisciplineMap.Extra.Rate + DisciplineMap.Bonus.Rate %}
+            {% set Rating = SemesterRate + DisciplineMap.Extra.Rate + Bonus.Rate %}
             Итоговый рейтинг: {{ min(Rating, 100) }} / 100
         </div>
     {% endif %}