Skip to content
Snippets Groups Projects
Commit e8ffb7c8 authored by Jan Prachař's avatar Jan Prachař
Browse files

style: Round/contest states

parent 0dfe6a34
Branches
No related tags found
No related merge requests found
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
{% if site %} {% if site %}
<tr><td>Soutěžní místo<td><a href='{{ url_for('org_place', id=site.place_id) }}'>{{ site.name }}</a> <tr><td>Soutěžní místo<td><a href='{{ url_for('org_place', id=site.place_id) }}'>{{ site.name }}</a>
{% endif %} {% endif %}
<tr><td>Stav<td><span class='rstate-{{state.name}}'>{{ state.friendly_name() }}</span> <tr><td>Stav<td><span>{{ state.friendly_name() }}</span>
{% if round.state != RoundState.delegate %} {% if round.state != RoundState.delegate %}
(určeno nastavením kola) (určeno nastavením kola)
{% endif %} {% endif %}
<tr><td>Stav pro účastníky<td><span class='rstate-{{ct_state.name}}'>{{ ct_state.friendly_name() }}</span> <tr><td>Stav pro účastníky<td><span>{{ ct_state.friendly_name() }}</span>
<tr><td>Vaše role<td>{% if g.user.is_admin %}správce{% elif roles %}{{ roles|join(", ") }}{% else %}–{% endif %} <tr><td>Vaše role<td>{% if g.user.is_admin %}správce{% elif roles %}{{ roles|join(", ") }}{% else %}–{% endif %}
{% if group_contests|length > 1 %} {% if group_contests|length > 1 %}
<tr><td>Soutěže ve skupině kol:<td> <tr><td>Soutěže ve skupině kol:<td>
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
<tr><th colspan=2>Základní nastavení <tr><th colspan=2>Základní nastavení
</thead> </thead>
<tr><td>Název<td>{{ round.name }} <tr><td>Název<td>{{ round.name }}
<tr><td>Stav<td class='rstate-{{round.state.name}}'>{{ round.state.friendly_name() }} <tr><td>Stav<td>{{ round.state.friendly_name() }}
{% with state=round.ct_state() %} {% with state=round.ct_state() %}
<tr><td>Stav pro účastníky<td class='rstate-{{state.name}}'>{{ state.friendly_name() }} <tr><td>Stav pro účastníky<td>{{ state.friendly_name() }}
{% endwith %} {% endwith %}
<tr><td>Režim přihlašování<td>{{ round.enroll_mode.friendly_name() }} <tr><td>Režim přihlašování<td>{{ round.enroll_mode.friendly_name() }}
<tr><td>Popis v přihlášce<td>{{ round.enroll_advert }} <tr><td>Popis v přihlášce<td>{{ round.enroll_advert }}
...@@ -103,7 +103,15 @@ ...@@ -103,7 +103,15 @@
<tr> <tr>
<td><a href='{{ url_for('org_contest', id=c.contest_id) }}'>{{ c.place.name }}</a> <td><a href='{{ url_for('org_contest', id=c.contest_id) }}'>{{ c.place.name }}</a>
{% with state=c.state %} {% with state=c.state %}
<td class='rstate-{{state.name}}'>{{ state.friendly_name() }} <td
{% if state == RoundState.preparing %}
class="warning"
{% elif state == RoundState.running %}
class="success"
{% elif state == RoundState.grading %}
class="info"
{% endif %}>
{{ state.friendly_name() }}
{% endwith %} {% endwith %}
<td>{{ count }} <td>{{ count }}
{% endfor %} {% endfor %}
......
...@@ -13,6 +13,17 @@ ...@@ -13,6 +13,17 @@
<th>Stav <th>Stav
</thead> </thead>
{% for r in rounds %} {% for r in rounds %}
{% if r.state.name == 'preparing' %}
<tr class="warning">
{% elif r.state.name == 'running' %}
<tr class="success">
{% elif r.state.name == 'grading' %}
<tr class="info">
{% elif r.state.name == 'delegate' %}
<tr class="active">
{% else %}
<tr>
{% endif %}
<tr> <tr>
<td><a href='{{ url_for('org_round', id=r.round_id) }}'>{{ r.round_code() }}</a> <td><a href='{{ url_for('org_round', id=r.round_id) }}'>{{ r.round_code() }}</a>
<td>{{ r.year }} <td>{{ r.year }}
...@@ -20,7 +31,7 @@ ...@@ -20,7 +31,7 @@
<td>{{ r.seq }}{{ r.part_code() }} <td>{{ r.seq }}{{ r.part_code() }}
<td>{{ r.get_level().name }} <td>{{ r.get_level().name }}
<td>{{ r.name }} <td>{{ r.name }}
<td class='rstate-{{r.state.name}}'>{{ r.state.friendly_name() }} <td>{{ r.state.friendly_name() }}
{% endfor %} {% endfor %}
</table> </table>
......
...@@ -153,28 +153,6 @@ select.no-scroll::-webkit-scrollbar { ...@@ -153,28 +153,6 @@ select.no-scroll::-webkit-scrollbar {
display: none; display: none;
} }
/* Round states */
.rstate-preparing {
color: red;
}
.rstate-running {
color: green;
}
.rstate-grading {
color: magenta;
}
.rstate-closed {
color: black;
}
.rstate-delegate {
color: #888;
}
/* Jobs */ /* Jobs */
tbody tr.job-running { tbody tr.job-running {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment