From 7dd990f9b517aeba72dcbcb3cd43f2adc1c777a8 Mon Sep 17 00:00:00 2001 From: "dmitry.s" <sv.l1@mail.ru> Date: Wed, 8 Jul 2015 14:11:26 +0300 Subject: [PATCH] fixed exam summation ratings --- ~dev_rating/application/classes/Controller/DeanOffice/Bill.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php index 2c7f0b428..868e1b68e 100644 --- a/~dev_rating/application/classes/Controller/DeanOffice/Bill.php +++ b/~dev_rating/application/classes/Controller/DeanOffice/Bill.php @@ -29,7 +29,8 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice if (!isset($table[$record['StudentID']])) continue; // skip fake - $rate = ($record['Semester'] + $record['Bonus'] + $record['Extra'] + $record['PreviousExam']); + $rate = ($record['Semester'] + $record['Bonus'] + $record['Extra'] + + max($record['PreviousExam'], $record['Exam'])); $rateSet = isset($record['Semester']) || isset($record['Bonus']) || isset($record['Extra']) || isset($record['PreviousExam']); $table[$record['StudentID']]['grades'][] = [ -- GitLab