resolver: add time display

hydro-dev · Nov 18, 2024 · 874411c · 874411c
1 parent f177844
commit 874411c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/packages/onsite-toolkit/frontend/resolver.page.tsx b/packages/onsite-toolkit/frontend/resolver.page.tsx
@@ -33,17 +33,24 @@ interface Props extends DisplaySettings {
   data: ResolverInput;
 }
 
-function status(problem) {
+interface ProblemStatus {
+  old: number;
+  frozen: number;
+  pass: boolean;
+  time: number;
+}
+
+function status(problem: ProblemStatus) {
   if (!problem) return 'untouched';
   if (problem.pass) return 'ac';
   if (!problem.old && !problem.frozen) return 'untouched';
   if (problem.frozen) return 'frozen';
   return 'failed';
 }
 
-function submissions(problem) {
+function submissions(problem: ProblemStatus) {
   const st = status(problem);
-  if (st === 'ac') { return `${problem.old}`; }
+  if (st === 'ac') { return `${problem.old} / ${problem.time}`; }
   if (st === 'frozen') { return `${problem.old}+${problem.frozen}`; }
   if (st === 'failed') { return problem.old; }
   return String.fromCharCode('A'.charCodeAt(0) + problem.index);
@@ -80,6 +87,7 @@ export function start(data: ResolverInput, options: DisplaySettings) {
     else {
       if (submission.verdict === 'AC') {
         problem.pass = true;
+        problem.time = Math.floor(submission.time / 60);
         team.score += 1;
         team.penalty += submission.time + problem.old * 20 * 60;
       }
@@ -129,16 +137,17 @@ export function start(data: ResolverInput, options: DisplaySettings) {
       },
       async revealProblem(teamId: string, problemId: string) {
         const team = teams.find((i) => i.id === teamId);
-        const problem = team?.problems.find((i) => i.id === problemId);
+        const problem: ProblemStatus = team?.problems.find((i) => i.id === problemId);
         if (!team || !problem) return;
         if (allAc.find((s) => s.team === teamId && s.problem === problemId)) {
           const sub = allSubmissions.filter((s) => s.team === teamId && s.problem === problemId);
           let penalty = 0;
           for (const s of sub) {
+            problem.old++;
             if (s.verdict !== 'AC') {
               penalty += 20 * 60;
-              problem.old++;
             } else {
+              problem.time = Math.floor(s.time / 60);
               penalty += s.time;
               break;
             }
@@ -179,7 +188,7 @@ export function start(data: ResolverInput, options: DisplaySettings) {
         const team = clone[orders[i]];
         queueOperations('highlightTeam', team.id, i);
         for (const pinfo of data.problems) {
-          const problem = team.problems.find((idx) => idx.id === pinfo.id);
+          const problem: ProblemStatus = team.problems.find((idx) => idx.id === pinfo.id);
           if (!problem || !problem.frozen || problem.pass) continue;
           queueOperations('highlightProblem', pinfo.id);
           queueOperations('revealProblem', team.id, pinfo.id);
@@ -188,10 +197,11 @@ export function start(data: ResolverInput, options: DisplaySettings) {
             const sub = allSubmissions.filter((s) => s.team === team.id && s.problem === problem.id);
             let penalty = 0;
             for (const s of sub) {
+              problem.old++;
               if (s.verdict !== 'AC') {
                 penalty += 20 * 60;
-                problem.old++;
               } else {
+                problem.time = Math.floor(s.time / 60);
                 penalty += s.time;
                 break;
               }

diff --git a/packages/onsite-toolkit/index.ts b/packages/onsite-toolkit/index.ts
@@ -39,7 +39,7 @@ export function apply(ctx: Context) {
     ctx.inject(['scoreboard'], ({ scoreboard }) => {
         scoreboard.addView('resolver-tiny', 'Resolver(Tiny)', { tdoc: 'tdoc' }, {
             async display({ tdoc }) {
-                if (!this.user.own(tdoc)) this.checkPerm(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
+                if (!this.user.own(tdoc) && ContestModel.isLocked(tdoc)) this.checkPerm(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
                 const teams = await ContestModel.getMultiStatus(tdoc.domainId, { docId: tdoc.docId }).toArray();
                 const udict = await UserModel.getList(tdoc.domainId, teams.map((i) => i.uid));
                 const teamIds: Record<number, number> = {};