From 105bcbd1184e1de90abdbdc758e338d1aef32a56 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Tue, 15 Nov 2022 19:57:49 +0800
Subject: [PATCH] core: contest: fix pending display

---
 packages/hydrooj/src/model/contest.ts         | 27 +++++++++++--------
 .../templates/contest_scoreboard.html         |  8 ++----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/packages/hydrooj/src/model/contest.ts b/packages/hydrooj/src/model/contest.ts
index d8207b5a6..b85e0267f 100644
--- a/packages/hydrooj/src/model/contest.ts
+++ b/packages/hydrooj/src/model/contest.ts
@@ -70,7 +70,7 @@ const acm = buildContestRule({
         }
         for (const pid in effective) {
             const j = effective[pid];
-            const real = j.rid.generationTime - Math.floor(tdoc.beginAt.getTime() / 1000);
+            const real = Math.floor((j.rid.getTimestamp().getTime() - tdoc.beginAt.getTime()) / 1000);
             const penalty = 20 * 60 * naccept[j.pid];
             detail[pid] = {
                 ...j, naccept: naccept[j.pid], time: real + penalty, real, penalty,
@@ -143,7 +143,8 @@ const acm = buildContestRule({
         for (const pid of tdoc.pids) {
             const doc = tsddict[pid] || {} as Partial<AcmDetail>;
             const accept = doc.status === STATUS.STATUS_ACCEPTED;
-            const colTime = accept ? formatSeconds(doc.real, false).toString() : '';
+            const pending = doc.status === STATUS.STATUS_WAITING;
+            const colTime = pending ? '?' : accept ? formatSeconds(doc.real, false).toString() : '';
             const colPenalty = doc.rid ? Math.ceil(doc.penalty / 60).toString() : '';
             if (isExport) {
                 row.push(
@@ -151,19 +152,20 @@ const acm = buildContestRule({
                     { type: 'string', value: colPenalty },
                 );
             } else {
+                let value = '';
+                if (doc.rid) value = `-${doc.naccept}`;
+                if (accept) value = `${doc.naccept ? `+${doc.naccept}` : '<span class="icon icon-check"></span>'}\n${colTime}`;
+                if (pending) value = `<span style="color:blue">${doc.naccept}?</span>`;
                 row.push({
                     type: 'record',
                     score: accept ? 100 : 0,
-                    value: accept
-                        ? `${doc.naccept ? `+${doc.naccept}` : '<span class="icon icon-check"></span>'}\n${colTime}`
-                        : doc.rid
-                            ? `-${doc.naccept}`
-                            : '',
+                    value,
                     hover: accept ? formatSeconds(doc.time) : '',
                     raw: doc.rid,
-                    style: accept && doc.rid.generationTime === meta?.first?.[pid]
-                        ? 'background-color: rgb(217, 240, 199);'
-                        : undefined,
+                    style: pending ? 'background-color: yellow'
+                        : accept && doc.rid.generationTime === meta?.first?.[pid]
+                            ? 'background-color: rgb(217, 240, 199);'
+                            : undefined,
                 });
             }
         }
@@ -560,7 +562,10 @@ export async function getStatus(domainId: string, tid: ObjectID, uid: number) {
 
 async function _updateStatus(tdoc: Tdoc<30>, uid: number, rid: ObjectID, pid: number, status: STATUS, score: number) {
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    if (isLocked(tdoc)) status = STATUS.STATUS_WAITING;
+    if (isLocked(tdoc)) {
+        status = STATUS.STATUS_WAITING;
+        score = 0;
+    }
     const tsdoc = await document.revPushStatus(tdoc.domainId, document.TYPE_CONTEST, tdoc.docId, uid, 'journal', {
         rid, pid, status, score,
     }, 'rid');
diff --git a/packages/ui-default/templates/contest_scoreboard.html b/packages/ui-default/templates/contest_scoreboard.html
index fa766f14b..463d0caa4 100644
--- a/packages/ui-default/templates/contest_scoreboard.html
+++ b/packages/ui-default/templates/contest_scoreboard.html
@@ -5,12 +5,8 @@
 
 {% macro renderRecord(cell, canView) %}
   <a href="{{ url('record_detail', rid=cell.raw) if canView else '' }}"{% if cell.hover %} data-tooltip="{{ cell.hover }}"{% endif %}>
-    {%- if cell.status == STATUS.STATUS_WAITING -%}
-      <span style="font-weight:bold;color:yellow">?</span>
-    {%- else -%}
-      {%- set _color = utils.status.getScoreColor(cell.score|default(cell.value)) -%}
-      <span style="font-weight:bold;color:{{ _color }}">{{ cell.value|string|nl2br|safe }}</span>
-    {%- endif -%}
+    {%- set _color = utils.status.getScoreColor(cell.score|default(cell.value)) -%}
+    <span style="font-weight:bold;color:{{ _color }}">{{ cell.value|string|nl2br|safe }}</span>
   </a>
 {% endmacro %}