Skip to content
Snippets Groups Projects
Commit 707da25e authored by dmitry.s's avatar dmitry.s
Browse files

added support of unsetted rating

parent 1ec7aaab
No related merge requests found
...@@ -13,6 +13,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice ...@@ -13,6 +13,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
$table = []; $table = [];
$iter = 0; $iter = 0;
echo Debug::vars(Model_Rating::getRatesForStudentsGroup(365, 11));
foreach ($disciplines as &$dis) { foreach ($disciplines as &$dis) {
$disInfo = Model_Discipline::getDisciplineRateInfo($dis['ID']); $disInfo = Model_Discipline::getDisciplineRateInfo($dis['ID']);
...@@ -25,14 +26,12 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice ...@@ -25,14 +26,12 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
'grades' => [] 'grades' => []
]; ];
} }
$rate = ($record['intermediate'] + $record['bonus'] + $record['exam']);
$rateSet = isset($record['intermediate'])||isset($record['bonus'])||isset($record['exam']);
$table[$record['ID']]['grades'][] = [ $table[$record['ID']]['grades'][] = [
'subject' => $dis['SubjectName'], 'subject' => $dis['SubjectName'],
'rating' => [ 'rating' => $rateSet ? $rate : '-',
'intermediate' => $record['intermediate'], 'debt' => $rateSet && (float)($record['intermediate'] + $record['bonus'] + $record['exam']) < 0.6 * $disInfo['Current']
'bonus' => $record['bonus'],
'exam' => $record['exam']
],
'debt' => (float)($record['intermediate'] + $record['bonus'] + $record['exam']) < 0.6 * $disInfo['Current']
]; ];
} }
//check: student may not be attach to discipline //check: student may not be attach to discipline
...@@ -46,11 +45,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice ...@@ -46,11 +45,7 @@ class Controller_DeanOffice_Bill extends Controller_Environment_DeanOffice
if (!isset($table[$stud['ID']]['grades'][$iter])) { if (!isset($table[$stud['ID']]['grades'][$iter])) {
$table[$stud['ID']]['grades'][] = [ $table[$stud['ID']]['grades'][] = [
'subject' => $dis['SubjectName'], 'subject' => $dis['SubjectName'],
'rating' => [ 'rating' => '-',
'intermediate' => null,
'bonus' => null,
'exam' => null
],
'debt' => false 'debt' => false
]; ];
} }
......
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