Zobrazování stavu kola (též na stránce soutěže)

d4c91749 · Martin Mareš · c81a8a06 · d4c91749 · d4c91749 · d4c91749
Commit d4c91749 authored Jan 5, 2021 by Martin Mareš
--- a/mo/web/__init__.py
+++ b/mo/web/__init__.py
@@ -35,6 +35,20 @@ root_logger.setLevel(logging.DEBUG)
 locale.setlocale(locale.LC_COLLATE, 'cs_CZ.UTF-8')
+# Naše filtry pro Jinju
+def filter_timeformat(dt):
+    if dt is None:
+        return '–'
+    else:
+        return dt.astimezone().strftime("%Y-%m-%d %H:%M")
+app.jinja_env.filters['timeformat'] = filter_timeformat
+# Inicializace požadavků a nucená autorizace
 class NeedLoginError(werkzeug.exceptions.Forbidden):
    description = 'Need to log in'


--- a/mo/web/templates/base.html
+++ b/mo/web/templates/base.html
@@ -3,7 +3,7 @@
 <head>
 	<title>Odevzdávací systém MO</title>
 	<link rel=stylesheet href="{{ url_for('static', filename='bootstrap.min.css') }}" type='text/css' media=all>
-	<link rel=stylesheet href="{{ url_for('static', filename='mo.css') }}?v=1" type='text/css' media=all>
+	<link rel=stylesheet href="{{ url_for('static', filename='mo.css') }}?v=2" type='text/css' media=all>
 {% block head %}{% endblock %}
 </head>
 <body>


--- a/mo/web/templates/org_contest.html
+++ b/mo/web/templates/org_contest.html
@@ -8,6 +8,10 @@
 	<tr><td>Pořadí<td>{{ contest.round.seq }}
 	<tr><td>Název<td>{{ contest.round.name }}
 	<tr><td>Oblast<td><a href='{{ url_for('org_place', id=contest.place.place_id) }}'>{{ contest.place.name }}</a>
+	<tr><td>Stav<td class='rstate-{{contest.round.state.name}}'>{{ contest.round.state.friendly_name() }}
+	<tr><td>Začátek odevzdávání<td>{{ contest.round.submit_start|timeformat }}
+	<tr><td>Konec pro účastníky<td>{{ contest.round.ct_submit_end|timeformat }}
+	<tr><td>Konec pro dozor<td>{{ contest.round.pr_submit_end|timeformat }}
 </table>
 {% if can_manage %}


--- a/mo/web/templates/org_contest_root.html
+++ b/mo/web/templates/org_contest_root.html
@@ -10,6 +10,7 @@
 			<th>Pořadí
 			<th>Oblast
 			<th>Název
+			<th>Stav
 		</thead>
 	{% for r in rounds %}
 		<tr>
@@ -19,6 +20,7 @@
 			<td>{{ r.seq }}
 			<td>{{ level_names[r.level] }}
 			<td>{{ r.name }}
+			<td class='rstate-{{r.state.name}}'>{{ r.state.friendly_name() }}
 	{% endfor %}
 	</table>
 {% endblock %}
--- a/mo/web/templates/org_round.html
+++ b/mo/web/templates/org_round.html
@@ -8,6 +8,10 @@
 	<tr><td>Pořadí<td>{{ round.seq }}
 	<tr><td>Název<td>{{ round.name }}
 	<tr><td>Oblast<td>{{ level_names[round.level] }}
+	<tr><td>Stav<td class='rstate-{{round.state.name}}'>{{ round.state.friendly_name() }}
+	<tr><td>Začátek odevzdávání<td>{{ round.submit_start|timeformat }}
+	<tr><td>Konec pro účastníky<td>{{ round.ct_submit_end|timeformat }}
+	<tr><td>Konec pro dozor<td>{{ round.pr_submit_end|timeformat }}
 </table>
 {% if can_manage %}


--- a/static/mo.css
+++ b/static/mo.css
@@ -68,3 +68,21 @@ nav#main-menu a.active {
 	content:"*";
 	color:red;
 }
+/* Round states */
+.rstate-preparing {
+	color: red;
+}
+.rstate-running {
+	color: green;
+}
+.rstate-grading {
+	color: magenta;
+}
+.rstate-closed {
+	color: black;
+}