diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php index c325671cb615ea0285b951b7a2cb8dbc972c4e60..97ba532fc6afcd223cd60f71402b071eba434875 100644 --- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php +++ b/~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)) diff --git a/~dev_rating/docs/template exam.xls b/~dev_rating/docs/template exam.xls index 14c107a280f69e4579afc08f9a364838cd5053d8..48e86ac60652f29364a15ee1d1f6cf8211d9f205 100644 Binary files a/~dev_rating/docs/template exam.xls and b/~dev_rating/docs/template exam.xls differ