diff --git a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php index 2bf08ca2283a8c158f4f4577e87cf7e05811a22d..398ed49da794c1ba0a8ddeed6d690f069508376f 100644 --- a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php +++ b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php @@ -13,6 +13,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice $table = []; $iter = 0; + echo Debug::vars(Model_Rating::getRatesForStudentsGroup(365, 11)); foreach ($disciplines as &$dis) { $disInfo = Model_Discipline::getDisciplineRateInfo($dis['ID']); @@ -25,14 +26,12 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice 'grades' => [] ]; } + $rate = ($record['intermediate'] + $record['bonus'] + $record['exam']); + $rateSet = isset($record['intermediate'])||isset($record['bonus'])||isset($record['exam']); $table[$record['ID']]['grades'][] = [ 'subject' => $dis['SubjectName'], - 'rating' => [ - 'intermediate' => $record['intermediate'], - 'bonus' => $record['bonus'], - 'exam' => $record['exam'] - ], - 'debt' => (float)($record['intermediate'] + $record['bonus'] + $record['exam']) < 0.6 * $disInfo['Current'] + 'rating' => $rateSet ? $rate : '-', + 'debt' => $rateSet && (float)($record['intermediate'] + $record['bonus'] + $record['exam']) < 0.6 * $disInfo['Current'] ]; } //check: student may not be attach to discipline @@ -46,11 +45,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice if (!isset($table[$stud['ID']]['grades'][$iter])) { $table[$stud['ID']]['grades'][] = [ 'subject' => $dis['SubjectName'], - 'rating' => [ - 'intermediate' => null, - 'bonus' => null, - 'exam' => null - ], + 'rating' => '-', 'debt' => false ]; }