比赛递交

templates/components/problem.html

@@ -3,8 +3,8 @@
   <a
   {%- if tdoc is none %}
     href="/p/{{ pdoc.pid }}"
-  {%- elif tdoc['doc_type'] == vj4.model.document.TYPE_CONTEST %}
-    href="/t/{{ tdoc._id }}/{{ pdoc._id }}"
+  {%- else %}
+    href="/c/{{ tdoc._id }}/p/{{ pdoc._id }}"
   {%- endif %}
   >
   {%- endif %}

templates/contest_detail.html

@@ -46,12 +46,12 @@
             {% if handler.hasPerm(perm.PERM_LOGGEDIN) %}
               {% if psdict[pid] and psdict[pid].rid %}
               {% set rdoc = rdict[psdict[pid].rid] %}
-              {% if handler.can_show_record(tdoc) %}
+              {% if handler.canShowRecord(tdoc) %}
                 {{ record.render_status_td(rdoc) }}
               {% else %}
                 <td class="col--status record-status--border"><a href="/r/{{ rdoc._id }}">{{ _('Submitted') }}</a></td>
               {% endif %}
-                <td class="col--submit-at">{{ datetime_span(rdoc._id) }}</td>
+                <td class="col--submit-at">{{ datetime_span(rdoc._id)|safe }}</td>
               {% else %}
                 <td class="col--status record-status--border">{{ _('No Submissions') }}</td>
                 <td class="col--submit-at">-</td>

templates/homework_detail.html

@@ -19,7 +19,7 @@
     {% if handler.is_not_started(tdoc) %}
       {{ nothing.render('This homework is not open and you cannot view problems.') }}
     {% else %}
-    {% if attended or handler.is_done(tdoc) %}
+    {% if attended or model.contest.is_done(tdoc) %}
       <div class="section__body no-padding">
         <table class="data-table">
           <colgroup>

templates/homework_main.html

@@ -47,7 +47,7 @@
                     {{ _('Open Since') }}: {{ datetime_span(tdoc['begin_at']) }}
                   </li>
                   <li>
-                  {% if handler.is_homework_extended(tdoc) or handler.is_done(tdoc) %}
+                  {% if handler.is_homework_extended(tdoc) or model.homework.is_done(tdoc) %}
                     {{ _('Hard Deadline') }}: {{ datetime_span(tdoc['end_at']) }}
                   {% else %}
                     {{ _('Deadline') }}: {{ datetime_span(tdoc['penalty_since']) }}

templates/partials/homework_sidebar.html

@@ -22,7 +22,7 @@
         <span class="icon icon-homework"></span> {{ _('View Homework') }}
       </a></li>
     {% endif %}
-    {% if not attended and not handler.is_done(tdoc) %}
+    {% if not attended and not model.contest.is_done(tdoc) %}
       <li class="menu__item">
     {% if handler.hasPerm(perm.PERM_ATTEND_HOMEWORK) and handler.hasPerm(perm.PERM_LOGGEDIN) %}
         <form action="{{ reverse_url('homework_detail', tid=tdoc['doc_id']) }}" method="POST">

templates/partials/problem_sidebar_contest.html

@@ -7,7 +7,7 @@
 {% endif %}
   <div>
     <ol class="menu">
-    {% if handler.is_ongoing(tdoc) %}
+    {% if model.contest.is_ongoing(tdoc) %}
     {% if page_name == 'contest_detail_problem' %}
       <li class="menu__item scratchpad--hide"><a class="menu__link highlight" name="problem-sidebar__open-scratchpad" href="javascript:;" data-global-hotkey="alt+e">
         <span class="icon icon-enlarge"></span> {{ _('Open Scratchpad') }} (Alt+E)
@@ -16,19 +16,19 @@
         <span class="icon icon-enlarge"></span> {{ _('Quit Scratchpad') }} (Alt+Q)
       </a></li>
     {% else %}
-      <li class="menu__item"><a class="menu__link" href="{{ reverse_url('contest_detail_problem', tid=tdoc['doc_id'], pid=pdoc['_id']) }}">
+      <li class="menu__item"><a class="menu__link" href="/c/{{ tdoc._id }}/p/{{ pdoc._id }}">
         <span class="icon icon-flag"></span> {{ _('View Problem') }}
       </a></li>
     {% endif %}
-      <li class="menu__item scratchpad--hide"><a class="menu__link{% if page_name == 'contest_detail_problem_submit' %} active{% endif %}" href="/t/{{ tdoc._id }}/p/{{ pdoc._id }}">
+      <li class="menu__item scratchpad--hide"><a class="menu__link{% if page_name == 'contest_detail_problem_submit' %} active{% endif %}" href="/c/{{ tdoc._id }}/p/{{ pdoc._id }}/submit">
         <span class="icon icon-send"></span> {{ _('Submit') }}
       </a></li>
-    {% elif handler.is_done(tdoc) %}
+    {% elif model.contest.is_done(tdoc) %}
       <li class="menu__item scratchpad--hide"><a class="menu__link" href="/p/{{ pdoc.pid }}">
         <span class="icon icon-send"></span> {{ _('Open in Problem Set') }}
       </a></li>
     {% endif %}
-    {% if handler.own(pdoc, perm.PERM_EDIT_PROBLEM_SELF) or handler.hasPerm(perm.PERM_EDIT_PROBLEM) %}
+    {% if pdoc.owner == handler.user._id or handler.hasPerm(perm.PERM_EDIT_PROBLEM) %}
       <li class="menu__seperator"></li>
       <li class="menu__item"><a class="menu__link{% if page_name == 'problem_edit' %} active{% endif %}" href="/p/{{ pdoc.pid }}/edit">
         <span class="icon icon-edit"></span>  {{ _('Edit') }}

templates/partials/problem_sidebar_homework.html

@@ -23,7 +23,7 @@
       <li class="menu__item scratchpad--hide"><a class="menu__link{% if page_name == 'homework_detail_problem_submit' %} active{% endif %}" href="{{ reverse_url('homework_detail_problem_submit', tid=tdoc['doc_id'], pid=pdoc['_id']) }}">
         <span class="icon icon-send"></span> {{ _('Submit') }}
       </a></li>
-    {% elif handler.is_done(tdoc) %}
+    {% elif model.contest.is_done(tdoc) %}
       <li class="menu__item scratchpad--hide"><a class="menu__link" href="/p/{{ pdoc.pid }}">
         <span class="icon icon-send"></span> {{ _('Open in Problem Set') }}
       </a></li>

templates/problem_detail.html

@@ -30,7 +30,7 @@
         {% endif %}
         {% if tdoc %}
         {% if tdoc['doc_type'] == vj4.model.document.TYPE_CONTEST %}
-        {% if handler.is_done(tdoc) %}
+        {% if model.contest.is_done(tdoc) %}
           <blockquote class="note">
             <p>{{ _('You cannot submit for this problem because the contest is ended. You can click "Open in Problem Set" to view this problem in normal mode.') }}</p>
           </blockquote>