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

1. Цвета кружочков

2. Ссылка в Base
parent 6be0c9a9
Branches
Tags
No related merge requests found
...@@ -13,7 +13,6 @@ class Controller_Student_Index extends Controller_UserEnvi { ...@@ -13,7 +13,6 @@ class Controller_Student_Index extends Controller_UserEnvi {
foreach($disciplines as $row) foreach($disciplines as $row)
{ {
$i++; $i++;
$color = 0;
$disciplinesHandled[$i]['ID'] = $row['ID']; $disciplinesHandled[$i]['ID'] = $row['ID'];
if($row['ExamType'] == 'exam') if($row['ExamType'] == 'exam')
{ {
...@@ -73,7 +72,7 @@ class Controller_Student_Index extends Controller_UserEnvi { ...@@ -73,7 +72,7 @@ class Controller_Student_Index extends Controller_UserEnvi {
$color = 5; $color = 5;
elseif($percent >= 0.85 AND $percent <= 0.94) elseif($percent >= 0.85 AND $percent <= 0.94)
$color = 6; $color = 6;
elseif($percent >= 0.95 AND $percent <= 1) elseif($percent >= 0.95)
$color = 7; $color = 7;
if($examRate !== NULL AND $examRate < 22) if($examRate !== NULL AND $examRate < 22)
$color = 2; $color = 2;
......
...@@ -70,9 +70,12 @@ ...@@ -70,9 +70,12 @@
{{ User.First }} {{ User.Last }} {{ User.First }} {{ User.Last }}
</div> </div>
| |
{% if User.RoleMark == 4 %} {% if User.RoleMark == 16 %}
{{ HTML.anchor('admin', 'Администрирование', {'title': 'Перейти в панель управления системой'})|raw }} {{ HTML.anchor('dean_office', 'Деканат')|raw }}
{% endif %} {% endif %}
{% if User.RoleMark == 4 %}
{{ HTML.anchor('admin', 'Администрирование', {'title': 'Перейти в панель управления системой'})|raw }}
{% endif %}
{{ HTML.anchor('/', 'Главная страница', {'title': 'Перейти на главную страницу'})|raw }} {{ HTML.anchor('/', 'Главная страница', {'title': 'Перейти на главную страницу'})|raw }}
{{ HTML.anchor('settings', 'Настройки', {'title': 'Настроить аккаунт'})|raw }} {{ HTML.anchor('settings', 'Настройки', {'title': 'Настроить аккаунт'})|raw }}
{{ HTML.anchor('sign/out', 'Выход', {'title': 'Выйти из системы'})|raw }} {{ HTML.anchor('sign/out', 'Выход', {'title': 'Выйти из системы'})|raw }}
......
{% extends 'base' %} {% extends 'base' %}
{% macro subject(i, HTML) %} {% macro subject(i, HTML) %}
<tr class="course_content"> <tr class="course_content">
<td class="{{ i.ColorScheme }}"> <td class="{{ i.ColorScheme }}">
<div class='Circle'></div> <div class='Circle'></div>
</td> </td>
<td class = "course_name"> <td class = "course_name">
{{ HTML.anchor('subject/' ~ i.ID, i.Title)|raw }} {{ HTML.anchor('subject/' ~ i.ID, i.Title)|raw }}
</td> </td>
<td class="course_teacher"> <td class="course_teacher">
{% for teacher in i.Teachers %} {% for teacher in i.Teachers %}
<div>{{ teacher }}</div> <div>{{ teacher }}</div>
{% else %} {% else %}
--- ---
{% endfor %} {% endfor %}
</td> </td>
<td class="course_form_control"> <td class="course_form_control">
{{ i.Control }} {{ i.Control }}
</td> </td>
<td class="course_rating_value"> <td class="course_rating_value">
{{ i.Rate|default('0') }} / {{ i.MaxCurrentRate|default('0') }} / {{ i.MaxRate }} {{ i.Rate|default('0') }} / {{ i.MaxCurrentRate|default('0') }} / {{ i.MaxRate }}
</td> </td>
<td class="course_rating_percent"> <td class="course_rating_percent">
{% if i.MaxCurrentRate != 0 %} {% if i.MaxCurrentRate != 0 %}
{% if i.Rate > i.MaxCurrentRate %} {% if i.Rate > i.MaxCurrentRate %}
100% 100%
{% else %} {% else %}
{{ (100 * i.Rate) // i.MaxCurrentRate }} % {{ (100 * i.Rate) // i.MaxCurrentRate }} %
{% endif %} {% endif %}
{% else %} {% else %}
--- ---
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% endmacro %} {% endmacro %}
{% import 'student/index' as res %} {% import 'student/index' as res %}
......
...@@ -96,27 +96,27 @@ tr.course_content td { ...@@ -96,27 +96,27 @@ tr.course_content td {
} }
.ECTS-F > .Circle { .ECTS-F > .Circle {
background: #f60; background: #8A2E15;
} }
.ECTS-FX > .Circle { .ECTS-FX > .Circle {
background: #e56800; background: #D46141;
} }
.ECTS-E > .Circle { .ECTS-E > .Circle {
background: #ffb100; background: #EDEC51;
} }
.ECTS-D > .Circle { .ECTS-D > .Circle {
background: #ffd000; background: #7EBA3C;
} }
.ECTS-C > .Circle { .ECTS-C > .Circle {
background: #70c300; background: #28AE57;
} }
.ECTS-B > .Circle { .ECTS-B > .Circle {
background: #059e00; background: #349920;
} }
.ECTS-A > .Circle { .ECTS-A > .Circle {
background: #009404; background: #367F27;
} }
.course_rating_percent > div .course_rating_percent > div
......
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