From 5bbc48d4ddc38a87f95279d3bbb842185d82e7a4 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Fri, 3 Jun 2022 12:00:35 +0800
Subject: [PATCH] core: tsdoc.startAt setting

---
 packages/hydrooj/package.json                               | 2 +-
 packages/ui-default/package.json                            | 2 +-
 packages/ui-default/templates/components/contest.html       | 2 +-
 packages/ui-default/templates/contest_detail.html           | 2 +-
 packages/ui-default/templates/contest_main.html             | 2 +-
 packages/ui-default/templates/partials/contest_sidebar.html | 2 +-
 type-challenges                                             | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)
 create mode 160000 type-challenges

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index c1efedd2f..33c3f0061 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.13.13",
+    "version": "3.13.14",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 403a2fc24..9cdfaee9f 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.37.18",
+  "version": "4.37.19",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/components/contest.html b/packages/ui-default/templates/components/contest.html
index 92cddab70..0501817f7 100644
--- a/packages/ui-default/templates/components/contest.html
+++ b/packages/ui-default/templates/components/contest.html
@@ -4,5 +4,5 @@
 {% endmacro %}
 
 {% macro render_duration(tdoc) %}
-{{ ((tdoc.endAt.getTime() - tdoc.beginAt.getTime()) /1000 / 3600)|round(1) }}
+{{ tdoc.duration|round(1) if tdoc.duration else ((tdoc.endAt.getTime() - tdoc.beginAt.getTime()) /1000 / 3600)|round(1) }}
 {% endmacro %}
diff --git a/packages/ui-default/templates/contest_detail.html b/packages/ui-default/templates/contest_detail.html
index 811e1ab7d..f399c5032 100644
--- a/packages/ui-default/templates/contest_detail.html
+++ b/packages/ui-default/templates/contest_detail.html
@@ -13,7 +13,7 @@
       <div class="section__body">
         <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _(model.contest.statusText(tdoc, tsdoc)) }}</span>
         <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-award">{{ _(model.contest.RULES[tdoc.rule].TEXT) }}</span>
-        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Start at') }}: {{ contest.render_time(tdoc.beginAt) }}</span>
+        <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Start at') }}: {{ contest.render_time(tsdoc.startAt or tdoc.beginAt) }}</span>
         <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-schedule">{{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}</span>
         <span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _('Host') }}: {{ user.render_inline(udict[tdoc.owner], badge=false) }}</span>
         <span class="bp4-tag bp4-large bp4-minimal problem__tag-item icon icon-user--multiple">{{ tdoc['attend']|default(0) }}</span>
diff --git a/packages/ui-default/templates/contest_main.html b/packages/ui-default/templates/contest_main.html
index ecc56447f..a4d28b33d 100644
--- a/packages/ui-default/templates/contest_main.html
+++ b/packages/ui-default/templates/contest_main.html
@@ -16,7 +16,7 @@
           </li>
           <li>
             <span class="icon icon-calendar"></span>
-            {{ _('Start at') }}: {{ contest.render_time(tdoc.beginAt) }}
+            {{ _('Start at') }}: {{ contest.render_time(tsdoc.startAt or tdoc.beginAt) }}
           </li>
           <li>
             <span class="icon icon-schedule--fill"></span>
diff --git a/packages/ui-default/templates/partials/contest_sidebar.html b/packages/ui-default/templates/partials/contest_sidebar.html
index 406147151..7ef47d829 100644
--- a/packages/ui-default/templates/partials/contest_sidebar.html
+++ b/packages/ui-default/templates/partials/contest_sidebar.html
@@ -105,7 +105,7 @@
       </dd>
       <dt>{{ _('Rule') }}</dt><dd>{{ model.contest.RULES[tdoc.rule].TEXT }}</dd>
       <dt>{{ _('Problem') }}</dt><dd>{{ tdoc.pids.length }}</dd>
-      <dt>{{ _('Start at') }}</dt><dd>{{ contest.render_time(tdoc.beginAt) }}</dd>
+      <dt>{{ _('Start at') }}</dt><dd>{{ contest.render_time(tsdoc.startAt or tdoc.beginAt) }}</dd>
       <dt>{{ _('End at') }}</dt><dd>{{ contest.render_time(tdoc.endAt) }}</dd>
       <dt>{{ _('Duration') }}</dt><dd>{{ contest.render_duration(tdoc) }} {{ _('hour(s)') }}</dd>
       <dt>{{ _('Host') }}</dt><dd>{{ user.render_inline(owner_udoc, badge=false) }}</dd>
diff --git a/type-challenges b/type-challenges
new file mode 160000
index 000000000..38f0264f7
--- /dev/null
+++ b/type-challenges
@@ -0,0 +1 @@
+Subproject commit 38f0264f7da6b57f1915b1583239b090e91e1470