修复冲突

contest/views.py

@@ -416,4 +416,5 @@ def contest_rank_page(request, contest_id):
 
     return render(request, "oj/contest/contest_rank.html",
                   {"contest": contest, "contest_problems": contest_problems,
-                   "result": sorted(result, cmp=_cmp, reverse=True)})
+                   "result": sorted(result, cmp=_cmp, reverse=True),
+                   "auto_refresh": request.GET.get("auto_refresh", None) == "true"})

contest_submission/views.py

@@ -126,6 +126,7 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
                       {"submissions": current_page, "page": int(page),
                        "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
                        "contest": contest})
+
     return render(request, "oj/contest/submissions_list.html",
                   {"submissions": current_page, "page": int(page),
                    "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,

daocloud.yml

@@ -4,9 +4,9 @@ services:
   - mysql
 
 env:
-  - oj_env="daocloud"
+  - oj_env="local"
 
 script:
   - pip install -r requirements.txt
-  - mkdir LOG
+  - mkdir log
   - python manage.py test

static/src/js/app/oj/problem/problem.js

@@ -1,5 +1,10 @@
 require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirror, csrfTokenHeader, bsAlert) {
-    var codeEditor = codeMirror($("#code-editor")[0], "text/x-csrc");
+    var codeEditorSelector = $("#code-editor")[0];
+    // 部分界面逻辑会隐藏代码输入框，先判断有没有。
+    if (codeEditorSelector == undefined) {
+        return;
+    }
+    var codeEditor = codeMirror(codeEditorSelector, "text/x-csrc");
     var language = $("input[name='language'][checked]").val();
     var submissionId;
 
@@ -87,9 +92,37 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
         })
     }
 
+    function guessLanguage(code) {
+        //cpp
+        if (code.indexOf("using namespace std") > -1) {
+            return "2";
+        }
+        //c
+        if (code.indexOf("printf") > -1) {
+            return "1";
+        }
+        //java
+        if (code.indexOf("public class Main")) {
+            return "3";
+        }
+    }
+
     $("#submit-code-button").click(function () {
 
         var code = codeEditor.getValue();
+
+        if (!code.trim()) {
+            bsAlert("请填写代码！");
+            hideLoading();
+            return false;
+        }
+
+        if(guessLanguage(code) != language){
+            if(!confirm("您选择的代码语言可能存在错误，是否继续提交？")){
+                return;
+            }
+        }
+
         if (location.href.indexOf("contest") > -1) {
             var problemId = location.pathname.split("/")[4];
             var contestId = location.pathname.split("/")[2];
@@ -113,15 +146,8 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert"], function ($, codeMirro
 
         showLoading();
 
-        if (!code.trim()) {
-            bsAlert("请填写代码！");
-            hideLoading();
-            return false;
-        }
-
         $("#result").html("");
 
-
         $.ajax({
             beforeSend: csrfTokenHeader,
             url: url,

template/src/oj/contest/contest_problem.html

@@ -72,13 +72,13 @@
 
                     <div>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="1" checked> C (gcc 4.8)
+                            <input type="radio" name="language" value="1" checked> C (GCC 4.8)
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="2"> C++ (g++ 4.3)
+                            <input type="radio" name="language" value="2"> C++ (G++ 4.3)
                         </label>
                         <label class="radio-inline">
-                            <input type="radio" name="language" value="3"> Java (jre 1.7)
+                            <input type="radio" name="language" value="3"> Java (Oracle JDK 1.7)
                         </label>
                     </div>
                 </div>

template/src/oj/contest/contest_rank.html

@@ -50,6 +50,7 @@
                     {% endfor %}
                     </tbody>
                 </table>
+                    <input type="checkbox" id="auto-refresh" {% if auto_refresh %}checked{% endif %} onchange="if(this.checked){location.href='?auto_refresh=true'}else{location.href=location.href.split('?')[0]}"> 自动刷新
                 {% else %}
                     <p>还没有结果</p>
                 {% endif %}
@@ -60,4 +61,11 @@
 
 
 {% block js_block %}
+{% if auto_refresh %}
+    <script>
+    setTimeout(function(){
+        location.reload();
+    }, 5000);
+    </script>
+    {% endif %}
 {% endblock %}

template/src/oj/contest/submissions_list.html

@@ -65,7 +65,10 @@
                 </thead>
                 {% if submissions %}
                 <tbody>
+<<<<<<< HEAD
 
+=======
+>>>>>>> dev
                 {% for item in submissions %}
                     <tr>
                         {% ifequal item.user_id request.user.id %}

template/src/oj/problem/my_submission.html

@@ -43,7 +43,7 @@
                     </p>
                 {% endifequal %}
                 {% ifequal submission.result 4 %}
-                    <p>{{ submission.info }}</p>
+                    <pre>{{ submission.info }}</pre>
                 {% endifequal %}
                 <p>提交时间 : {{ submission.create_time }}</p>
             </div>

template/src/oj/problem/problem.html

@@ -65,13 +65,13 @@
                 <label>选择语言</label>
                 <div>
                     <label class="radio-inline">
-                        <input type="radio" name="language" value="1" checked> C (gcc 4.8)
+                        <input type="radio" name="language" value="1" checked> C (GCC 4.8)
                     </label>
                     <label class="radio-inline">
-                        <input type="radio" name="language" value="2"> C++ (g++ 4.3)
+                        <input type="radio" name="language" value="2"> C++ (G++ 4.3)
                     </label>
                     <label class="radio-inline">
-                        <input type="radio" name="language" value="3"> Java (jre 1.7)
+                        <input type="radio" name="language" value="3"> Java (Oracle JDK 1.7)
                     </label>
                 </div>
             </div>