From 4adb1c0b0ce3888e691083c74f7c34dbc060b72a Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Tue, 25 Aug 2015 10:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oj/contest/contest_problems_list.html | 7 +- template/oj/contest/submissions_list.html | 148 +++++++++--------- utils/templatetags/user.py | 17 ++ 3 files changed, 97 insertions(+), 75 deletions(-) create mode 100644 utils/templatetags/user.py diff --git a/template/oj/contest/contest_problems_list.html b/template/oj/contest/contest_problems_list.html index 4dd68c5..2a863dd 100644 --- a/template/oj/contest/contest_problems_list.html +++ b/template/oj/contest/contest_problems_list.html @@ -41,10 +41,11 @@ {% for item in contest_problems %} - {{ item.sort_index }} + + {{ item.sort_index }} - {{ item.title }} + + {{ item.title }} {{ item|accepted_radio }} diff --git a/template/oj/contest/submissions_list.html b/template/oj/contest/submissions_list.html index 6635219..336e9c3 100644 --- a/template/oj/contest/submissions_list.html +++ b/template/oj/contest/submissions_list.html @@ -2,79 +2,83 @@ {% block body %} -{% load submission %} -
-
- -
- {% if submissions %} - - - - - - - - - - - - {% for item in submissions %} - + {% load submission %} + {% load user %} +
+
+ +
+ {% if submissions %} +
#提交时间结果运行时间语言
+ + + + + + + + + + + + {% for item in submissions %} + - {% ifequal item.user_id request.user.id %} - - {% else %} - - {% endifequal %} + {% ifequal item.user_id request.user.id %} + + {% else %} + + {% endifequal %} - - - + + + + + + + {% endfor %} + + +
#用户提交时间结果运行时间语言
- {{ forloop.counter |add:start_id }}{{ forloop.counter |add:start_id }} + {{ forloop.counter |add:start_id }}{{ forloop.counter |add:start_id }}{{ item.create_time }}{{ item.result|translate_result }} - {% if item.accepted_answer_time %} - {{ item.accepted_answer_time }}ms - {% else %} - -- + {{ item.user_id|get_username }}{{ item.create_time }}{{ item.result|translate_result }} + {% if item.accepted_answer_time %} + {{ item.accepted_answer_time }}ms + {% else %} + -- + {% endif %} + + {{ item.language|translate_language }} +
+ {% else %} +

你还没有提交记录!

+ {% endif %} +
+ {% if next_page %} + + {% endif %} + + + {% endblock %} diff --git a/utils/templatetags/user.py b/utils/templatetags/user.py new file mode 100644 index 0000000..4a81de5 --- /dev/null +++ b/utils/templatetags/user.py @@ -0,0 +1,17 @@ +# coding=utf-8 +import datetime +from account.models import User + + +def get_username(user_id): + try: + return User.objects.get(id=user_id).username + except User.DoesNotExist: + return "" + + +from django import template + +register = template.Library() +register.filter("get_username", get_username) +