Skip to content
Snippets Groups Projects
Commit 71c41141 authored by xamgore's avatar xamgore
Browse files

Refactoring of students upload page

parent f67c6fe2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
~dev_rating/application/classes/Controller/Admin/Students.php
+ 5
− 5
View file @ 71c41141
......@@ -17,16 +17,16 @@ class Controller_Admin_Students extends Controller_Environment_Admin
}
public function action_upload() {
$result['Success'] = false;
$errors = [];
if (!empty($_FILES['students']) && $this->request->method() == 'POST') {
$file = $_FILES["students"]["tmp_name"];
$result = FileParser::StudentsList($file, $_POST['facultyID']);
$file = $_FILES['students']["tmp_name"];
$errors = FileParser::uploadStudents($file, $_POST['facultyID']);
}
$this->twig->set([
'UploadingResult' => $result,
'Faculties' => Model_Faculties::load(),
'Errors' => $errors,
'Faculties' => Model_Faculties::load(),
])->set_filename('admin/students/upload');
}
......
~dev_rating/application/classes/FileParser.php
+ 48
− 36
View file @ 71c41141
......@@ -2,34 +2,42 @@
class FileParser
{
public static function StudentsList($filename, $facultyID)
{
if(File::mime($filename) != 'text/plain')
return true;
$file = fopen($filename, "r");
$i = $j = 0; $resultArr = array();
while ($line = fgetcsv($file, 0, ";"))
{
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
// Курс, степень подготовки
$gradeNum = $line[1];
$groupNum = $line[2];
$degree = Model_Grades::getDegreeType($line[3]);
$specialization = $line[4];
/**
* Parse students' info & synchronize it with database.
* @param $filename string File with source data
* @param $facultyID int
* @return array errors
*/
public static function uploadStudents($filename, $facultyID) {
if (File::mime($filename) != 'text/plain')
return [];
$file = fopen($filename, "r");
$i = 0;
$errors = [];
while ($line = fgetcsv($file, 0, ";")) {
// ФИО, курс, степень подготовки,
list($name, $gradeNum, $groupNum, $degree, $spec) = $line;
// Фамилия, имя, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($name);
$degree = Model_Grades::getDegreeType($degree);
$attempt = Model_Account::createStudentEx(
$lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $specialization, $facultyID
$lastName, $firstName, $secondName, $gradeNum, $groupNum, $degree, $spec, $facultyID
);
if($attempt == -1)
{
$resultArr[$j]['Row'] = $i;
$resultArr[$j]['Info'] = implode(';', $line);
$j++;
if ($attempt == -1) {
$errors[] = ['Row' => $i, 'Info' => implode(';', $line)];
}
$i++;
}
return ($j > 0) ? false : $resultArr;
return $errors;
}
public static function SubjectsList($filename, $facultyID)
......@@ -39,9 +47,9 @@ class FileParser
$model = new Model_Students();
if(File::mime($filename) != 'text/plain')
return $resultArr;
$file = fopen($filename, "r");
$file = fopen($filename, "r");
$i = $errorsCount = $exists = 0;
while ($line = fgetcsv($file, 0, ";"))
while ($line = fgetcsv($file, 0, ";"))
{
$attempt = Model_Subject::create($line[0], $line[1], $facultyID);
if((int)$attempt < 0)
......@@ -62,7 +70,7 @@ class FileParser
$resultArr['RecordsCount'] = $i;
return $resultArr;
}
public static function TeachersList($filename)
{
// get faculties list
......@@ -77,7 +85,7 @@ class FileParser
return true;
$file = fopen($filename, "r");
$i = $j = 0;
while ($line = fgetcsv($file, 0, ";"))
while ($line = fgetcsv($file, 0, ";"))
{
// Имя, фамилия, отчество
list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]);
......@@ -98,22 +106,26 @@ class FileParser
}
return ($j > 0) ? false : $resultArr;
}
protected static function parsePeopleName($name)
{
$nameExploded = explode(' ', $name);
$idx = 0; $nameHandled = array();
if(UTF8::substr($nameExploded[1], 0, 1) == '(')
{
private static function parsePeopleName($name) {
$nameExploded = explode(' ', $name);
$idx = 0;
$nameHandled = [];
// Енотова (Сенченко) Наталья Лин Чу Геннадьевна
if (UTF8::substr($nameExploded[1], 0, 1) == '(') {
$idx = 1;
}
$nameHandled[0] = $nameExploded[0];
$nameHandled[1] = $nameExploded[1 + $idx];
$nameHandled[2] = '';
for($i = 2 + $idx; $i < count($nameExploded); $i++)
{
$nameHandled[2] .= $nameExploded[$i].' ';
for ($i = 2 + $idx; $i < count($nameExploded); $i++) {
$nameHandled[2] .= $nameExploded[$i] . ' ';
}
return Arr::map('trim', $nameHandled);
}
}
\ No newline at end of file
~dev_rating/application/views/admin/students/upload.twig
+ 32
− 26
View file @ 71c41141
......@@ -9,35 +9,41 @@
{% 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>') }}
{% if Errors is not empty %}
{% set res %}
{% for item in Errors %}
<li>Строка #{{ item.Row }}: {{ item.Info }}</li>
{% endfor %}
{% endset %}
{{ admin.message(warning, 'Возникли проблемы!', '<ul>' ~ res ~ '</ul>') }}
{% endif %}
<form enctype="multipart/form-data" action="" method="POST">
<div class="stepBox" id="FirstStep">
<div class="step_title">
<span class='step_title_count'>Шаг 1:</span> <span class='step_title_description'>Выберите подразделение университета</span>
</div>
<div class="step_body">
<select id="facultySelect" name="facultyID">
<option value="0">— Подразделение ЮФУ —</option>
{% for row in Faculties %}
<option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
{% endfor %}
</select>
<div class="stepBox" id="FirstStep">
<div class="step_title">
<span class='step_title_count'>Шаг 1:</span>
<span class='step_title_description'>Выберите подразделение университета</span>
</div>
<div class="step_body">
<select id="facultySelect" name="facultyID">
<option value="0" selected="selected">— Подразделение ЮФУ —</option>
{% for row in Faculties %}
<option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
{% endfor %}
</select>
</div>
</div>
</div>
<div class="stepBox" id="SecondStep">
<div class="step_title">
<span class='step_title_count'>Шаг 2:</span> <span class='step_title_description'>Выберите файл для загрузки</span>
</div>
<div class="step_body">
<input name="students" type="file">
<input type="submit" value="Send">
<div class="stepBox" id="SecondStep">
<div class="step_title">
<span class='step_title_count'>Шаг 2:</span>
<span class='step_title_description'>Выберите файл для загрузки</span>
</div>
<div class="step_body">
<input name="students" type="file">
<input type="submit" value="Send">
</div>
</div>
</div>
</form>
{% endblock %}
\ No newline at end of file
~dev_rating/media/js/admin/students/upload.js
+ 6
− 7
View file @ 71c41141
$(function()
{
$("#facultySelect [value='0']").attr('selected', 'selected');
$('#facultySelect').change(function(){
if (($('#facultySelect option:selected').val()!= '0')) {
$('#SecondStep').css('display', 'block');
}
});
var jFaculty = $('#facultySelect');
jFaculty.change(function() {
var item = jFaculty.find('option:selected').val();
$('#SecondStep').css('display', Number(item) ? 'block' : 'none');
});
});
\ No newline at end of file
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