From c3c2505b4dfffaf46e5d87b052918861f86d7a92 Mon Sep 17 00:00:00 2001 From: Martin Mares <mj@ucw.cz> Date: Mon, 29 Mar 2021 16:48:22 +0200 Subject: [PATCH] =?UTF-8?q?Opravena=20pr=C3=A1ce=20se=20stavy=20kol/sout?= =?UTF-8?q?=C4=9B=C5=BE=C3=AD=20v=20org=5Fcontest.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mo/web/templates/org_contest.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mo/web/templates/org_contest.html b/mo/web/templates/org_contest.html index 2675f9e0..203a7ddc 100644 --- a/mo/web/templates/org_contest.html +++ b/mo/web/templates/org_contest.html @@ -1,5 +1,7 @@ {% extends "base.html" %} {% set round = contest.round %} +{% set state = contest.state %} +{% set ct_state = contest.ct_state() %} {% set site_id = site.place_id if site else None %} {% block title %} @@ -16,15 +18,11 @@ {% if site %} <tr><td>Soutěžní místo<td><a href='{{ url_for('org_place', id=site.place_id) }}'>{{ site.name }}</a> {% endif %} - {% with state=contest.state %} <tr><td>Stav<td><span class='rstate-{{state.name}}'>{{ state.friendly_name() }}</span> {% if round.state != RoundState.delegate %} (určeno nastavením kola) {% endif %} - {% endwith %} - {% with state=contest.ct_state() %} - <tr><td>Stav pro účastníky<td><span class='rstate-{{state.name}}'>{{ state.friendly_name() }}</span> - {% endwith %} + <tr><td>Stav pro účastníky<td><span class='rstate-{{ct_state.name}}'>{{ ct_state.friendly_name() }}</span> <tr><td>Vaše role<td>{% if g.user.is_admin %}správce{% elif roles %}{{ roles|join(", ") }}{% else %}–{% endif %} {% if group_contests|length > 1 %} <tr><td>Soutěže ve skupině kol:<td> @@ -48,14 +46,14 @@ <div class="btn-group"> <a class="btn btn-primary" href='{{ url_for('org_contest_list', id=contest.contest_id, site_id=site_id) }}'>Seznam účastníků</a> - {% if round.state != RoundState.preparing %} + {% if state != RoundState.preparing %} <a class="btn btn-primary" href='{{ url_for('org_contest_solutions', id=contest.contest_id, site_id=site_id) }}'>Odevzdaná řešení</a> {% endif %} {% if not site %} - {% if round.state in [RoundState.grading, RoundState.closed] %} + {% if state in [RoundState.grading, RoundState.closed] %} <a class="btn btn-primary" href='{{ url_for('org_score', contest_id=contest.contest_id) }}'>Výsledky</a> {% endif %} - {% if round.state == RoundState.preparing and round.seq > 1 %} + {% if state == RoundState.preparing and round.seq > 1 %} <a class="btn btn-primary" href='{{ url_for('org_contest_advance', contest_id=contest.contest_id) }}'>Postup z minulého kola</a> {% endif %} {% if can_manage %} -- GitLab