From 017f546445f29772fcc1b68960b11083b977fb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com> Date: Thu, 4 Sep 2014 19:30:59 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BD=D0=B0=D0=B4=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=BE=D0=BC=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5=D0=B9=20=D0=B2=20=D0=B0?= =?UTF-8?q?=D0=B4=D0=BC=D0=B8=D0=BD-=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/classes/FileParser.php | 4 +- .../views/admin/students/profile.twig | 64 +++++++++++++++++++ ~dev_rating/media/css/admin/infoPage.css | 0 ~dev_rating/media/js/profile.js | 2 +- 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 ~dev_rating/application/views/admin/students/profile.twig create mode 100644 ~dev_rating/media/css/admin/infoPage.css diff --git a/~dev_rating/application/classes/FileParser.php b/~dev_rating/application/classes/FileParser.php index b2da18dda..af1a2ea33 100644 --- a/~dev_rating/application/classes/FileParser.php +++ b/~dev_rating/application/classes/FileParser.php @@ -11,8 +11,8 @@ class FileParser $i = 0; while ($line = fgetcsv($file, 0, ";")) { - if($i > 0) - { + if($i > 0) + { // РРјСЏ, фамилия, отчество list($lastName, $firstName, $secondName) = self::parsePeopleName($line[0]); // РљСѓСЂСЃ, степень подготовки diff --git a/~dev_rating/application/views/admin/students/profile.twig b/~dev_rating/application/views/admin/students/profile.twig new file mode 100644 index 000000000..4bee00206 --- /dev/null +++ b/~dev_rating/application/views/admin/students/profile.twig @@ -0,0 +1,64 @@ +{% extends "admin/base" %} + +{% block media %} +{{ HTML.style('media/css/admin/searchBox.css')|raw }} +{{ HTML.script('media/js/admin/students/index.js')|raw }} +{% endblock %} + +{% block title %}Студенты{% endblock %} +{% block main_top_title %}Управление студентами{% endblock %} + +{% block main_content %} + + <div class='search'> + <div class='search_box'> + <div class='search_inputs'> + <div class='search_mainInput'> + <input type='text' placeholder="РџРѕРёСЃРє РїРѕ фамилии, имени, отчеству"> + </div> + <div class='search_inputFilters'> + <div class='filterLarge'> + <select id="facultySelect"> + <option value="0">--- Подразделение ЮФУ ---</option> + {% for row in Faculties %} + <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option> + {% endfor %} + </select> + </div> + <div class='filter'> + <select id="gradeSelect"> + <option value="0">--- РљСѓСЂСЃ ---</option> + {% for Degree in Grades %} + <optgroup label="{{ Degree.Title }}"> + {% for Grade in Degree.Grades %} + <option value="{{ Grade.ID }}">{{ Grade.Num }} РєСѓСЂСЃ</option> + {% endfor %} + </optgroup> + {% endfor %} + </select> + </div> + <div class='filter'> + <select id="studyGroupSelect"> + <option value="0">--- Учебная РіСЂСѓРїРїР° ---</option> + </select> + </div> + </div> + </div> + </div> + <div class='search_results'> + <div class='search_results_title' id="search_title"> + + </div> + <div class='results' id='search_results'> + <div class='search_results_title'>Для отображения СЃРїРёСЃРєР° студентов <b>выберите</b> РѕРґРёРЅ РёР· пунктов или <b>введите</b> запрос РІ РїРѕРёСЃРєРѕРІРѕРµ поле.</div> + </div> + </div> + </div> + <div class="action_bar"> + {{ admin.action(URL.site('admin/students/add'), URL.site('media/img/addUser.png'), 'Добавить РЅРѕРІРѕРіРѕ студента', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ студента. '~ + 'Для него будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} + {{ admin.action(URL.site('admin/students/upload'), URL.site('media/img/uploadList.png'), 'Загрузить СЃРїРёСЃРѕРє студентов', + 'Загрузить РІ систему '~System.Title~' СЃРїРёСЃРѕРє студентов РёР· заранее подготовленных csv-файлов. '~ + 'Для каждого студента, загруженного данной утилитой, будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} + </div> +{% endblock %} \ No newline at end of file diff --git a/~dev_rating/media/css/admin/infoPage.css b/~dev_rating/media/css/admin/infoPage.css new file mode 100644 index 000000000..e69de29bb diff --git a/~dev_rating/media/js/profile.js b/~dev_rating/media/js/profile.js index 35b206b5c..f5b7e85e1 100644 --- a/~dev_rating/media/js/profile.js +++ b/~dev_rating/media/js/profile.js @@ -12,6 +12,6 @@ $(function() { $('#profileInfo').css('display', 'block'); isOpened = true; - } + } }); }); \ No newline at end of file -- GitLab