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

Страница дисциплины

parent 76558581
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 525 additions and 257 deletions
~dev_rating/application/classes/Controller/Student/Subject.php
+ 23
− 10
View file @ 63590510
...@@ -33,8 +33,13 @@ class Controller_Student_Subject extends Controller_UserEnvi { ...@@ -33,8 +33,13 @@ class Controller_Student_Subject extends Controller_UserEnvi {
$subject['Year'] = $semester['Year']; $subject['Year'] = $semester['Year'];
// Учебная карта дисциплины // Учебная карта дисциплины
$disciplineHandled = array(); $disciplineHandled = array();
$rate = 0; $maxRate = 0; $i = 0; $id = 0; $sRate = 0; $sMaxRate = 0;
$extraRate = 0;
$bonusRate = 0; $bonusMaxRate = 0;
$examRate = 0; $examMaxRate = 0;
$i = 0; $id = 0;
$disciplineHandled['Extra']['Rate'] = 0; $disciplineHandled['Extra']['Rate'] = 0;
foreach($discipline as $row) foreach($discipline as $row)
{ {
if($row['ModuleType'] == 'exam') if($row['ModuleType'] == 'exam')
...@@ -42,6 +47,8 @@ class Controller_Student_Subject extends Controller_UserEnvi { ...@@ -42,6 +47,8 @@ class Controller_Student_Subject extends Controller_UserEnvi {
$disciplineHandled['Exam']['Rate'] = (int) $row['Rate']; $disciplineHandled['Exam']['Rate'] = (int) $row['Rate'];
$disciplineHandled['Exam']['MaxRate'] = (int) $row['MaxRate']; $disciplineHandled['Exam']['MaxRate'] = (int) $row['MaxRate'];
$disciplineHandled['Exam']['Date'] = $row['Date']; $disciplineHandled['Exam']['Date'] = $row['Date'];
$examRate += $row['Rate'];
$examMaxRate += (int) $row['MaxRate'];
} }
else if($row['ModuleType'] == 'bonus') else if($row['ModuleType'] == 'bonus')
{ {
...@@ -49,12 +56,13 @@ class Controller_Student_Subject extends Controller_UserEnvi { ...@@ -49,12 +56,13 @@ class Controller_Student_Subject extends Controller_UserEnvi {
$disciplineHandled['Bonus']['Rate'] = (int) $row['Rate']; $disciplineHandled['Bonus']['Rate'] = (int) $row['Rate'];
$disciplineHandled['Bonus']['MaxRate'] = (int) $row['MaxRate']; $disciplineHandled['Bonus']['MaxRate'] = (int) $row['MaxRate'];
$disciplineHandled['Bonus']['Date'] = $row['Date']; $disciplineHandled['Bonus']['Date'] = $row['Date'];
$bonusRate += $row['Rate'];
$bonusMaxRate += (int) $row['MaxRate'];
} }
else if($row['ModuleType'] == 'extra') { else if($row['ModuleType'] == 'extra') {
$disciplineHandled['Extra']['Description'] = $row['Description']; $disciplineHandled['Extra']['Description'] = $row['Description'];
$disciplineHandled['Extra']['Rate'] += (int) $row['Rate']; $disciplineHandled['Extra']['Rate'] += (int) $row['Rate'];
// $disciplineHandled['Extra']['Date'] = $row['Date']; $extraRate += (int) $row['Rate'];
} }
else else
...@@ -82,16 +90,21 @@ class Controller_Student_Subject extends Controller_UserEnvi { ...@@ -82,16 +90,21 @@ class Controller_Student_Subject extends Controller_UserEnvi {
$disciplineHandled['Modules'][$i]['Submodules'][$j]['Rate'] = (int) $row['Rate']; $disciplineHandled['Modules'][$i]['Submodules'][$j]['Rate'] = (int) $row['Rate'];
$disciplineHandled['Modules'][$i]['Submodules'][$j]['Date'] = $row['Date']; $disciplineHandled['Modules'][$i]['Submodules'][$j]['Date'] = $row['Date'];
$disciplineHandled['Modules'][$i]['Submodules'][$j]['MaxRate'] = (int) $row['MaxRate']; $disciplineHandled['Modules'][$i]['Submodules'][$j]['MaxRate'] = (int) $row['MaxRate'];
$sRate += (int) $row['Rate'];
$sMaxRate += (int) $row['MaxRate'];
} }
$rate += $row['Rate'];
if ($row['ModuleType'] != 'extra') {
$maxRate += $row['MaxRate'];
}
} }
$disciplineHandled['ModulesCount'] = $i; $disciplineHandled['ModulesCount'] = $i;
$disciplineHandled['Rate'] = (int) $rate;
$disciplineHandled['MaxRate'] = (int) $maxRate; $disciplineHandled['SemesterRate'] = (int) $sRate;
$disciplineHandled['SemesterMaxRate'] = (int) $sMaxRate;
$disciplineHandled['ExamRate'] = (int) $examRate;
$disciplineHandled['ExamMaxRate'] = (int) $examMaxRate;
$disciplineHandled['BonusRate'] = (int) $bonusRate;
$disciplineHandled['BonusMaxRate'] = (int) $bonusMaxRate;
$disciplineHandled['ExtraRate'] = (int) $extraRate;
// ПРЕДСТАВЛЕНИЕ // ПРЕДСТАВЛЕНИЕ
$twig = Twig::factory('student/subject'); $twig = Twig::factory('student/subject');
$twig->User = $this->UserInfo; $twig->User = $this->UserInfo;
......
~dev_rating/application/views/base.twig
+ 11
− 15
View file @ 63590510
...@@ -19,36 +19,35 @@ ...@@ -19,36 +19,35 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{% block title %}{% endblock %} | {{ System.Title }}</title> <title>{% block title %}{% endblock %} | {{ System.Title }}</title>
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300|PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'>
{{ HTML.style('media/less/reset.css')|raw }} {{ HTML.style('media/less/reset.css')|raw }}
{{ HTML.style('media/less/common.css')|raw }} {{ HTML.style('media/less/common.css')|raw }}
{{ HTML.style('media/less/modal.css')|raw }} {{ HTML.style('media/less/modal.css')|raw }}
{{ HTML.style('media/css/messages.css')|raw }} {{ HTML.style('media/css/messages.css')|raw }}
{{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }}
{{ HTML.script('media/js/config.js')|raw }} {{ HTML.script('media/js/config.js')|raw }}
{{ HTML.script('media/js/messages.js')|raw }} {{ HTML.script('media/js/messages.js')|raw }}
{{ HTML.script('media/js/profile.js')|raw }} {{ HTML.script('media/js/profile.js')|raw }}
{{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }} {{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }}
{{ HTML.script('media/js/jquery.sha1.js')|raw }} {{ HTML.script('media/js/jquery.sha1.js')|raw }}
{{ HTML.script('media/js/ui/jquery-ui.js')|raw }}
{{ HTML.style('media/css/theme/jquery-ui.css')|raw }}
{{ HTML.style('media/css/error.css')|raw }}
{{ HTML.script('media/js/errDialog.js')|raw }}
{# {#
{{ HTML.style('media/css/global.css')|raw }} {{ HTML.style('media/css/global.css')|raw }}
<script> <script>
$(function() { $(function() {
$('input, textarea').placeholder(); $('input, textarea').placeholder();
}); });
</script> </script>
{{ HTML.script('media/js/ui/jquery-ui.js')|raw }}
{{ HTML.style('media/css/theme/jquery-ui.css')|raw }}
{{ HTML.style('media/js/event_inspector/event_inspector.css')|raw }} {{ HTML.style('media/js/event_inspector/event_inspector.css')|raw }}
{{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }} {{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }}
{{ HTML.style('media/css/error.css')|raw }}
{{ HTML.script('media/js/errDialog.js')|raw }}
#} #}
{% block media %} {% block media %}
{% endblock %} {% endblock %}
...@@ -66,9 +65,7 @@ ...@@ -66,9 +65,7 @@
<div class="faculty alignLeft">{{ User.FacultyName }}</div> <div class="faculty alignLeft">{{ User.FacultyName }}</div>
<div class="navigation"> <div class="navigation">
<div id = "top_user_messages"> <div id = "top_user_messages">
{{ HTML.image('media/img/messageIcon.png', {'height': '11px'})|raw }} {{ HTML.image('media/img/messageIcon.png', {'height': '11px'})|raw }} (1)
<!-- <div class="top_user_messages_icon"><img src="~dev_rating/~dev_rating/media/img/addList.png"></div> -->
(1)
</div> </div>
{# include 'messages/messages' #} {# include 'messages/messages' #}
<div id="username"> <div id="username">
...@@ -103,9 +100,7 @@ ...@@ -103,9 +100,7 @@
</h3> </h3>
</div> </div>
<div class="main_content {% block main_content_classes %}{% endblock %}"> <div class="main_content {% block main_content_classes %}{% endblock %}">
{% block main_content %} {% block main_content %}{% endblock %}
{% endblock %}
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
...@@ -118,8 +113,9 @@ ...@@ -118,8 +113,9 @@
</div> </div>
</div> </div>
</div> </div>
{% include 'popup/support' %}
</div> </div>
{% include 'popup/support' %}
{% include 'popup/sign' %} {% include 'popup/sign' %}
</body> </body>
</html> </html>
\ No newline at end of file
~dev_rating/application/views/profile/student.twig
+ 13
− 13
View file @ 63590510
<div class="profile_wrapper" id="profileInfo" style="display: none;"> <div class="profile_wrapper" id="profileInfo" style="display: none;">
<div class="profile_clearFix"> <div class="clearFix">
<div class="username">{{ User.First }} {{ User.Second }} {{ User.Last }}</div> <div class="username">{{ User.First }} {{ User.Second }} {{ User.Last }}</div>
</div> </div>
<div class="profile_clearFix"> <div class="clearFix">
<div class="label">Подразделение:</div> <div class="label">Подразделение:</div>
<div class="labeled_info">{{ User.FacultyName }}</div> <div class="content">{{ User.FacultyName }}</div>
</div> </div>
<div class="profile_clearFix"> <div class="clearFix">
<div class="label">Направление:</div> <div class="label">Направление:</div>
<div class="labeled_info">{{ User.SpecName }}</div> <div class="content">{{ User.SpecName }}</div>
</div> </div>
<div class="profile_clearFix profile_delimeter"> <div class="clearFix profile_delimeter">
<div class="label">Курс, группа:</div> <div class="label">Курс, группа:</div>
<div class="labeled_info">{{ User.Degree }}, {{ User.GradeNum }} курс, {{ User.GroupNum }} группа</div> <div class="content">{{ User.Degree }}, {{ User.GradeNum }} курс, {{ User.GroupNum }} группа</div>
</div> </div>
<div class="profile_clearFix"> <div class="clearFix">
<div class="label">Тип аккаунта:</div> <div class="label">Тип аккаунта:</div>
<div class="labeled_info">{{ User.Role }}</div> <div class="content">{{ User.Role }}</div>
</div> </div>
<div class="profile_clearFix"> <div class="clearFix">
<div class="label">Логин:</div> <div class="label">Логин:</div>
<div class="labeled_info">{{ User.Login }}</div> <div class="content">{{ User.Login }}</div>
</div> </div>
<div class="profile_clearFix"> <div class="clearFix">
<div class="label">E-Mail:</div> <div class="label">E-Mail:</div>
<div class="labeled_info">{{ User.EMail }}</div> <div class="content">{{ User.EMail }}</div>
</div> </div>
</div> </div>
\ No newline at end of file
~dev_rating/application/views/student/index.twig
+ 2
− 2
View file @ 63590510
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
{% block main_content_classes %}sidePadding{% endblock %} {% block main_content_classes %}sidePadding{% endblock %}
{% block main_top_title %}Дисциплины{% endblock %} {% block main_top_title %}Дисциплины{% endblock %}
{% block main_content %} {% block main_content %}
<div class="semesterSelect"> <div class="pageTitle">
<h2>Осенний семестр 2014/2015 учебного года</h2> <h2>Осенний семестр 2014/2015 учебного года</h2>
</div> </div>
<div class="tableLegend"> <div class="help">
<a href="#">Помощь</a> <a href="#">Помощь</a>
</div> </div>
{% if disciplines|length > 0 %} {% if disciplines|length > 0 %}
......
~dev_rating/application/views/student/subject.twig
+ 144
− 76
View file @ 63590510
{% extends 'base' %} {% extends 'base' %}
{% block media %} {# head -> css, js #} {% block media %} {# head -> css, js #}
{{ HTML.style('media/css/student/subject.css')|raw }} {{ HTML.style('media/less/student/subject.css')|raw }}
{% endblock %} {% endblock %}
{% macro event(event_name, event_date, event_ball, event_max_ball) %} {% macro event(event_name, event_date, event_ball, event_max_ball) %}
...@@ -13,108 +13,176 @@ ...@@ -13,108 +13,176 @@
{% endmacro %} {% endmacro %}
{% import _self as map %} {% import _self as map %}
{% block title %}{{ Discipline.Title|default('УКД') }}{% endblock %} {% block title %}{{ Discipline.Title|default('УКД') }}{% endblock %}
{% block main_top_title %}Учебная карта дисциплины{% endblock %} {% block main_top_title %}Учебная карта дисциплины{% endblock %}
{% block main_content_classes %}sidePadding{% endblock %}
{% block main_content %} {% block main_content %}
<div class="mapHeader">
<div class="pageTitle">
<h2>{{ Discipline.Title|default('---') }}</h2>
</div>
<div class="help">
<a href="#">Помощь</a>
</div>
<div class="disciplineInfo first">
<div class="clearFix"> <div class="clearFix">
<div class="label">Название дисциплины:</div> <div class="label">Форма аттестации:</div>
<div class="labeled_info discTitle">{{ Discipline.Title|default('---') }}</div> <div class="content">{{ Discipline.Control|default('---') }}</div>
</div> </div>
<div class="clearFix"> <div class="clearFix">
<div class="label">Преподаватели:</div> <div class="label">Семестр:</div>
<div class="labeled_info"> <div class="content">
{% for teacher in Discipline.Teachers %} {{ Discipline.Num }} семестр {{ Discipline.Year }}/{{ Discipline.Year + 1 }} учебного года
<div>{{ teacher }}</div>
{% endfor %}
</div> </div>
</div> </div>
</div>
<div class="disciplineInfo last">
<div class="clearFix"> <div class="clearFix">
<div class="label">Кафедра:</div> <div class="label">Кафедра:</div>
<div class="labeled_info">{{ Discipline.DepName }}</div> <div class="content">{{ Discipline.DepName }}</div>
</div>
<div class="clearFix">
<div class="label">Форма аттестации:</div>
<div class="labeled_info">{{ Discipline.Control|default('---') }}</div>
</div> </div>
<div class="clearFix"> <div class="clearFix">
<div class="label">Семестр:</div> <div class="label">Преподаватели:</div>
<div class="labeled_info">{{ Discipline.Num }} семестр {{ Discipline.Year }}/{{ Discipline.Year + 1 }} учебного года</div> <div class="content">
{% for teacher in Discipline.Teachers %}
{{ teacher }}{% if not loop.last %},{% endif %}
{% endfor %}
</div>
</div> </div>
<div class="clearFix"> <div class="clearFix">
<div class="label">Учебных часов:</div> <div class="label">Учебная нагрузка:</div>
<div class="labeled_info">{{ Discipline.LectionCount }} ч. теории, {{ Discipline.PracticeCount }} ч. практики и {{ Discipline.LabCount }} ч. лаб. занятий</div> <div class="content">
{% if (Discipline.PracticeCount) and (Discipline.LabCount) %}
{% set FirstConjuction = ',' %}
{% set SecondConjuction = ' и' %}
{% elseif (Discipline.PracticeCount) or (Discipline.LabCount) %}
{% if Discipline.LectionCount %}
{% set FirstConjuction = ' и' %}
{% else %}
{% set SecondConjuction = ' и' %}
{% endif %}
{% endif %}
{% if Discipline.LectionCount %}
{{ Discipline.LectionCount }}
{{ Rus.NumEnding(Discipline.LectionCount, ['час', 'часа', 'часов']) }}
теории{{ FirstConjuction }}
{% endif %}
{% if Discipline.PracticeCount %}
{{ Discipline.PracticeCount }}
{{ Rus.NumEnding(Discipline.PracticeCount, ['час', 'часа', 'часов']) }}
практики{{ SecondConjuction }}
{% endif %}
{% if Discipline.LabCount %}
{{ Discipline.LabCount }}
{{ Rus.NumEnding(Discipline.LabCount, ['час', 'часа', 'часов']) }}
лабораторных занятий
{% endif %}
</div>
</div> </div>
</div> </div>
<div class="mapContent">
{% for Module in DisciplineMap.Modules %} <h3 class="blockTitle">Баллы за семестр</h3>
<div class="moduleBlock">
{{ Module.Title }} <div class="blockMargin">
{% for Module in DisciplineMap.Modules %}
<div class="tableTitle Module">
{{ Module.Title }}
</div>
{% for Submodule in Module.Submodules %}
<div class="submoduleBlock">
<div class="submoduleTitle">{{ Submodule.Title }}</div>
<div class="submoduleRate">
{{ Submodule.Rate }} / {{ Submodule.MaxRate }}
</div> </div>
{% for Submodule in Module.Submodules %} <div class="submodulePercent">
<div class="submoduleBlock"> {% if Submodule.MaxRate <= 0 %}
<div class="submoduleTitle">{{ Submodule.Title }}</div> 0
<div class="submoduleRate"> {% else %}
{{ Submodule.Rate }} / {{ Submodule.MaxRate }} {{ (Submodule.Rate * 100) // Submodule.MaxRate }} %
</div>
<div class="submodulePercent">
{% if Submodule.MaxRate <= 0 %}
0
{% else %}
{{ (Submodule.Rate * 100) // Submodule.MaxRate }} %
{% endif %}
</div>
<div class="submoduleDate">
{% if Submodule.Date != 0 %}
{{ Submodule.Date|date('d.m.Y') }}
{% else %}
---
{% endif %}
</div>
</div>
{% if loop.last %}
<div class="moduleResult">
Итого за модуль: {{ Module.Rate }} / {{ Module.MaxRate }}
</div>
{% endif %}
{% endfor %}
{% endfor %}
{% if DisciplineMap.Bonus is not empty %}
<div class="bonusBlock">
<div class="bonusTitle">Бонусные баллы</div>
<div class="bonusRate">{{ DisciplineMap.Bonus.Rate }} / {{ DisciplineMap.Bonus.MaxRate }}</div>
<div class="bonusPercent">
{% if DisciplineMap.Bonus.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Bonus.Rate * 100) // DisciplineMap.Bonus.MaxRate }} %
{% endif %} {% endif %}
</div> </div>
<div class="bonusDate"> <div class="submoduleDate">
{% if DisciplineMap.Bonus.Date != 0 %} {% if Submodule.Date != 0 %}
{{ DisciplineMap.Bonus.Date|date('d.m.Y') }} {{ Submodule.Date|date('d.m.Y') }}
{% else %} {% else %}
--- ---
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% if loop.last %}
<div class="moduleResult">
Итого за модуль: {{ Module.Rate }} / {{ Module.MaxRate }}
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
<h3 class="blockTitle">Допуск к экзамену</h3>
<div class="blockMargin">
{% set Admission = 38 - DisciplineMap.SemesterRate %}
{% if Admission > 0 %}
Для допуска к экзамену Вам необходимо получить еще {{ Admission }} {{ Rus.NumEnding(Discipline.LectionCount, ['балл', 'балла', 'баллов']) }}.
{% else %}
Поздравляем, заработанных Вами баллов достаточно для получения допуска к экзамену!
{% endif %}
{% if ExtraRate %}
<div class="blockMargin">
<div class="submoduleBlock topBorder">
<div class="submoduleTitle">Добор баллов</div>
<div class="submoduleRate">{{ DisciplineMap.Extra.Rate }}</div>
<div class="submodulePercent">&nbsp;</div>
<div class="submoduleDate">---</div>
</div>
</div>
{% endif %} {% endif %}
</div>
{% if DisciplineMap.Extra is not empty %}
<div class="bonusBlock"> <div class="totalRate">
<div class="bonusTitle">Добор баллов</div> Промежуточный итог: {{ DisciplineMap.SemesterRate + DisciplineMap.ExtraRate }} / {{ DisciplineMap.SemesterMaxRate }}
<div class="bonusRate">{{ DisciplineMap.Extra.Rate }}</div> </div>
<h3 class="blockTitle">Экзамен</h3>
<div class="blockMargin">
<div class="tableTitle Extra">
Экзамен по курсу &laquo;{{ Discipline.Title|default('---') }}&raquo;
</div>
{% if DisciplineMap.Bonus is not empty %}
<div class="submoduleBlock">
<div class="submoduleTitle">Бонусные баллы</div>
<div class="submoduleRate">
{{ DisciplineMap.Bonus.Rate }} / {{ DisciplineMap.Bonus.MaxRate }}
</div> </div>
<div class="submodulePercent">
{% if DisciplineMap.Bonus.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Bonus.Rate * 100) // DisciplineMap.Bonus.MaxRate }} %
{% endif %}
</div>
<div class="submoduleDate">
{% if DisciplineMap.Bonus.Date != 0 %}
{{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
{% else %}
---
{% endif %}
</div>
</div>
{% endif %} {% endif %}
{% if DisciplineMap.Exam is not empty %} {% if DisciplineMap.Exam is not empty %}
<div class="examBlock"> <div class="submoduleBlock">
<div class="examTitle">Экзамен по курсу &laquo;{{ Discipline.Title|default('---') }}&raquo;</div> <div class="submoduleTitle">Экзамен по курсу &laquo;{{ Discipline.Title|default('---') }}&raquo;</div>
<div class="examRate">{{ DisciplineMap.Exam.Rate }} / {{ DisciplineMap.Exam.MaxRate }}</div> <div class="submoduleRate">{{ DisciplineMap.Exam.Rate }} / {{ DisciplineMap.Exam.MaxRate }}</div>
<div class="examPercent"> <div class="submodulePercent">
{% if DisciplineMap.Exam.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Exam.Rate * 100) // DisciplineMap.Exam.MaxRate }} % {% endif %} {% if DisciplineMap.Exam.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Exam.Rate * 100) // DisciplineMap.Exam.MaxRate }} % {% endif %}
</div> </div>
<div class="examDate"> <div class="submoduleDate">
{% if DisciplineMap.Exam.Date != 0 %} {% if DisciplineMap.Exam.Date != 0 %}
{{ DisciplineMap.Exam.Date|date('d.m.Y') }} {{ DisciplineMap.Exam.Date|date('d.m.Y') }}
{% else %} {% else %}
...@@ -123,9 +191,9 @@ ...@@ -123,9 +191,9 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div>
<div class="disciplineResult">
Итого: {{ DisciplineMap.Rate }} / {{ DisciplineMap.MaxRate }} <div class="totalRate">
</div> Итоговый рейтинг: {{ DisciplineMap.SemesterRate + DisciplineMap.ExtraRate + DisciplineMap.BonusRate + DisciplineMap.ExamRate }} / 100
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
~dev_rating/media/css/error.css
+ 1
− 40
View file @ 63590510
body
{
font-family: Lucida Grande,Verdana,Tahoma,Arial,Sans-Serif,Lucida Sans;
font-size: 15px;
background-color: #f9f9f9;
}
.page_layout .page_layout
{ {
margin: 3% auto; margin: 3% auto;
...@@ -33,19 +26,6 @@ body ...@@ -33,19 +26,6 @@ body
color: #aaaaaa; color: #aaaaaa;
} }
.footer
{
margin-top: 20px;
border-top: 1px solid #c1c1c1;
text-align: center;
padding: 4px;
color: #c1c1c1;
}
/* Buttons */
* {font-family: Arial, Tahoma, Lucida Grande, Sans-Serif, Lucida Sans;}
#errButton { #errButton {
position: fixed; position: fixed;
z-index: 300; z-index: 300;
...@@ -53,7 +33,6 @@ body ...@@ -53,7 +33,6 @@ body
left: 0; left: 0;
width: 35px; width: 35px;
height: 73px; height: 73px;
/*padding: 12px 0;*/
text-align: center; text-align: center;
background-color: #3a84a6; /*#6DAD53;*/ background-color: #3a84a6; /*#6DAD53;*/
-webkit-border-radius: 0 5px 5px 0; -webkit-border-radius: 0 5px 5px 0;
...@@ -85,14 +64,12 @@ body ...@@ -85,14 +64,12 @@ body
.ui-dialog .ui-dialog-titlebar .ui-dialog .ui-dialog-titlebar
{ {
height: 15px; /* or whatever you want */ height: 15px;
font-size: 12px;
} }
.dialogTopText { .dialogTopText {
text-align: center; text-align: center;
font: 11pt sans-serif;
color: #787977; color: #787977;
} }
...@@ -101,13 +78,10 @@ body ...@@ -101,13 +78,10 @@ body
.dialogMyMessagesBtn { .dialogMyMessagesBtn {
margin: 10px auto 5px auto; margin: 10px auto 5px auto;
text-align: center; text-align: center;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
background-color: #3a84a6; background-color: #3a84a6;
font: 10pt sans-serif;
color: #FFFFFF; color: #FFFFFF;
} }
...@@ -124,11 +98,8 @@ body ...@@ -124,11 +98,8 @@ body
margin-left: 15px; margin-left: 15px;
margin-right: 15px; margin-right: 15px;
margin-top: 5px; margin-top: 5px;
height: 0; height: 0;
background-color: #fff5d7; background-color: #fff5d7;
font: 9pt sans-serif;
color: #000000; color: #000000;
} }
...@@ -150,8 +121,6 @@ body ...@@ -150,8 +121,6 @@ body
padding: 9px; padding: 9px;
border: solid 1px #E5E5E5; border: solid 1px #E5E5E5;
outline: 0; outline: 0;
font: normal 13px/100% Verdana, Tahoma, sans-serif;
box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px; box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
-moz-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px; -moz-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
-webkit-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px; -webkit-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
...@@ -159,7 +128,6 @@ body ...@@ -159,7 +128,6 @@ body
} }
.dialogTextMessage { .dialogTextMessage {
/* border: 1px solid black;*/
margin-left: 13px; margin-left: 13px;
margin-right: 13px; margin-right: 13px;
margin-top: 5px; margin-top: 5px;
...@@ -176,9 +144,6 @@ body ...@@ -176,9 +144,6 @@ body
overflow: auto; overflow: auto;
width: 100%; width: 100%;
height: 100%; height: 100%;
/*border: 1px solid black*/
padding: 9px; padding: 9px;
border: solid 1px #E5E5E5; border: solid 1px #E5E5E5;
outline: 0; outline: 0;
...@@ -199,13 +164,9 @@ body ...@@ -199,13 +164,9 @@ body
text-align: center; text-align: center;
padding: 5px; padding: 5px;
/* width: 70px;
height: 20px;*/
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
/*background-color: #3a84a6;*/
font: 9pt sans-serif; font: 9pt sans-serif;
color: #FFFFFF; color: #FFFFFF;
} }
......
~dev_rating/media/css/student/subject.css
+ 29
− 29
View file @ 63590510
...@@ -34,56 +34,56 @@ ...@@ -34,56 +34,56 @@
color: #333; color: #333;
} }
.moduleBlock
.examBlock
{ {
background-color: #3399cc; margin-top: 10px;
padding: 5px; padding: 5px;
text-align: center; background: #fff;
color: #FFF; border: 3px solid #ffb100;
margin-top: 10px;
} }
.submoduleBlock .bonusBlock
{ {
padding: 5px; margin-top: 10px;
border-bottom: 1px solid #ccc; padding: 5px;
background: #fff;
border: 3px solid #3399cc;
} }
.examBlock .disciplineResult
{ {
margin-top: 10px; padding: 5px;
padding: 5px; margin-top: 10px;
background: #fff; text-align: center;
border: 3px solid #ffb100; color: #fff;
background: forestgreen;
font-weight: 600;
} }
.bonusBlock .moduleResult
{ {
margin-top: 10px; padding: 5px;
padding: 5px; border-bottom: 1px solid #ccc;
background: #fff; text-align: center;
border: 3px solid #3399cc; background: #f1f1f1;
font-weight: 600;
} }
.disciplineResult .moduleBlock
{ {
background-color: #3399cc;
padding: 5px; padding: 5px;
margin-top: 10px;
text-align: center; text-align: center;
color: #fff; color: #FFF;
background: forestgreen; margin-top: 10px;
font-weight: 600;
} }
.moduleResult .submoduleBlock
{ {
padding: 5px; padding: 5px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
text-align: center;
background: #f1f1f1;
font-weight: 600;
} }
.submoduleBlock:hover .submoduleBlock:hover
{ {
background: #f1f1f1; background: #f1f1f1;
......
~dev_rating/media/less/circles.css
+ 8
− 8
View file @ 63590510
...@@ -5,31 +5,31 @@ ...@@ -5,31 +5,31 @@
min-height: 45px; min-height: 45px;
border-radius: 50%; border-radius: 50%;
vertical-align: middle; vertical-align: middle;
color: #FBFEFF; color: #eef1f2;
text-align: center; text-align: center;
} }
.Circle.Undefined { .Circle.Undefined {
background: #777; background: #a0a3a3;
} }
.Circle.ECTS-F { .Circle.ECTS-F {
background: #8A2E15; background: #8a2e15;
} }
.Circle.ECTS-FX { .Circle.ECTS-FX {
background: #D46141; background: #d46141;
} }
.Circle.ECTS-E { .Circle.ECTS-E {
background: #EDEC51; background: #edec51;
color: #212121; color: #212121;
} }
.Circle.ECTS-D { .Circle.ECTS-D {
background: #7EBA3C; background: #7eba3c;
} }
.Circle.ECTS-C { .Circle.ECTS-C {
background: #28AE57; background: #28ae57;
} }
.Circle.ECTS-B { .Circle.ECTS-B {
background: #349920; background: #349920;
} }
.Circle.ECTS-A { .Circle.ECTS-A {
background: #367F27; background: #367f27;
} }
~dev_rating/media/less/circles.less
+ 11
− 9
View file @ 63590510
@import (reference) "common.less";
.Circle{ .Circle{
display: inline-block; display: inline-block;
padding: 15px 9px; padding: 15px 9px;
...@@ -5,15 +7,15 @@ ...@@ -5,15 +7,15 @@
min-height: 45px; min-height: 45px;
border-radius: 50%; border-radius: 50%;
vertical-align: middle; vertical-align: middle;
color: #FBFEFF; color: @ColorWhite;
text-align: center; text-align: center;
} }
.Circle.Undefined { background: #777; } .Circle.Undefined { background: @ColorGrey; }
.Circle.ECTS-F { background: #8A2E15; } .Circle.ECTS-F { background: @Color_ECTSF; }
.Circle.ECTS-FX { background: #D46141; } .Circle.ECTS-FX { background: @Color_ECTSFX }
.Circle.ECTS-E { background: #EDEC51; color: #212121; } .Circle.ECTS-E { background: @Color_ECTSE; color: @ColorText; }
.Circle.ECTS-D { background: #7EBA3C; } .Circle.ECTS-D { background: @Color_ECTSD; }
.Circle.ECTS-C { background: #28AE57; } .Circle.ECTS-C { background: @Color_ECTSC; }
.Circle.ECTS-B { background: #349920; } .Circle.ECTS-B { background: @Color_ECTSB; }
.Circle.ECTS-A { background: #367F27; } .Circle.ECTS-A { background: @Color_ECTSA; }
\ No newline at end of file \ No newline at end of file
~dev_rating/media/less/common.css
+ 15
− 7
View file @ 63590510
...@@ -22,7 +22,18 @@ h2 { ...@@ -22,7 +22,18 @@ h2 {
font-size: 1.5em; font-size: 1.5em;
} }
h3 { h3 {
font-size: 1.17em; font-size: 1.2em;
}
.clearFix {
clear: both;
}
.clearFix .label {
float: left;
width: 200px;
color: #6d7070;
}
.clearFix .content {
overflow: hidden;
} }
.header_wrapper { .header_wrapper {
-webkit-box-shadow: 0 5px 5px #e1e2e2; -webkit-box-shadow: 0 5px 5px #e1e2e2;
...@@ -69,16 +80,13 @@ h3 { ...@@ -69,16 +80,13 @@ h3 {
-webkit-box-shadow: 0 0 5px #a0a3a3; -webkit-box-shadow: 0 0 5px #a0a3a3;
box-shadow: 0 0 5px #a0a3a3; box-shadow: 0 0 5px #a0a3a3;
} }
.profile_clearFix { .profile_wrapper .clearFix {
padding: 5px; padding: 5px;
margin: 0 auto;
} }
.profile_clearFix .label { .profile_wrapper .clearFix .label {
float: left;
width: 130px; width: 130px;
color: #757575;
} }
.profile_clearFix .username { .profile_wrapper .username {
font-weight: 600; font-weight: 600;
} }
.profile_wrapper .profile_delimeter { .profile_wrapper .profile_delimeter {
......
~dev_rating/media/less/common.less
+ 60
− 41
View file @ 63590510
...@@ -2,21 +2,30 @@ ...@@ -2,21 +2,30 @@
// Цвета, шрифты // Цвета, шрифты
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
@CWhiten: #FBFEFF; @ColorWhiten: #FBFEFF;
@CWhite: #EEF1f2; @ColorWhite: #EEF1f2;
@CGrey: #A0A3A3; @ColorLightGrey: lighten(@ColorGrey, 20%);
@ColorGrey: #A0A3A3;
@ColorDarkGrey: darken(@ColorGrey, 20%);
@ColorText: #212121; @ColorText: #212121;
@ColorLightBlue: #0183CE; @ColorLightBlue: #0183CE;
@ColorBlue: #004573; @ColorBlue: #004573;
@ColorGreen: #009933; @ColorGreen: #009933;
@CActive: #F0622E; @ColorActive: #F0622E;
@Color_Undefined: #777;
@Color_ECTSF: #8A2E15;
@Color_ECTSFX: #D46141;
@Color_ECTSE: #EDEC51;
@Color_ECTSD: #7EBA3C;
@Color_ECTSC: #28AE57;
@Color_ECTSB: #349920;
@Color_ECTSA: #367F27;
@FontFamily: 'PT Sans', sans-serif; @FontFamily: 'PT Sans', sans-serif;
@FontFamilyTitle: 'Open Sans Condensed', sans-serif; @FontFamilyTitle: 'PT Sans Narrow', sans-serif;
@FontSize_Small: 0.9em; @FontSizeSmall: 0.9em;
@FontSize_Normal: 0.95em; @FontSizeNormal: 0.95em;
@FontSize_Medium: 10pt;
@FontSize_Large: 10pt;
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
// Макросы // Макросы
...@@ -42,7 +51,7 @@ ...@@ -42,7 +51,7 @@
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
body body
{ {
background-color: @CWhite; background-color: @ColorWhite;
font-family: @FontFamily; font-family: @FontFamily;
color: @ColorText; color: @ColorText;
line-height: 1.1; line-height: 1.1;
...@@ -51,15 +60,15 @@ body ...@@ -51,15 +60,15 @@ body
a, a:link a, a:link
{ {
font-size: @FontSize_Small; font-size: @FontSizeSmall;
color: @ColorLightBlue; color: @ColorLightBlue;
text-decoration: none; text-decoration: none;
} }
a:hover a:hover
{ {
font-size: @FontSize_Small; font-size: @FontSizeSmall;
color: @CActive; color: @ColorActive;
} }
...@@ -79,24 +88,39 @@ h2 ...@@ -79,24 +88,39 @@ h2
} }
h3 h3
{ {
font-size: 1.17em; font-size: 1.2em;
}
.clearFix
{
clear: both;
.label
{
float: left;
width: 200px;
color: @ColorDarkGrey;
}
.content
{
overflow: hidden;
}
} }
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
// Header // Header
// --------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------------
.header_wrapper .header_wrapper
{ {
.box-shadow(0 5px 5px, lighten(@CGrey, 25%)); .box-shadow(0 5px 5px, lighten(@ColorGrey, 25%));
font-size: @FontSize_Small; font-size: @FontSizeSmall;
padding: 12px 20px; padding: 12px 20px;
background-color: @CWhiten; background-color: @ColorWhiten;
> .alignLeft > .alignLeft
{ {
display: inline-block; display: inline-block;
} }
a a
{ {
font-size: @FontSize_Small; font-size: @FontSizeSmall;
} }
.logotype .logotype
{ {
...@@ -104,11 +128,11 @@ h3 ...@@ -104,11 +128,11 @@ h3
} }
.faculty .faculty
{ {
color: @CGrey; color: @ColorGrey;
} }
.navigation .navigation
{ {
color: @CGrey; color: @ColorGrey;
display: inline; display: inline;
text-align: right; text-align: right;
float: right; float: right;
...@@ -126,29 +150,24 @@ h3 ...@@ -126,29 +150,24 @@ h3
.profile_wrapper { .profile_wrapper {
.modalWindow(450px); .modalWindow(450px);
background-color: @CWhiten; background-color: @ColorWhiten;
font-size: @FontSize_Small; font-size: @FontSizeSmall;
padding: 5px; padding: 5px;
right: 15px; right: 15px;
top: 45px; top: 45px;
border-radius: 5px; border-radius: 5px;
.box-shadow(0 0 5px, @CGrey); .box-shadow(0 0 5px, @ColorGrey);
} .clearFix
{
.profile_clearFix padding: 5px;
{ .label
padding: 5px; {
margin: 0 auto; width: 130px;
} }
}
.profile_clearFix .label
{
float: left;
width: 130px;
color: #757575;
} }
.profile_clearFix .username .profile_wrapper .username
{ {
font-weight: 600; font-weight: 600;
} }
...@@ -174,21 +193,21 @@ h3 ...@@ -174,21 +193,21 @@ h3
{ {
margin-bottom: 10px; margin-bottom: 10px;
border-radius: 5px; border-radius: 5px;
background-color: @CWhiten; background-color: @ColorWhiten;
.box-shadow(0 0 5px, @CGrey); .box-shadow(0 0 5px, @ColorGrey);
.main_top .main_top
{ {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
background-color: @ColorLightBlue; background-color: @ColorLightBlue;
color: @CWhite; color: @ColorWhite;
margin: -15px 0px 0px -10px; margin: -15px 0px 0px -10px;
padding: 10px 50px 10px 20px; padding: 10px 50px 10px 20px;
min-width: 15%; min-width: 15%;
} }
.main_content { .main_content {
width: 100%; width: 100%;
font-size: @FontSize_Normal; font-size: @FontSizeNormal;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
padding-top: 35px; padding-top: 35px;
......
~dev_rating/media/less/student/index.css
+ 2
− 2
View file @ 63590510
.semesterSelect { .pageTitle {
display: inline-block; display: inline-block;
} }
.tableLegend { .help {
float: right; float: right;
display: inline-block; display: inline-block;
} }
......
~dev_rating/media/less/student/index.less
+ 6
− 5
View file @ 63590510
@import (reference) "../common.less"; @import (reference) "../common.less";
.semesterSelect .pageTitle
{ {
display: inline-block; display: inline-block;
} }
.tableLegend .help
{ {
float: right; float: right;
display: inline-block; display: inline-block;
} }
.disciplinesList .disciplinesList
{ {
width: 100%; width: 100%;
...@@ -18,12 +19,12 @@ ...@@ -18,12 +19,12 @@
padding: 5px 0; padding: 5px 0;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border-top: 1px solid darken(@CWhite, 5%); border-top: 1px solid darken(@ColorWhite, 5%);
border-bottom: 1px solid darken(@CWhite, 5%); border-bottom: 1px solid darken(@ColorWhite, 5%);
} }
.tableHeader .tableHeader
{ {
background-color: @CWhite; background-color: @ColorWhite;
} }
.discProgress .discProgress
{ {
......
~dev_rating/media/less/student/subject.css 0 → 100644
+ 83
− 0
View file @ 63590510
.pageTitle {
display: inline-block;
}
.help {
float: right;
display: inline-block;
}
h3.blockTitle {
font-size: 1.4em;
border-bottom: 1px solid #d4d5d5;
}
.blockMargin {
margin: 15px 0;
}
.disciplineInfo {
line-height: 1.2;
}
.disciplineInfo.first {
margin-top: 15px;
margin-bottom: 7.5px;
}
.disciplineInfo.last {
margin-top: 7.5px;
margin-bottom: 15px;
}
.tableTitle {
padding: 5px;
text-align: center;
color: #eef1f2;
margin-top: 10px;
}
.tableTitle.Module {
background-color: #0183ce;
}
.tableTitle.Extra {
background-color: #009933;
}
.submoduleBlock {
padding: 5px;
border-bottom: 1px solid #d4d5d5;
}
.submoduleBlock > div {
display: inline-block;
vertical-align: middle;
}
.submoduleBlock .submoduleTitle {
width: 64%;
color: #212121;
}
.submoduleBlock .submoduleRate {
width: 10%;
text-align: center;
}
.submoduleBlock .submodulePercent {
width: 6%;
text-align: center;
}
.submoduleBlock .submoduleDate {
width: 18%;
text-align: center;
color: #6d7070;
}
.submoduleBlock.topBorder {
border-top: 1px solid #d4d5d5;
}
.submoduleBlock:hover {
background: #eef1f2;
}
.moduleResult {
padding: 5px;
border-bottom: 1px solid #d4d5d5;
text-align: center;
background: #eef1f2;
font-weight: 600;
}
.totalRate {
margin: 10px 0;
padding: 10px;
font-weight: 600;
background: #004573;
color: #eef1f2;
text-align: center;
}
~dev_rating/media/less/student/subject.less 0 → 100644
+ 117
− 0
View file @ 63590510
@import (reference) "../common.less";
.pageTitle
{
display: inline-block;
}
.help
{
float: right;
display: inline-block;
}
h3.blockTitle
{
font-size: 1.4em;
border-bottom: 1px solid @ColorLightGrey;
}
.blockMargin
{
margin: 15px 0;
}
.disciplineInfo
{
line-height: 1.2;
}
.disciplineInfo.first
{
margin-top: 15px;
margin-bottom: 7.5px;
}
.disciplineInfo.last
{
margin-top: 7.5px;
margin-bottom: 15px;
}
.tableTitle
{
padding: 5px;
text-align: center;
color: @ColorWhite;
margin-top: 10px;
}
.tableTitle.Module { background-color: @ColorLightBlue; }
.tableTitle.Extra { background-color: @ColorGreen; }
.submoduleBlock
{
padding: 5px;
border-bottom: 1px solid @ColorLightGrey;
> div
{
display: inline-block;
vertical-align: middle;
}
.submoduleTitle
{
width: 64%;
color: @ColorText;
}
.submoduleRate
{
width: 10%;
text-align: center;
}
.submodulePercent
{
width: 6%;
text-align: center;
}
.submoduleDate
{
width: 18%;
text-align: center;
color: @ColorDarkGrey;
}
}
.submoduleBlock.topBorder
{
border-top: 1px solid @ColorLightGrey;
}
.submoduleBlock:hover
{
background: @ColorWhite;
}
.moduleResult
{
padding: 5px;
border-bottom: 1px solid @ColorLightGrey;
text-align: center;
background: @ColorWhite;
font-weight: 600;
}
.totalRate
{
margin: 10px 0;
padding: 10px;
font-weight: 600;
background: @ColorBlue;
color: @ColorWhite;
text-align: center;
}
\ 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