From 5f4d17a8ccb6b019c9edc05f192eb2863a0ab7ce Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Wed, 9 Feb 2022 21:20:54 +0300 Subject: [PATCH] color --- templates/set.html | 6 +++++- templates/set_settings.html | 2 +- templates/task.html | 6 +++++- templates/tasks.html | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/set.html b/templates/set.html index 38a277d..4023390 100644 --- a/templates/set.html +++ b/templates/set.html @@ -1,5 +1,7 @@ {% extends 'base_main.html' %} +{% load filters %} + {% block title %}{{ set.name }}{% endblock %} {% block main %} @@ -7,7 +9,9 @@

{{ set.description }}

Таски

{% for settask in set.settasks_ordered %} - {{ settask.name }}. {{ settask.task.name }}
+ {% with result=user|solved:settask.task %} + {{ settask.name }}. {{ settask.task.name }}
+ {% endwith %} {% endfor %}

Время начала: {% if not set.start_time %}без ограничений{% else %}{{ set.start_time_moscow }}{% endif %}
diff --git a/templates/set_settings.html b/templates/set_settings.html index 6a02a25..f2b1f51 100644 --- a/templates/set_settings.html +++ b/templates/set_settings.html @@ -16,7 +16,7 @@

Таски

- {% for settask in settasks %} + {% for settask in set.settasks_ordered %} {% if settask.task.creator == user or user.username in settask.task.editors %}{{ settask.task.name }}{% else %}{{ settask.task.name }}{% endif %}
{% endfor %} diff --git a/templates/task.html b/templates/task.html index d09d4ef..277282b 100644 --- a/templates/task.html +++ b/templates/task.html @@ -1,5 +1,7 @@ {% extends 'base_main.html' %} +{% load filters %} + {% block title %}{{ task.name }}{% endblock %} {% block scripts %} @@ -114,7 +116,9 @@
{{ set.name }}
{% for settask in setTask.set.settasks_ordered %} - {% if task == settask.task %}{% endif %}{{ settask.name }}. {{ settask.task.name }}{% if task == settask.task %}{% endif %}
+ {% with result=user|solved:settask.task %} + {% if task == settask.task %}{% endif %}{{ settask.name }}. {{ settask.task.name }}{% if task == settask.task %}{% endif %}
+ {% endwith %} {% endfor %}
{% endif %} diff --git a/templates/tasks.html b/templates/tasks.html index 959c6c4..f02b1e5 100644 --- a/templates/tasks.html +++ b/templates/tasks.html @@ -47,7 +47,7 @@ {% for task in user.userinfo.available_tasks %} {% with result=user|solved:task %} - {{ task.name }} {% if task.creator == user or user.username in task.editors %} {% endif %}
+ {{ task.name }} {% if task.creator == user or user.username in task.editors %} {% endif %}
{% endwith %} {% endfor %} {% endblock %} \ No newline at end of file