From 591736958360e31f025b2a677f9f5aac1e569ddd Mon Sep 17 00:00:00 2001
From: Menci <HuangHaoRui301@Gmail.com>
Date: Sun, 2 Jul 2017 18:24:19 +0800
Subject: [PATCH] Fix problem page

---
 modules/contest.js |  4 +++-
 views/problem.ejs  | 40 +++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/modules/contest.js b/modules/contest.js
index e828188..369fc17 100644
--- a/modules/contest.js
+++ b/modules/contest.js
@@ -346,13 +346,15 @@ app.get('/contest/:id/:pid', async (req, res) => {
     await syzoj.utils.markdown(problem, [ 'description', 'input_format', 'output_format', 'example', 'limit_and_hint' ]);
 
     let state = await problem.getJudgeState(res.locals.user, false);
+    let testcases = await syzoj.utils.parseTestdata(problem.getTestdataPath(), problem.type === 'submit-answer');
 
     res.render('problem', {
       pid: pid,
       contest: contest,
       problem: problem,
       state: state,
-      lastLanguage: res.locals.user ? await res.locals.user.getLastSubmitLanguage() : null
+      lastLanguage: res.locals.user ? await res.locals.user.getLastSubmitLanguage() : null,
+      testcases: testcases
     });
   } catch (e) {
     syzoj.log(e);
diff --git a/views/problem.ejs b/views/problem.ejs
index f61b9fa..ff619db 100644
--- a/views/problem.ejs
+++ b/views/problem.ejs
@@ -1,3 +1,4 @@
+<% include util %>
 <%
 if (typeof contest === 'undefined') contest = null;
 if (contest) {
@@ -29,34 +30,23 @@ if (contest) {
         <% } %>
       </h1>
     </div>
-    <% if (contest) { %>
-        <div class="row" style="margin-top: -15px">
-            <span class="ui label">内存限制：<%= problem.memory_limit %> MiB</span>
-            <span class="ui label">时间限制：<%= problem.time_limit %> ms</span>
-        </div>
-        <div class="row" style="margin-top: -23px">
-            <% if (problem.file_io) { %>
-            <span class="ui label">输入文件：<%= problem.file_io_input_name %></span>
-            <span class="ui label">输出文件：<%= problem.file_io_output_name %></span>
-            <% } else { %>
-            <span class="ui label">标准输入输出</span>
-            <% } %>
-        </div>
-    <% } else { %>
-        <div class="row" style="margin-top: -15px">
-            <span class="ui label">内存限制：<%= problem.memory_limit %> MiB</span>
-            <span class="ui label">时间限制：<%= problem.time_limit %> ms</span>
-            <% if (problem.file_io) { %>
+    <% if (problem.type !== 'submit-answer') { %>
+      <div class="row" style="margin-top: -15px">
+          <span class="ui label">内存限制：<%= problem.memory_limit %> MiB</span>
+          <span class="ui label">时间限制：<%= problem.time_limit %> ms</span>
+          <% if (problem.file_io) { %>
             <span class="ui label">输入文件: <%= problem.file_io_input_name %></span>
             <span class="ui label">输出文件: <%= problem.file_io_output_name %></span>
-            <% } else { %>
+          <% } else { %>
             <span class="ui label">标准输入输出</span>
-            <% } %>
-        </div>
-        <div class="row" style="margin-top: -23px">
-            <span class="ui label">评测方式：<%= (testcases && !testcases.error) ? (testcases.spj ? 'Special Judge' : '文本比较') : '无测试数据' %></span>
-            <span class="ui label">题目类型：<%= { 'submit-answer': '答案提交', 'interaction': '交互', 'traditional': '传统' }[problem.type] %></span>
-        </div>
+          <% } %>
+      </div>
+    <% } %>
+    <div class="row" style="margin-top: -<%= problem.type === 'submit-answer' ? 15 : 23 %>px">
+        <span class="ui label">题目类型：<%= { 'submit-answer': '答案提交', 'interaction': '交互', 'traditional': '传统' }[problem.type] %></span>
+        <span class="ui label">评测方式：<%= (testcases && !testcases.error) ? (testcases.spj ? 'Special Judge' : '文本比较') : '无测试数据' %></span>
+    </div>
+    <% if (!contest) { %>
         <div class="row" style="margin-top: -23px">
             <span class="ui label">上传者：
             <% if (problem.is_anonymous && !problem.allowedManage) { %>