merged

~dev_rating/application/classes/Controller/DeanOffice/Bill.php

@@ -8,13 +8,15 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
         Cookie::set('fD', 'true');
     }
 
-    public static function makeTable($id, &$disciplines) {
-        $students = Model_Students::ofGroup($id);
+    public static function makeTable($groupID, &$disciplines) {
+        $students = Model_Students::ofGroup($groupID);
         $table = [];
 
         $iter = 0;
-        foreach ($disciplines as $dis) {
-            foreach (Model_Rating::getRatesForStudentsGroup((int) ($dis['ID']), $id) as $record) {
+
+        foreach ($disciplines as &$dis) {
+            $rates = Model_Rating::getRatesForStudentsGroup((int)$dis['ID'], $groupID);
+            foreach ($rates as $record) {
                 if (!isset($table[$record['ID']])) {
                     $table[$record['ID']] = [
                         'Name'   => $record['LastName'] . ' ' . $record['FirstName'] . ' ' . $record['SecondName'],