Skip to content
Snippets Groups Projects
Commit ca321ce2 authored by RomanSteinberg's avatar RomanSteinberg
Browse files

FIX: rates view in final form

parent b6078b99
Branches
No related merge requests found
...@@ -479,27 +479,34 @@ class Controller_Handler_FileCreator extends Controller_Handler ...@@ -479,27 +479,34 @@ class Controller_Handler_FileCreator extends Controller_Handler
} }
// Определяет оценку по пятибальной системе // Определяет оценку по пятибальной системе
protected function formRateOfFive($rate, $examRateValue, $totalRateValue, $examHold) protected function formRateOfFive($semesterRate, $examRateValue, $totalRateValue, $examHold)
{ {
$totalRate = ''; $totalRate = '';
$rateOfFive = ''; $rateOfFive = '';
$examRate = ''; $examRate = '';
if ($examHold != 0) if ($examHold != 0)
{
$examRate = $examRateValue; $examRate = $examRateValue;
if (($semesterRate < 38) or ($examRateValue < 22)) {
if ($rate < 38) { $rateOfFive = 'неуд';
$totalRate = ' '; } else {
$rateOfFive = 'неуд'; $totalRate = $totalRateValue;
if ($examHold == 0) $rateOfFive = 'удовл';
if (($totalRateValue >= 71) and ($totalRateValue < 85))
$rateOfFive = 'хор';
elseif ($totalRateValue >= 85)
$rateOfFive = 'отл';
}
}
else
{
if ($semesterRate < 38) { // задолженник
$totalRate = ' ';
$rateOfFive = 'неуд';
$examRate = '0'; $examRate = '0';
} elseif (($rate >= 38) and ($examRateValue >= 22)) { }
$totalRate = $totalRateValue; }
$rateOfFive = 'удовл';
if (($totalRateValue >= 71) and ($totalRateValue < 85))
$rateOfFive = 'хор';
elseif ($totalRateValue >= 85)
$rateOfFive = 'отл';
}
return array($totalRate, $rateOfFive, $examRate); return array($totalRate, $rateOfFive, $examRate);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment