Skip to content
Snippets Groups Projects
Commit ee27e270 authored by Andrew Rudenets's avatar Andrew Rudenets
Browse files

FIX: загрузка файлов

parent 8f7121cc
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
~dev_rating/application/classes/Controller/Admin/Students.php
+ 3
− 4
View file @ ee27e270
......@@ -25,12 +25,12 @@ class Controller_Admin_Students extends Controller_UserEnvi {
{
if(!empty($_FILES['students']) AND $this->request->method() == 'POST')
{
if($this->parseFile($_FILES["students"]["tmp_name"]))
$this->redirect('admin/students', 302);
$result = $this->parseFile($_FILES["students"]["tmp_name"]);
}
// VIEW
$twig = Twig::factory('admin/students/upload');
$twig->Faculties = $this->getFaculties();
$twig->UploadingResult = $result;
$twig->User = $this->UserInfo;
$this->response->body($twig);
}
......@@ -44,8 +44,7 @@ class Controller_Admin_Students extends Controller_UserEnvi {
protected function parseFile($filename)
{
FileParser::StudentsList($filename, $_POST['facultyID']);
return true;
return FileParser::StudentsList($filename, $_POST['facultyID']);
}
public function getFaculties() {
......
~dev_rating/application/classes/Controller/Admin/Teachers.php
+ 3
− 4
View file @ ee27e270
......@@ -24,20 +24,19 @@ class Controller_Admin_Teachers extends Controller_UserEnvi {
{
if(!empty($_FILES['teachers']) AND $this->request->method() == 'POST')
{
if($count = $this->parseFile($_FILES["teachers"]["tmp_name"]))
$this->redirect('admin/teachers', 302);
$result = $this->parseFile($_FILES["teachers"]["tmp_name"]);
}
// VIEW
$twig = Twig::factory('admin/teachers/upload');
$twig->Faculties = $this->getFaculties();
$twig->UploadingResult = $result;
$twig->User = $this->UserInfo;
$this->response->body($twig);
}
protected function parseFile($filename)
{
$uploadedPositions = FileParser::TeachersList($filename);
return $uploadedPositions;
return FileParser::TeachersList($filename);
}
public function getFaculties()
......
~dev_rating/application/classes/FileParser.php
+ 38
− 35
View file @ ee27e270
......@@ -6,61 +6,64 @@ class FileParser
{
$model = new Model_Admin_Students;
if(File::mime($filename) != 'text/plain')
return false;
return true;
$file = fopen($filename, "r");
$i = 0;
$i = $j = 0; $resultArr = array();
while ($line = fgetcsv($file, 0, ";"))
{
if($i > 0)
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
// Курс, степень подготовки
$studentGradeNum = $line[1];
$studentGroupNum = $line[2];
switch($line[3])
{
case 'Бакалавр':
$studentDegree = 'bachelor';
break;
case 'Специалист':
$studentDegree = 'specialist';
break;
case 'Магистр':
$studentDegree = 'master';
break;
}
$studentSpec = $line[4];
$attempt = Account::instance()->createStudentEx($lastName, $firstName, $secondName,
$studentGradeNum, $studentGroupNum, $studentDegree, $studentSpec, $facultyID);
if($attempt == -1)
{
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
// Курс, степень подготовки
$studentGradeNum = $line[1];
$studentGroupNum = $line[2];
switch($line[3])
{
case 'Бакалавр':
$studentDegree = 'bachelor';
break;
case 'Специалист':
$studentDegree = 'specialist';
break;
case 'Магистр':
$studentDegree = 'master';
break;
}
$studentSpec = $line[4];
//$studentGradeID = $model->getGradeID($studentGradeNum, $studentDegree);
//Account::instance()->createStudent($lastName, $firstName, $secondName,
// $studentGradeID, $studentGroupNum, $facultyID);
Account::instance()->createStudentEx($lastName, $firstName, $secondName,
$studentGradeNum, $studentGroupNum, $studentDegree, $studentSpec, $facultyID);
$resultArr[$j]['Row'] = $i;
$resultArr[$j]['Info'] = implode(';', $line);
$j++;
}
$i++;
}
return true;
return ($j > 0) ? false : $resultArr;
}
public static function TeachersList($filename)
{
if(File::mime($filename) != 'text/plain')
return false;
return true;
$file = fopen($filename, "r");
$i = 0;
while ($line = fgetcsv($file, 0, ";"))
{
if($i > 0)
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
$departmentName = $line[1];
$attempt = Account::instance()->createTeacherByDepName($lastName, $firstName, $secondName,
$departmentName);
if($attempt == -1)
{
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
$departmentName = $line[1];
Account::instance()->createTeacherByDepName($lastName, $firstName, $secondName,
$departmentName);
$resultArr[$j]['Row'] = $i;
$resultArr[$j]['Info'] = implode(';', $line);
$j++;
}
$i++;
}
return true;
return ($j > 0) ? false : $resultArr;
}
protected static function parsePeopleName($name)
......
~dev_rating/application/views/admin/students/upload.twig
+ 7
− 0
View file @ ee27e270
......@@ -9,6 +9,13 @@
{% endblock %}
{% block main_content %}
{% if UploadingResult is not empty %}
{% set res = '<ul>' %}
{% for item in UploadingResult %}
{{ res ~ '<li>Строка #' ~ item.Row ~ ': ' ~ item.Info ~ '</li>' }}
{% endfor %}
{{ admin.message(warning, 'Возникли проблемы!', res ~ '</ul>') }}
{% endif %}
<form enctype="multipart/form-data" action="" method="POST">
<div class="stepBox" id="FirstStep">
<div class="step_title">
......
~dev_rating/application/views/admin/teachers/upload.twig
+ 7
− 0
View file @ ee27e270
......@@ -9,6 +9,13 @@
{% endblock %}
{% block main_content %}
{% if UploadingResult is not empty %}
{% set res = '<ul>' %}
{% for item in UploadingResult %}
{{ res ~ '<li>Строка #' ~ item.Row ~ ': ' ~ item.Info ~ '</li>' }}
{% endfor %}
{{ admin.message(warning, 'Возникли проблемы!', res ~ '</ul>') }}
{% endif %}
<form enctype="multipart/form-data" action="" method="POST">
<div class="stepBox" id="FirstStep">
<div class="step_title">
......
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