Accept Merge Request #234 题目列表问题状态标识 : (dev-sxw -> dev)

Merge Request: 题目列表问题状态标识
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/234

account/migrations/0002_user_problems_status.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='problems_status',
+            field=models.TextField(blank=True),
+        ),
+    ]

account/models.py

@@ -30,6 +30,9 @@ class User(AbstractBaseUser):
     create_time = models.DateTimeField(auto_now_add=True)
     # 0代表不是管理员 1是普通管理员 2是超级管理员
     admin_type = models.IntegerField(default=0)
+    # JSON字典用来表示该用户的问题的解决状态 1为ac，2为正在进行
+    problems_status = models.TextField(blank=True)
+
 
     USERNAME_FIELD = 'username'
     REQUIRED_FIELDS = []

mq/scripts/info.py

@@ -2,6 +2,7 @@
 import logging
 
 import redis
+import json
 
 from judge.judger_controller.settings import redis_config
 from judge.judger.result import result
@@ -9,6 +10,7 @@ from submission.models import Submission
 from problem.models import Problem
 from contest.models import ContestProblem, Contest, ContestSubmission
 from account.models import User
+
 logger = logging.getLogger("app_info")
 
 
@@ -35,6 +37,20 @@ class MessageQueue(object):
                     problem.save()
                 except Problem.DoesNotExist:
                     logger.warning("Submission problem does not exist, submission_id: " + submission_id)
+                # 更新该用户的解题状态
+                try:
+                    user = User.objects.get(pk=submission.user_id)
+                except User.DoesNotExist:
+                    logger.warning("Submission user does not exist, submission_id: " + submission_id)
+                    continue
+                if user.problems_status:
+                    problems_status = json.loads(user.problems_status)
+                else:
+                    problems_status = {}
+                problems_status[str(problem.id)] = 1
+                user.problems_status = json.dumps(problems_status)
+                user.save()
+
                 # 普通题目的话，到这里就结束了
                 continue
 

problem/views.py

@@ -282,11 +282,15 @@ def problem_list_page(request, page=1):
     except Exception:
         pass
 
+    if request.user.is_authenticated() and request.user.problems_status:
+        problems_status = json.loads(request.user.problems_status)
+    else:
+        problems_status = {}
     # 右侧标签列表 按照关联的题目的数量排序 排除题目数量为0的
     tags = ProblemTag.objects.annotate(problem_number=Count("problem")).filter(problem_number__gt=0).order_by("-problem_number")
 
     return render(request, "oj/problem/problem_list.html",
                   {"problems": current_page, "page": int(page),
                    "previous_page": previous_page, "next_page": next_page,
-                   "keyword": keyword, "tag": tag_text,
+                   "keyword": keyword, "tag": tag_text,"problems_status": problems_status,
                    "tags": tags, "difficulty_order": difficulty_order})

submission/views.py

@@ -46,7 +46,14 @@ class SubmissionAPIView(APIView):
                 judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
             except Exception:
                 return error_response(u"提交判题任务失败")
-
+            # 修改用户解题状态
+            if request.user.problems_status:
+                problems_status = json.loads(request.user.problems_status)
+            else:
+                problems_status = {}
+            problems_status[str(data["problem_id"])] = 2
+            request.user.problems_status = json.dumps(problems_status)
+            request.user.save()
             # 增加redis 中判题队列长度的计数器
             r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
             r.incr("judge_queue_length")

template/src/oj/problem/problem_list.html

@@ -28,7 +28,7 @@
                         <tbody>
                         {% for item in problems %}
                             <tr>
-                                <th><span class="glyphicon glyphicon-ok ac-flag"></span></th>
+                                <th><span class="{% get_problem_status problems_status item.id %}"></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>

template/src/utils/help.html

@@ -33,12 +33,12 @@
             <h4>编译参数</h4>
             <ul>
                 <li>C</li>
-                <p>gcc -DONLINE_JUDGE -O2 -w -std=c99 {src_path} -lm -o {exe_path}main</p>
+                <pre>gcc -DONLINE_JUDGE -O2 -w -std=c99 {src_path} -lm -o {exe_path}main</pre></p>
                 <li>C++</li>
-                <p>g++ -DONLINE_JUDGE -O2 -w -std=c++11 {src_path} -lm -o {exe_path}main</p>
+                <pre>g++ -DONLINE_JUDGE -O2 -w -std=c++11 {src_path} -lm -o {exe_path}main</pre>
                 <li>Java</li>
-                <p>javac {src_path} -d {exe_path}</p>
-                <p>java -cp {exe_path} Main</p>
+                <pre>javac {src_path} -d {exe_path}</pre>
+                <pre>java -cp {exe_path} Main</pre>
             </ul>
 
 

utils/templatetags/problem.py

@@ -8,7 +8,16 @@ def get_problem_accepted_radio(problem):
     return "0%"
 
 
+def get_problem_status(problems_status, problem_id):
+
+    if str(problem_id) in problems_status:
+        if problems_status[str(problem_id)] == 1:
+            return "glyphicon glyphicon-ok ac-flag"
+        return "glyphicon glyphicon-minus dealing-flag"
+    return ""
+
 from django import template
 
 register = template.Library()
 register.filter("accepted_radio", get_problem_accepted_radio)
+register.simple_tag(get_problem_status, name="get_problem_status")