Added statistics button + fixed stats page buttons highlight
This commit is contained in:
parent
afec8e59e4
commit
2ec95dcb00
@ -15,21 +15,27 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
href="{% url 'profile' %}">Профиль</a>
|
href="{% url 'profile' %}">Профиль</a>
|
||||||
{% if perms.main.has_control_access %}
|
{% if perms.main.has_control_access %}
|
||||||
<a {% if control_lit %}
|
<a {% if control_lit %}
|
||||||
class="btn btn-primary"
|
class="btn btn-primary"
|
||||||
{% else %}
|
{% else %}
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
href="{% url 'control' %}">Управление</a>
|
href="{% url 'control' %}">Управление</a>
|
||||||
|
<a {% if stats_lit %}
|
||||||
|
class="btn btn-primary"
|
||||||
|
{% else %}
|
||||||
|
class="btn btn-secondary"
|
||||||
|
{% endif %}
|
||||||
|
href="{% url 'statistic' %}">Статистика</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a {% if work_lit %}
|
<a {% if work_lit %}
|
||||||
class="btn btn-primary"
|
class="btn btn-primary"
|
||||||
{% else %}
|
{% else %}
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
href="{% url 'work' request.user.id %}">Запрос прав</a>
|
href="{% url 'work' request.user.id %}">Запрос прав</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
|
<a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
|
||||||
</div>
|
</div>
|
||||||
@ -40,13 +46,13 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
href="/accounts/login">Войти</a>
|
href="/accounts/login">Войти</a>
|
||||||
<a {% if registration_lit %}
|
<a {% if registration_lit %}
|
||||||
class="btn btn-primary"
|
class="btn btn-primary"
|
||||||
{% else %}
|
{% else %}
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
href="/accounts/register">Зарегистрироваться</a>
|
href="/accounts/register">Зарегистрироваться</a>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
{% for radio in form.interval%}
|
{% for radio in form.interval%}
|
||||||
{{ radio.tag }}
|
{{ radio.tag }}
|
||||||
<label class="btn btn-secondary text-primary bg-white" for="{{ radio.id_for_label }}">
|
<label class="btn btn-outline-secondary" for="{{ radio.id_for_label }}">
|
||||||
{{ radio.choice_label }}
|
{{ radio.choice_label }}
|
||||||
</label>
|
</label>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@ -39,7 +39,7 @@
|
|||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
{% for radio in form.display_format%}
|
{% for radio in form.display_format%}
|
||||||
{{ radio.tag }}
|
{{ radio.tag }}
|
||||||
<label class="btn btn-secondary text-primary bg-white" for="{{ radio.id_for_label }}">
|
<label class="btn btn-outline-secondary" for="{{ radio.id_for_label }}">
|
||||||
{{ radio.choice_label }}
|
{{ radio.choice_label }}
|
||||||
</label>
|
</label>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@ -67,7 +67,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-row text-center">
|
<div class="form-row text-center">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<button type="submit" class="btn btn-primary bg-white text-primary">Посмотреть статистику</button>
|
<button type="submit" class="btn btn-outline-primary">Посмотреть статистику</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
@ -35,7 +35,7 @@ from .models import UserProfile
|
|||||||
|
|
||||||
|
|
||||||
def setup_context(profile_lit: bool = False, control_lit: bool = False, work_lit: bool = False,
|
def setup_context(profile_lit: bool = False, control_lit: bool = False, work_lit: bool = False,
|
||||||
registration_lit: bool = False, login_lit: bool = False):
|
registration_lit: bool = False, login_lit: bool = False, stats_lit: bool = False):
|
||||||
print(profile_lit, control_lit, work_lit, registration_lit, login_lit)
|
print(profile_lit, control_lit, work_lit, registration_lit, login_lit)
|
||||||
context = {
|
context = {
|
||||||
'profile_lit': profile_lit,
|
'profile_lit': profile_lit,
|
||||||
@ -43,6 +43,7 @@ def setup_context(profile_lit: bool = False, control_lit: bool = False, work_lit
|
|||||||
'work_lit': work_lit,
|
'work_lit': work_lit,
|
||||||
'registration_lit': registration_lit,
|
'registration_lit': registration_lit,
|
||||||
'login_lit': login_lit,
|
'login_lit': login_lit,
|
||||||
|
'stats_lit': stats_lit,
|
||||||
}
|
}
|
||||||
return context
|
return context
|
||||||
|
|
||||||
@ -410,7 +411,7 @@ def statistic_page(request: WSGIRequest) -> HttpResponse:
|
|||||||
|
|
||||||
if not request.user.is_superuser:
|
if not request.user.is_superuser:
|
||||||
return redirect('index')
|
return redirect('index')
|
||||||
context = setup_context()
|
context = setup_context(stats_lit=True)
|
||||||
context.update({
|
context.update({
|
||||||
'pagename': 'страница статистики',
|
'pagename': 'страница статистики',
|
||||||
'errors': list(),
|
'errors': list(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user