Change problem id in contests to letters, add problem statistics in contest

models/contest_ranklist.js

@@ -69,7 +69,6 @@ class ContestRanklist extends Model {
       for (let player of players) {
         player.latest = 0;
         for (let i in player.score_details) {
-          console.log(player.score_details);
           let judge_state = await JudgeState.fromID(player.score_details[i].judge_id);
           player.latest = Math.max(player.latest, judge_state.submit_time);
         }

modules/contest.js

@@ -131,7 +131,7 @@ app.get('/contest/:id', async (req, res) => {
       });
     }
 
-    problems = problems.map(x => ({ problem: x, status: null, judge_id: null }));
+    problems = problems.map(x => ({ problem: x, status: null, judge_id: null, statistics: null }));
     if (player) {
       for (let problem of problems) {
         if (contest.type === 'noi') {
@@ -168,9 +168,38 @@ app.get('/contest/:id', async (req, res) => {
       }
     }
 
+    let hasStatistics = false;
+    if (contest.type === 'ioi' || contest.type === 'acm' || (contest.type === 'noi' && (contest.ended || (res.locals.user && res.locals.user.is_admin)))) {
+      hasStatistics = true;
+
+      await contest.loadRelationships();
+      let players = await contest.ranklist.getPlayers();
+      for (let problem of problems) {
+        problem.statistics = { attempt: 0, accepted: 0 };
+
+        if (contest.type === 'ioi' || contest.type === 'noi') {
+          problem.statistics.partially = 0;
+        }
+
+        for (let player of players) {
+          if (player.score_details[problem.problem.id]) {
+            problem.statistics.attempt++;
+            if ((contest.type === 'acm' && player.score_details[problem.problem.id].accepted) || ((contest.type === 'noi' || contest.type === 'ioi') && player.score_details[problem.problem.id].score === 100)) {
+              problem.statistics.accepted++;
+            }
+
+            if ((contest.type === 'noi' || contest.type === 'ioi') && player.score_details[problem.problem.id].score > 0) {
+              problem.statistics.partially++;
+            }
+          }
+        }
+      }
+    }
+
     res.render('contest', {
       contest: contest,
-      problems: problems
+      problems: problems,
+      hasStatistics: hasStatistics
     });
   } catch (e) {
     syzoj.log(e);

views/contest.ejs

@@ -49,7 +49,10 @@
             <thead>
               <tr>
                 <th class="one wide" style="text-align: center">状态</th>
-                <th class="fourteen wide">题目</th>
+                <th>题目</th>
+                <% if (hasStatistics) { %>
+                  <th class="one wide center aligned">统计</th>
+                <% } %>
               </tr>
             </thead>
             <tbody>
@@ -89,6 +92,17 @@
                 <% } %>
                 </td>
                 <td><a href="<%= syzoj.utils.makeUrl(['contest', contest.id, i]) %>"><%= syzoj.utils.removeTitleTag(problem.problem.title) %></a></td>
+                <% if (hasStatistics) { %>
+                  <td class="center aligned" style="white-space: nowrap; ">
+                  <a href="<%= syzoj.utils.makeUrl(['contest', contest.id, 'submissions'], { problem_id: i, status: 'Accepted' }) %>"><%= problem.statistics.accepted %></a>
+                  /
+                    <a href="<%= syzoj.utils.makeUrl(['contest', contest.id, 'submissions'], { problem_id: i, min_score: 1 }) %>"><%= problem.statistics.partially %></a>
+                    <% if (contest.type === 'noi' || contest.type === 'ioi') { %>
+                    /
+                  <% } %>
+                  <a href="<%= syzoj.utils.makeUrl(['contest', contest.id, 'submissions'], { problem_id: i }) %>"><%= problem.statistics.attempt %></a>
+                  </td>
+                <% } %>
               </tr>
             <% } %>
             </tbody>

views/contest_submissions.ejs

@@ -2,10 +2,11 @@
 <script src="https://cdn.staticfile.org/textfit/2.3.1/textFit.min.js"></script>
 <% include header %>
 <div class="padding">
-  <form action="<%= syzoj.utils.makeUrl(['contest', contest.id, 'submissions']) %>" class="ui mini form" method="get" role="form" id="form">
+  <form action="<%= syzoj.utils.makeUrl(['contest', contest.id, 'submissions']) %>" class="ui mini form" method="get" role="form" id="form" onsubmit="return checkSubmit()">
     <div class="inline fields" style="margin-bottom: 25px; ">
       <label style="font-size: 1.2em; margin-right: 3px; ">题目 ID：</label>
-      <div class="field"><input name="problem_id" style="width: 50px; " type="text" value="<%= form.problem_id %>"></div>
+      <div class="field"><input id="problem_id" style="width: 50px; " type="text" value="<%= this.alpha(form.problem_id) %>"></div>
+      <input type="hidden" name="problem_id" id="problem_id_hidden">
       <label style="font-size: 1.2em; margin-right: 3px; ">提交者：</label>
       <div class="field"><input name="submitter" style="width: 100px; " type="text" value="<%= form.submitter %>"></div>
       <% if ((typeof contest === 'undefined' || !contest) || contest.ended || contest.type !== 'noi' || (user && user.is_admin)) { %>
@@ -94,5 +95,13 @@ $(function () {
   $('#select_language').dropdown();
   $('#select_status').dropdown();
 });
+
+function checkSubmit() {
+  var x = $('#problem_id').val(), ch = x.charCodeAt(0);
+  if (x.length === 1 && x >= 'A' && x <= 'Z') $('#problem_id_hidden').val(ch - 'A'.charCodeAt(0) + 1);
+  else if (x.length === 1 && x >= 'a' && x <= 'a') $('#problem_id_hidden').val(ch - 'a'.charCodeAt(0) + 1);
+  else $('#problem_id_hidden').val(x);
+  return true;
+}
 </script>
 <% include footer %>

views/problem.ejs

@@ -1,7 +1,7 @@
 <%
 if (typeof contest === 'undefined') contest = null;
 if (contest) {
-  this.title = syzoj.utils.removeTitleTag(problem.title) + ' - ' + contest.title + ' - 比赛';
+  this.title = this.alpha(pid) + '. ' + syzoj.utils.removeTitleTag(problem.title) + ' - ' + contest.title + ' - 比赛';
 } else {
   this.title = problem.title + ' - 题目';
 }
@@ -22,7 +22,7 @@ if (contest) {
     <div class="row">
       <h1 class="ui header">
         <% if (contest) { %>
-          #<%= pid %>. <%= syzoj.utils.removeTitleTag(problem.title) %>
+          <%= this.alpha(pid) %>. <%= syzoj.utils.removeTitleTag(problem.title) %>
         <% } else { %>
           #<%= problem.id %>. <%= problem.title %><% if (problem.allowedEdit && !problem.is_public) { %><span class="ui tiny red label">未公开</span><% } %>
         <% } %>

views/submission_content.ejs

@@ -48,7 +48,7 @@ else problemUrl = syzoj.utils.makeUrl(['problem', judge.problem_id]);
      <tbody>
        <tr>
         <td>#<%= judge.id %></td>
-        <td><a style="width: 220px; height: 22px; display: block; margin: 0 auto; line-height: 22px; " id="text-fit" href="<%= problemUrl %>">#<%= judge.problem_id %>. <%= judge.problem.title %></a></td>
+        <td><a style="width: 220px; height: 22px; display: block; margin: 0 auto; line-height: 22px; " id="text-fit" href="<%= problemUrl %>"><%= (typeof contest !== 'undefined' && contest) ? this.alpha(judge.problem_id) : ('#' + judge.problem_id) %>. <%= judge.problem.title %></a></td>
         <% if (judge.allowedSeeResult) { %>
           <td class="status <%= getStatusMeta(judge.result.status).toLowerCase().split(' ').join('_') %>">
           <i class="<%= icon[getStatusMeta(judge.status)] || 'remove' %> icon"></i>

views/submissions_item.ejs

@@ -5,7 +5,7 @@ if (typeof contest !== 'undefined' && contest) problemUrl = syzoj.utils.makeUrl(
 else problemUrl = syzoj.utils.makeUrl(['problem', judge.problem_id]);
 %>
 <td><a href="<%= syzoj.utils.makeUrl(['submission', judge.id]) %>">#<%= judge.id %></a></td>
-<td><a style="width: 220px; height: 22px; display: block; margin: 0 auto; line-height: 22px; " id="text-fit-<%= judge.id %>" href="<%= problemUrl %>">#<%= judge.problem_id %>. <%= judge.problem.title %></a></td>
+<td><a style="width: 220px; height: 22px; display: block; margin: 0 auto; line-height: 22px; " id="text-fit-<%= judge.id %>" href="<%= problemUrl %>"><%= (typeof contest !== 'undefined' && contest) ? this.alpha(judge.problem_id) : ('#' + judge.problem_id) %>. <%= judge.problem.title %></a></td>
 <script>
 var e = document.getElementById('text-fit-<%= judge.id %>');
 textFit(e, { maxFontSize: 14 });

views/util.ejs

@@ -2,7 +2,7 @@
 this.getStatusMeta = (status) => {
   if (status.startsWith('Running')) return 'Running';
   else return status;
-}
+};
 
 this.isPending = (status) => {
   let pending = [
@@ -11,7 +11,11 @@ this.isPending = (status) => {
     'Running'
   ];
   return pending.includes(this.getStatusMeta(status));
-}
+};
+
+this.alpha = number => {
+  if (number && parseInt(number) == number && parseInt(number) > 0) return String.fromCharCode('A'.charCodeAt(0) + parseInt(number) - 1);
+};
 
 this.icon = {
   'Accepted': 'checkmark',
@@ -29,5 +33,5 @@ this.icon = {
   'No Testdata': 'folder open outline',
   'Partially Correct': 'minus',
   'Judgement Failed': 'ban'
-}
+};
 %>