From ee9951abf1b33c1418686cf19a8e22dc1d046c8f Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 12 Sep 2015 18:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=98=E7=9B=AE=E9=9A=BE?=
 =?UTF-8?q?=E5=BA=A6=E7=9A=84=E9=80=89=E6=8B=A9=E7=BC=96=E8=BE=91=E5=92=8C?=
 =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=E4=B8=8D=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/problem/addProblem.js |  4 ++++
 .../src/js/app/admin/problem/editProblem.js   |  4 ++--
 template/src/admin/problem/add_problem.html   | 10 +++++++---
 template/src/admin/problem/edit_problem.html  | 10 +++++++---
 template/src/oj/problem/problem_list.html     | 20 ++++++++++++++-----
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/static/src/js/app/admin/problem/addProblem.js b/static/src/js/app/admin/problem/addProblem.js
index c6e49ca..103396b 100644
--- a/static/src/js/app/admin/problem/addProblem.js
+++ b/static/src/js/app/admin/problem/addProblem.js
@@ -13,6 +13,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
+                        if (vm.timeLimit < 100 || vm.timeLimit > 5000) {
+                            bsAlert("保证时间限制是一个100-5000的合法整数");
+                            return false;
+                        }
                         if (vm.samples.length == 0) {
                             bsAlert("请至少添加一组样例!");
                             return false;
diff --git a/static/src/js/app/admin/problem/editProblem.js b/static/src/js/app/admin/problem/editProblem.js
index a746d7a..416d86f 100644
--- a/static/src/js/app/admin/problem/editProblem.js
+++ b/static/src/js/app/admin/problem/editProblem.js
@@ -14,8 +14,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE
                             bsAlert("题目描述不能为空!");
                             return false;
                         }
-                        if (vm.timeLimit < 1000 || vm.timeLimit > 5000) {
-                            bsAlert("保证时间限制是一个1000-5000的合法整数");
+                        if (vm.timeLimit < 100 || vm.timeLimit > 5000) {
+                            bsAlert("保证时间限制是一个100-5000的合法整数");
                             return false;
                         }
                         if (vm.samples.length == 0) {
diff --git a/template/src/admin/problem/add_problem.html b/template/src/admin/problem/add_problem.html
index 70bd524..37c48bb 100644
--- a/template/src/admin/problem/add_problem.html
+++ b/template/src/admin/problem/add_problem.html
@@ -18,7 +18,7 @@
         <div class="col-md-3">
             <div class="form-group"><label>时间限制(ms)</label>
                 <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
-                       data-error="请输入时间限制(保证是一个1000-5000的合法整数)" required>
+                       data-error="请输入时间限制(保证是一个100-5000的合法整数)" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
@@ -31,8 +31,12 @@
         </div>
         <div class="col-md-3">
             <div class="form-group"><label>难度</label>
-                <input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
-                       data-error="请输入难度(保证是一个合法整数)" required>
+                <select name="difficulty" class="form-control" ms-duplex="difficulty"
+                       data-error="请选择难度" required>
+                    <option value="1" selected="selected">简单</option>
+                    <option value="2">中等</option>
+                    <option value="3">难</option>
+                </select>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
diff --git a/template/src/admin/problem/edit_problem.html b/template/src/admin/problem/edit_problem.html
index d2587b3..d7c9743 100644
--- a/template/src/admin/problem/edit_problem.html
+++ b/template/src/admin/problem/edit_problem.html
@@ -24,7 +24,7 @@
         <div class="col-md-3">
             <div class="form-group"><label>时间限制(ms)</label>
                 <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
-                       data-error="请输入时间限制(保证是一个1000-5000的合法整数)" required>
+                       data-error="请输入时间限制(保证是一个100-5000的合法整数)" required>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
@@ -37,8 +37,12 @@
         </div>
         <div class="col-md-3">
             <div class="form-group"><label>难度</label>
-                <input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
-                       data-error="请输入难度(保证是一个合法整数)" required>
+                <select name="difficulty" class="form-control" ms-duplex="difficulty"
+                       data-error="请选择难度" required>
+                    <option value="1">简单</option>
+                    <option value="2">中等</option>
+                    <option value="3">难</option>
+                </select>
                 <div class="help-block with-errors"></div>
             </div>
         </div>
diff --git a/template/src/oj/problem/problem_list.html b/template/src/oj/problem/problem_list.html
index 878ded4..0af942d 100644
--- a/template/src/oj/problem/problem_list.html
+++ b/template/src/oj/problem/problem_list.html
@@ -31,7 +31,16 @@
                                 <th><span class="glyphicon glyphicon-ok ac-flag"></span></th>
                                 <th scope="row"><a href="/problem/{{ item.id }}/">{{ item.id }}</a></th>
                                 <td><a href="/problem/{{ item.id }}/">{{ item.title }}</a></td>
-                                <td>{{ item.difficulty }}</td>
+                                <td>
+                                    {% ifequal item.difficulty 1 %}
+                                        简单
+                                    {% else %}
+                                        {% ifequal item.difficulty 2 %}
+                                            中等
+                                        {% else %}
+                                            难
+                                        {% endifequal %}
+                                    {% endifequal %}</td>
                                 <td>{{ item|accepted_radio }}</td>
                             </tr>
                         {% endfor %}
@@ -65,10 +74,11 @@
                     </div>
                     <ul class="list-group">
                         {% for item in tags %}
-                        <li class="list-group-item problem-tag" onclick="location.href='/problems/?tag={{ item.name }}'">
-                            <span class="badge">{{ item.problem_number }}</span>
-                            {{ item.name }}
-                        </li>
+                            <li class="list-group-item problem-tag"
+                                onclick="location.href='/problems/?tag={{ item.name }}'">
+                                <span class="badge">{{ item.problem_number }}</span>
+                                {{ item.name }}
+                            </li>
                         {% endfor %}
                     </ul>
                 </div>