From c33ae701c82d5b0351a0a234195736d20570694c Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Mon, 22 Dec 2014 00:19:37 +0300
Subject: [PATCH] stylish
---
.../classes/Controller/Teacher/Rating.php | 53 +++++++++----------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/~dev_rating/application/classes/Controller/Teacher/Rating.php b/~dev_rating/application/classes/Controller/Teacher/Rating.php
index 59c634a94..6183047e6 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Rating.php
+++ b/~dev_rating/application/classes/Controller/Teacher/Rating.php
@@ -213,12 +213,14 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
$rateHandled = array();
$groupsHandled = array();
- $i_g = 0; $i_s = 0; $curGroup = 0;
+ $i_g = 0;
+ $i_s = 0;
+ $curGroupID = 0;
foreach($students as $row) {
// Группа
- if ($curGroup !== $row['GroupID']) {
- $curGroup = $row['GroupID'];
+ if ($curGroupID !== $row['GroupID']) {
+ $curGroupID = $row['GroupID'];
$i_g++;
$rateHandled[$i_g]['GroupID'] = $row['GroupID'];
$rateHandled[$i_g]['GroupNum'] = $row['GroupNum']; // в„– РіСЂСѓРїРїС‹
@@ -234,56 +236,53 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
if ($row['Degree'] == 'master')
$rateHandled[$i_g]['GradeTitle'] = 'Магистратура, '.$row['GradeNum'].' год';
- $groupsHandled[$curGroup] = $rateHandled[$i_g]['GradeTitle']." ".$row['GroupNum']." РіСЂСѓРїРїР°";
+ $groupsHandled[$curGroupID] = $rateHandled[$i_g]['GradeTitle']." ".$row['GroupNum']." РіСЂСѓРїРїР°";
}
// Студенты
$i_s++;
- $rateHandled[$i_g]['Students'][$i_s]['ID'] = $row['ID'];
- $rateHandled[$i_g]['Students'][$i_s]['Last'] = $row['Last'];
- $rateHandled[$i_g]['Students'][$i_s]['First'] = $row['First'];
- $rateHandled[$i_g]['Students'][$i_s]['Second'] = $row['Second'];
- $rateHandled[$i_g]['Students'][$i_s]['isAttached'] = $row['isAttached']; // #1
+
+ $curStudent = $rateHandled[$i_g]['Students'][$i_s];
+
+ $curStudent['ID'] = $row['ID'];
+ $curStudent['Last'] = $row['Last'];
+ $curStudent['First'] = $row['First'];
+ $curStudent['Second'] = $row['Second'];
+ $curStudent['isAttached'] = $row['isAttached']; // #1
// Баллы студента
$rate = $db->getMapForStudentExam($row['ID'], $id);
$i_r = 0;
- $rateHandled[$i_g]['Students'][$i_s]['RateResult'] = 0;
+ $curStudent['RateResult'] = 0;
$examRate = 0;
$extraNum = 0;
foreach($rate as $r) {
$i_r++;
+ $curRate = $curStudent['Rates'][$i_r];
- $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['SubmoduleID'] = $r['SubmoduleID'];
- $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['Rate'] = $r['Rate'];
- $rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['ModuleType'] = $r['ModuleType'];
+ $curRate['SubmoduleID'] = $r['SubmoduleID'];
+ $curRate['Rate'] = $r['Rate'];
+ $curRate['ModuleType'] = $r['ModuleType'];
+
if ($r['ModuleType'] == 'exam') {
if (!is_null($r['Rate'])) {
for ($k = 1; $k < $i_r; $k++)
- if ($rateHandled[$i_g]['Students'][$i_s]['Rates'][$k]['ModuleType'] == 'exam')
- $rateHandled[$i_g]['Students'][$i_s]['Rates'][$k]['Block'] = 'True';
+ if ($curStudent['Rates'][$k]['ModuleType'] == 'exam')
+ $curStudent['Rates'][$k]['Block'] = 'True';
$examRate = $r['Rate'];
}
} else {
$extraNum = $i_r;
- $rateHandled[$i_g]['Students'][$i_s]['RateResult'] += $r['Rate'];
+ $curStudent['RateResult'] += $r['Rate'];
}
}
- $rateHandled[$i_g]['Students'][$i_s]['RateResult'] += $examRate;
+ $curStudent['RateResult'] += $examRate;
$total = $db->GetStudentRate($row['ID'], $id);
$total = $total[0]['Num'];
if (is_null($total)) $total = 0;
- $rateHandled[$i_g]['Students'][$i_s]['RateSemesterResult'] = $total - $rateHandled[$i_g]['Students'][$i_s]['RateResult'];
- $rateHandled[$i_g]['Students'][$i_s]['RateResult'] = $total;
-
- $rateHandled[$i_g]['Students'][$i_s]['Rates'][$extraNum+1]['SubmoduleID'] = -1;
- $curRate = $total - $examRate - $rateHandled[$i_g]['Students'][$i_s]['Rates'][$extraNum+1]['Rate'];
+ $curStudent['RateSemesterResult'] = $total - $curStudent['RateResult'];
+ $curStudent['RateResult'] = $total;
- // Добор баллов
- if ($curRate < 32 OR $curRate > 38)
- $rateHandled[$i_g]['Students'][$i_s]['Extra'] = 0;
- else
- $rateHandled[$i_g]['Students'][$i_s]['Extra'] = 38 - $curRate;
}
//echo Debug::vars($structureHandled);
--
GitLab