diff --git a/utils/templatetags/contest.py b/utils/templatetags/contest.py index 818d7f6..04b144f 100644 --- a/utils/templatetags/contest.py +++ b/utils/templatetags/contest.py @@ -1,22 +1,20 @@ # coding=utf-8 import datetime -from django.utils.timezone import localtime +from django.utils.timezone import now def get_contest_status(contest): - now = datetime.datetime.now() - if localtime(contest.start_time).replace(tzinfo=None) > now: + if contest.start_time > now(): return "没有开始" - if localtime(contest.end_time).replace(tzinfo=None) < now: + if contest.end_time < now(): return "已经结束" return "正在进行" def get_contest_status_color(contest): - now = datetime.datetime.now() - if localtime(contest.start_time).replace(tzinfo=None) > now: + if contest.start_time > now(): return "info" - if localtime(contest.end_time).replace(tzinfo=None) < now: + if contest.end_time < now(): return "warning" return "success"