diff --git a/account/tests.py b/account/tests.py index bbdf1e9..e868f62 100644 --- a/account/tests.py +++ b/account/tests.py @@ -140,12 +140,12 @@ class UserAdminAPITest(APITestCase): def setUp(self): self.client = APIClient() self.url = reverse("user_admin_api") - user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) - user.set_password("testxx") - user.save() - user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) - user.set_password("testyy") - user.save() + self.user1 = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN) + self.user1.set_password("testxx") + self.user1.save() + self.user = User.objects.create(username="testy", real_name="yy", admin_type=SUPER_ADMIN) + self.user.set_password("testyy") + self.user.save() self.client.login(username="testx", password="testxx") # 以下是编辑用户的测试 @@ -164,19 +164,19 @@ class UserAdminAPITest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"}) def test_username_exists(self): - data = {"id": 1, "username": "testy", "real_name": "test00", + data = {"id": self.user.id, "username": "testx", "real_name": "test00", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"昵称已经存在"}) def test_user_edit_not_password_successfully(self): - data = {"id": 1, "username": "test0", "real_name": "test00", + data = {"id": self.user.id, "username": "test0", "real_name": "test00", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) def test_user_edit_change_password_successfully(self): - data = {"id": 1, "username": "test0", "real_name": "test00", "password": "111111", + data = {"id": self.user.id, "username": "test0", "real_name": "test00", "password": "111111", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) diff --git a/contest/tests.py b/contest/tests.py index 052829f..adbf00b 100644 --- a/contest/tests.py +++ b/contest/tests.py @@ -370,7 +370,7 @@ class ContestProblemAdminAPItEST(APITestCase): def test_query_contest_problem_exists_by_contest_id(self): self.client.login(username="test3", password="testaa") - response = self.client.get(self.url + "?contest_id=1") + response = self.client.get(self.url + "?contest_id="+ str(self.global_contest.id)) self.assertEqual(response.data["code"], 0) self.assertEqual(len(response.data["data"]), 0) diff --git a/contest/views.py b/contest/views.py index 2153f95..a117672 100644 --- a/contest/views.py +++ b/contest/views.py @@ -396,10 +396,10 @@ def _cmp(x, y): def contest_rank_page(request, contest_id): contest = Contest.objects.get(id=contest_id) contest_problems = ContestProblem.objects.filter(contest=contest).order_by("sort_index") - result = ContestSubmission.objects.values("user_id").annotate(total_submit=Count("user_id")) + result = ContestSubmission.objects.filter(contest=contest).values("user_id").annotate(total_submit=Sum("total_submission_number")) for i in range(0, len(result)): # 这个人所有的提交 - submissions = ContestSubmission.objects.filter(user_id=result[i]["user_id"]) + submissions = ContestSubmission.objects.filter(user_id=result[i]["user_id"], contest_id=contest_id) result[i]["submissions"] = {} for item in submissions: result[i]["submissions"][item.problem_id] = item diff --git a/group/serializers.py b/group/serializers.py index 065baf9..402ea5b 100644 --- a/group/serializers.py +++ b/group/serializers.py @@ -21,7 +21,7 @@ class EditGroupSerializer(serializers.Serializer): class CreateJoinGroupRequestSerializer(serializers.Serializer): group_id = serializers.IntegerField() - message = serializers.CharField(max_length=30) + message = serializers.CharField(max_length=30, required=False) class JoinGroupRequestSerializer(serializers.ModelSerializer): diff --git a/group/views.py b/group/views.py index d75aa98..2929706 100644 --- a/group/views.py +++ b/group/views.py @@ -183,6 +183,8 @@ class JoinGroupAPIView(APIView): else: return error_response(u"你已经是小组成员了") elif group.join_group_setting == 1: + if not data["message"]: + return error_response(u"message : 该字段是必填项。") try: JoinGroupRequest.objects.get(user=request.user, group=group, status=False) return error_response(u"你已经提交过申请了，请等待审核") @@ -295,6 +297,7 @@ def group_page(request, group_id): return error_page(request, u"小组不存在") return render(request, "oj/group/group.html", {"group": group}) + @login_required def application_list_page(request, group_id): try: @@ -305,6 +308,7 @@ def application_list_page(request, group_id): return render(request, "oj/group/my_application_list.html", {"group": group, "applications": applications}) + @login_required def application_page(request, request_id): try: @@ -312,4 +316,4 @@ def application_page(request, request_id): except JoinGroupRequest.DoesNotExist: return error_page(request, u"申请不存在") return render(request, "oj/group/my_application.html", - {"application": application}) \ No newline at end of file + {"application": application}) diff --git a/mq/scripts/info.py b/mq/scripts/info.py index 6634b5b..119845c 100644 --- a/mq/scripts/info.py +++ b/mq/scripts/info.py @@ -52,6 +52,8 @@ class MessageQueue(object): try: contest_submission = ContestSubmission.objects.get(user_id=submission.user_id, contest=contest, problem_id=contest_problem.id) + # 提交次数加1 + contest_submission.total_submission_number += 1 if submission.result == result["accepted"]: @@ -65,13 +67,10 @@ class MessageQueue(object): contest_submission.total_time += int((submission.create_time - contest.start_time).total_seconds() / 60) # 标记为已经通过 contest_submission.ac = True - # 提交次数加1 - contest_submission.total_submission_number += 1 # contest problem ac 计数器加1 contest_problem.total_accepted_number += 1 else: # 如果这个提交是错误的，就罚时20分钟 - contest_submission.ac = False contest_submission.total_time += 20 contest_submission.save() contest_problem.save() diff --git a/problem/tests.py b/problem/tests.py index ab6d898..2a7aecc 100644 --- a/problem/tests.py +++ b/problem/tests.py @@ -144,7 +144,7 @@ class ProblemAdminTest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"}) def test_query_problem_exists(self): - data = {"problem_id": 1} + data = {"problem_id": self.problem.id} response = self.client.get(self.url, data=data) self.assertEqual(response.data["code"], 0) diff --git a/problem/views.py b/problem/views.py index 6052ea9..b73085f 100644 --- a/problem/views.py +++ b/problem/views.py @@ -185,8 +185,12 @@ class TestCaseUploadAPIView(APIView): os.mkdir(test_case_dir) for name in l: f = open(test_case_dir + name, "wb") - f.write(test_case_file.read(name).replace("\r\n", "\n")) - f.close() + try: + f.write(test_case_file.read(name).replace("\r\n", "\n")) + except MemoryError: + return error_response(u"单个测试数据体积过大!") + finally: + f.close() l.sort() file_info = {"test_case_number": len(l) / 2, "test_cases": {}} diff --git a/static/src/js/app/oj/group/group.js b/static/src/js/app/oj/group/group.js index 918b661..c36448e 100644 --- a/static/src/js/app/oj/group/group.js +++ b/static/src/js/app/oj/group/group.js @@ -1,9 +1,14 @@ require(["jquery", "csrfToken", "bsAlert"], function ($, csrfTokenHeader, bsAlert) { $("#sendApplication").click(function (){ - var message = $("#applyMessage").val(); - console.log(message); + var message; + if ($("#applyMessage").length) { + message = $("#applyMessage").val(); + if (!message) + bsAlert("提交失败,请填写申请信息!"); + return false; + } + var groupId = window.location.pathname.split("/")[2]; - console.log(groupId); data = {group_id: groupId,message:message} $.ajax({ url: "/api/group_join/", diff --git a/template/src/oj/contest/contest_list.html b/template/src/oj/contest/contest_list.html index 68d939b..25b8eae 100644 --- a/template/src/oj/contest/contest_list.html +++ b/template/src/oj/contest/contest_list.html @@ -69,7 +69,7 @@ {% else %} -

当前没有合适的比赛

+

当前没有合适的比赛,你可以尝试到小组列表申请加入一些小组,以便参加小组内部的比赛

{% endif %} diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html index 1686a4c..4fe3a00 100644 --- a/template/src/oj/group/group.html +++ b/template/src/oj/group/group.html @@ -4,8 +4,11 @@

{{ group.name }}

@@ -30,7 +33,11 @@
{% endif %}
- +
diff --git a/template/src/oj/index.html b/template/src/oj/index.html index 181fa31..80aaa0d 100644 --- a/template/src/oj/index.html +++ b/template/src/oj/index.html @@ -97,7 +97,7 @@ 提交   比赛   小组   - 关于 + 关于 diff --git a/template/src/oj_base.html b/template/src/oj_base.html index ba001e1..56ba614 100644 --- a/template/src/oj_base.html +++ b/template/src/oj_base.html @@ -46,7 +46,7 @@
  • 提交
  • 比赛
  • 小组
    • -
  • 关于
    • +
  • 关于
    • {% if request.user.is_authenticated %}