FIX: exam form view

~dev_rating/application/classes/Controller/Handler/FileCreator.php

@@ -208,7 +208,7 @@ class Controller_Handler_FileCreator extends Controller_Handler
         $this->prepareSheetHeader($objPHPExcel, $type, $headerData);
                 
         // fill students rows
-        $startRow = 13;  
+        $startRow = 12;
         $rowNumber = $startRow;
         $index = 1;
 
@@ -248,7 +248,7 @@ class Controller_Handler_FileCreator extends Controller_Handler
         $range = $objPHPExcel->getNamedRange("Year")->getRange();
         $sheet->setCellValue($range, $data['Year']);
         $range = $objPHPExcel->getNamedRange("CreationDate")->getRange();
-        $sheet->setCellValue($range, date("dd.mm.yy"));
+        $sheet->setCellValue($range, date("d.m.y"));
         
         $range = $objPHPExcel->getNamedRange("Date")->getRange();
         if ($disciplineType == 'credit') {
@@ -316,50 +316,52 @@ class Controller_Handler_FileCreator extends Controller_Handler
     {
         $indPosition = 'A'; // Номер
         $namePosition = 'B';  // ФИО
-        $totalRatePosition = 'G';  // Итоговый рейтинг
-        $semesterRatePosition  = 'H';   // Сумма баллов
-        $bonusRatePosition = 'I'; // Бонусные баллы
-        $examRatePosition = 'J'; // Баллы за экзамен
-        $rateOfFivePosition = 'K'; // Оценка за экзамен по пятибальной системе
+        $totalRatePosition = 'H';  // Итоговый рейтинг
+        $semesterRatePosition  = 'I';   // Сумма баллов
+        $bonusRatePosition = 'J'; // Бонусные баллы
+        $examRatePosition = 'K'; // Баллы за экзамен
+        $rateOfFivePosition = 'L'; // Оценка за экзамен по пятибальной системе
 
-        $sheet  ->getStyle("A".$row.":S".$row)
+        $sheet  ->getStyle("A".$row.":V".$row)
             ->getBorders()->getAllBorders()
             ->setBorderStyle(PHPExcel_Style_Border::BORDER_THIN);
-        $sheet  ->getStyle("G".$row.":J".$row)
+        $sheet  ->getStyle("H".$row.":K".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet  ->getStyle("K".$row.":L".$row)
+        $sheet  ->getStyle("L".$row.":M".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-        $sheet  ->getStyle("M".$row.":N".$row)
+        $sheet  ->getStyle("N".$row.":O".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet  ->getStyle("O".$row.":U".$row)
+        $sheet  ->getStyle("P".$row.":V".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-        $sheet  ->getStyle("R".$row.":R".$row)
+        $sheet  ->getStyle("S".$row.":S".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet->mergeCells("B".$row.":F".$row);
+        $sheet->mergeCells("B".$row.":G".$row);
 
         $lastName = $data['Last'];
         $firstName = $data['First'];
         $secondName = $data['Second'];
         $rate = (int)$data['intermediate'];
         $bonus = (int)$data['bonus'];
-        $examRate = 0; // TODO: get it from DB
+        $examRateValue = 0; // TODO: get it from DB
         $fullName = $lastName." ".$firstName." ".$secondName;
-        $totalRateValue = $rate + $examRate + $bonus;
+        $totalRateValue = $rate + $examRateValue + $bonus;
 
         if ($totalRateValue > 100)
             $totalRateValue = 100;
 
         $totalRate = '';
         $rateOfFive = '';
+        $examRate = '';
         if ($rate < 38) {
             $totalRate = ' ';
-            $rateOfFive = 'не удовл';
-        } elseif (($rate >= 38) and ($examRate >= 22)) {
+            $rateOfFive = 'неуд';
+            $examRate ='0';
+        } elseif (($rate >= 38) and ($examRateValue >= 22)) {
             $totalRate = $totalRateValue;
             $rateOfFive = 'удовл';
             if (($totalRateValue >= 75) and ($totalRateValue < 85))