diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php index 06aa846633f11c29961916263c5230d076ab007b..c325671cb615ea0285b951b7a2cb8dbc972c4e60 100644 --- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php +++ b/~dev_rating/application/classes/Controller/Handler/FileCreator.php @@ -162,7 +162,6 @@ class Controller_Handler_FileCreator extends Controller_Handler } - $this->GetHeaders(); // Выводим содержимое файла @@ -214,7 +213,7 @@ class Controller_Handler_FileCreator extends Controller_Handler $index = 1; foreach($result as $studentInfo){ - $this->addStudentToSheet($objPHPExcel, $studentInfo, $rowNumber, $index, $type); + $this->addStudentToSheet($objPHPExcel, $type, $studentInfo, $rowNumber, $index, $type); $rowNumber++; $index++; } @@ -260,13 +259,13 @@ class Controller_Handler_FileCreator extends Controller_Handler $sheet->setCellValue("$range", $controlDate); } - protected function addStudentToSheet($disciplineType, &$objPHPExcel, $data, $row, $index) + protected function addStudentToSheet(&$objPHPExcel, $disciplineType, $data, $row, $index) { $sheet = $objPHPExcel->getActiveSheet(); if ($disciplineType == 'credit') { - addStudentInfoForCreditToSheet($sheet, $data, $row, $index); + $this->addStudentInfoForCreditToSheet($sheet, $data, $row, $index); } elseif ($disciplineType == 'exam') { - addStudentInfoForExamToSheet($sheet, $data, $row, $index); + $this->addStudentInfoForExamToSheet($sheet, $data, $row, $index); } } diff --git a/~dev_rating/docs/template credit.xls b/~dev_rating/docs/template credit.xls index 3efe9c7f2eecc7d658d857fb90e482818417b15a..1dc48e50980d69b0748515fb5a81aeecf4f1a638 100644 Binary files a/~dev_rating/docs/template credit.xls and b/~dev_rating/docs/template credit.xls differ diff --git a/~dev_rating/docs/template exam.xls b/~dev_rating/docs/template exam.xls index 64d1f4aecb71304a86b2e6d26f12ca52f0dd731c..14c107a280f69e4579afc08f9a364838cd5053d8 100644 Binary files a/~dev_rating/docs/template exam.xls and b/~dev_rating/docs/template exam.xls differ