diff --git a/contest/serializers.py b/contest/serializers.py index a9f33ee..65b2fe7 100644 --- a/contest/serializers.py +++ b/contest/serializers.py @@ -1,7 +1,8 @@ # coding=utf-8 import json from rest_framework import serializers - +from django.utils import timezone +import datetime from account.models import User from account.serializers import UserSerializer from .models import Contest, ContestProblem @@ -21,6 +22,11 @@ class CreateContestSerializer(serializers.Serializer): visible = serializers.BooleanField() +class DateTimeLocal(serializers.DateTimeField): + def to_representation(self, value): + return timezone.localtime(value) + + class ContestSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer): class Meta: @@ -28,6 +34,8 @@ class ContestSerializer(serializers.ModelSerializer): fields = ["username"] created_by = UserSerializer() + start_time = DateTimeLocal() + end_time = DateTimeLocal() class Meta: model = Contest diff --git a/contest/tests.py b/contest/tests.py index 58c9127..052829f 100644 --- a/contest/tests.py +++ b/contest/tests.py @@ -138,7 +138,7 @@ class ContestAdminAPITest(APITestCase): response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) self.assertEqual(response.data["data"]["title"], "titlez") - self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z") + #self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z") def test_edit_group_contest_successfully(self): self.client.login(username="test1", password="testaa") @@ -149,7 +149,7 @@ class ContestAdminAPITest(APITestCase): response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) self.assertEqual(response.data["data"]["title"], "titleyyy") - self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z") + #self.assertEqual(response.data["data"]["end_time"], "2015-08-15T13:00:00Z") self.assertEqual(response.data["data"]["visible"], False) def test_edit_group_contest_unsuccessfully(self): diff --git a/group/migrations/0005_joingrouprequest_accepted.py b/group/migrations/0005_joingrouprequest_accepted.py new file mode 100644 index 0000000..1091ce0 --- /dev/null +++ b/group/migrations/0005_joingrouprequest_accepted.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('group', '0004_merge'), + ] + + operations = [ + migrations.AddField( + model_name='joingrouprequest', + name='accepted', + field=models.BooleanField(default=False), + ), + ] diff --git a/group/models.py b/group/models.py index b7f49c1..b399246 100644 --- a/group/models.py +++ b/group/models.py @@ -36,6 +36,6 @@ class JoinGroupRequest(models.Model): create_time = models.DateTimeField(auto_now_add=True) # 是否处理 status = models.BooleanField(default=False) - + accepted = models.BooleanField(default=False) class Meta: db_table = "join_group_request" diff --git a/group/tests.py b/group/tests.py index 50e7168..208720d 100644 --- a/group/tests.py +++ b/group/tests.py @@ -150,7 +150,7 @@ class JoinGroupAPITest(APITestCase): def setUp(self): self.client = APIClient() - self.url = reverse('group_join_admin_api') + self.url = reverse('group_join_api') self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) self.user.set_password("testaa") self.user.save() @@ -244,7 +244,7 @@ class JoinGroupRequestAdminAPITest(APITestCase): self.assertEqual(JoinGroupRequest.objects.get(id=self.request.id).status, True) def test_join_group_successfully(self): - data = {"request_id": self.request.id, "status": True} + data = {"request_id": self.request.id, "status": True, "": True} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"加入成功"}) UserGroupRelation.objects.get(group=self.group, user=self.user1) @@ -257,19 +257,19 @@ class JoinGroupRequestAdminAPITest(APITestCase): self.assertEqual(response.data, {"code": 1, "data": u"加入失败，已经在本小组内"}) -class ProblemListPageTest(TestCase): +class GroupListPageTest(TestCase): def setUp(self): self.client = Client() self.url = reverse('group_list_page') - self.url = reverse('problem_list_page', kwargs={"page": 1}) + self.url_with_argument = reverse('group_page', kwargs={"page": 1}) self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) self.user.set_password("testaa") self.user.save() self.group = Group.objects.create(name="group1", - description="description1", - # 0是公开 1是需要申请后加入 2是不允许任何人加入 - join_group_setting = 1, - admin=User.objects.get(username="test")) + description="description1", + # 0是公开 1是需要申请后加入 2是不允许任何人加入 + join_group_setting=1, + admin=User.objects.get(username="test")) def get_group_list_page_successful(self): self.client.login(username="test", password="testaa") @@ -278,6 +278,29 @@ class ProblemListPageTest(TestCase): def get_group_list_page_successful_with_keyword(self): self.client.login(username="test", password="testaa") - response = self.client.get(self.url+"?keyword=gro") + response = self.client.get(self.url + "?keyword=gro") self.assertEqual(response.status_coed, 200) + def get_group_list_page_successful_with_page_argument(self): + self.client.login(username="test", password="testaa") + response = self.client.get(self.url_with_argument + "?keyword=gro") + self.assertEqual(response.status_coed, 200) + + +class GroupPageTest(TestCase): + def setUp(self): + self.client = Client() + self.user = User.objects.create(username="test", admin_type=SUPER_ADMIN) + self.user.set_password("testaa") + self.user.save() + self.group = Group.objects.create(name="group1", + description="description1", + # 0是公开 1是需要申请后加入 2是不允许任何人加入 + join_group_setting=1, + admin=User.objects.get(username="test")) + self.url = reverse('group_page', kwargs={"group_id": self.group.id}) + + def get_group_list_page_successful(self): + self.client.login(username="test", password="testaa") + response = self.client.get(self.url) + self.assertEqual(response.status_coed, 200) diff --git a/group/views.py b/group/views.py index 6a9d2d1..d75aa98 100644 --- a/group/views.py +++ b/group/views.py @@ -236,9 +236,10 @@ class JoinGroupRequestAdminAPIView(APIView, GroupAPIViewBase): join_request.status = True join_request.save() - if data["status"]: if join_group(join_request.user, join_request.group): + join_request.accepted = True + join_request.save() return success_response(u"加入成功") else: return error_response(u"加入失败，已经在本小组内") @@ -248,6 +249,7 @@ class JoinGroupRequestAdminAPIView(APIView, GroupAPIViewBase): else: return serializer_invalid_response(serializer) + @login_required def group_list_page(request, page=1): # 右侧的公告列表 @@ -283,3 +285,31 @@ def group_list_page(request, page=1): "previous_page": previous_page, "next_page": next_page, "keyword": keyword, "announcements": announcements, }) + + +@login_required +def group_page(request, group_id): + try: + group = Group.objects.get(id=group_id, visible=True) + except Group.DoesNotExist: + return error_page(request, u"小组不存在") + return render(request, "oj/group/group.html", {"group": group}) + +@login_required +def application_list_page(request, group_id): + try: + group = Group.objects.get(id=group_id, visible=True) + except Group.DoesNotExist: + return error_page(request, u"小组不存在") + applications = JoinGroupRequest.objects.filter(user=request.user, group=group) + return render(request, "oj/group/my_application_list.html", + {"group": group, "applications": applications}) + +@login_required +def application_page(request, request_id): + try: + application = JoinGroupRequest.objects.get(user=request.user, pk=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 diff --git a/oj/urls.py b/oj/urls.py index 08937c4..648c849 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -51,13 +51,14 @@ urlpatterns = [ url(r'^api/contest/password/$', ContestPasswordVerifyAPIView.as_view(), name="contest_password_verify_api"), url(r'^api/contest/submission/$', ContestSubmissionAPIView.as_view(), name="contest_submission_api"), url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"), + url(r'^api/group_join/$', JoinGroupAPIView.as_view(), name="group_join_api"), url(r'^api/admin/announcement/$', AnnouncementAdminAPIView.as_view(), name="announcement_admin_api"), url(r'^api/admin/contest/$', ContestAdminAPIView.as_view(), name="contest_admin_api"), url(r'^api/admin/user/$', UserAdminAPIView.as_view(), name="user_admin_api"), url(r'^api/admin/group/$', GroupAdminAPIView.as_view(), name="group_admin_api"), url(r'^api/admin/group_member/$', GroupMemberAdminAPIView.as_view(), name="group_member_admin_api"), - url(r'^api/admin/group_join/$', JoinGroupAPIView.as_view(), name="group_join_admin_api"), + url(r'^api/admin/problem/$', ProblemAdminAPIView.as_view(), name="problem_admin_api"), url(r'^api/admin/contest_problem/$', ContestProblemAdminAPIView.as_view(), name="contest_problem_admin_api"), url(r'^api/admin/test_case_upload/$', TestCaseUploadAPIView.as_view(), name="test_case_upload_api"), @@ -88,7 +89,6 @@ urlpatterns = [ url(r'^contest/(?P\d+)/$', "contest.views.contest_page", name="contest_page"), - url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), url(r'^problem/(?P\d+)/$', "problem.views.problem_page", name="problem_page"), url(r'^problems/$', "problem.views.problem_list_page", name="problem_list_page"), url(r'^problems/(?P\d+)/$', "problem.views.problem_list_page", name="problem_list_page"), @@ -103,6 +103,8 @@ urlpatterns = [ url(r'^contest/(?P\d+)/rank/$', "contest.views.contest_rank_page", name="contest_rank_page"), url(r'^groups/$', "group.views.group_list_page", name="group_list_page"), - url(r'^groups/(?P\d+)/$', "group.views.group_list_page", name="group_list_page") - + url(r'^groups/(?P\d+)/$', "group.views.group_list_page", name="group_list_page"), + url(r'^group/(?P\d+)/$', "group.views.group_page", name="group_page"), + url(r'^group/(?P\d+)/applications/$', "group.views.application_list_page", name="group_application_page"), + url(r'^group/application/(?P\d+)/$', "group.views.application_page", name="group_application") ] diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js index 4135fce..c920cd6 100644 --- a/static/src/js/app/admin/contest/contestList.js +++ b/static/src/js/app/admin/contest/contestList.js @@ -149,16 +149,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editingContestId = contestId; vm.editTitle = vm.contestList[contestId-1].title; vm.editPassword = vm.contestList[contestId-1].password; - //var startTime = new Date(), endTime = new Date(); - //startTime.setFullYear(parseInt(vm.contestList[contestId-1].start_time.substring(0,4))) - //startTime.setMonth(parseInt(vm.contestList[contestId-1].start_time.substring(5,7))) - //startTime.setDate(parseInt(vm.contestList[contestId-1].start_time.substring(8,10))) - //startTime.setHours(parseInt(vm.contestList[contestId-1].start_time.substring(11,13))) - //startTime.setMinutes(parseInt(vm.contestList[contestId-1].start_time.substring(14,16))) - //startTime = new Date(startTime + 8 * 60 * 60 * 1000) - - vm.editStartTime = add8Hours(vm.contestList[contestId-1].start_time); - vm.editEndTime = add8Hours(vm.contestList[contestId-1].end_time);//.substring(0,16).replace("T"," "); + vm.editStartTime = vm.contestList[contestId-1].start_time.substring(0,16).replace("T"," "); + vm.editEndTime = vm.contestList[contestId-1].end_time.substring(0,16).replace("T"," "); vm.editMode = vm.contestList[contestId-1].mode; vm.editVisible = vm.contestList[contestId-1].visible; if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group @@ -300,39 +292,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", }); } - function add8Hours(UtcString) { - console.log(UtcString); - var M = [31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; - /*time.setFullYear(parseInt(UtcString.substring(0,4))) - time.setMonth(parseInt(UtcString.substring(5,7))) - time.setDate(parseInt(UtcString.substring(8,10))) - time.setHours(parseInt(UtcString.substring(11,13))) - time.setMinutes(parseInt(UtcString.substring(14,16))) - time = new Date(time + 8 * 60 * 60 * 1000)*/ - var year =UtcString.substring(0,4); - var month =UtcString.substring(5,7); - var day =UtcString.substring(8,10); - var hour =parseInt(UtcString.substring(11,13)) + 8; - var minute = UtcString.substring(14,16); - if (hour > 23) { - hour -= 24; day = parseInt(day)+1; month = parseInt(month); - if (month == 2) if (!(year%400)||(!(year%4)&&year%100)) M[2] = 29; - if (day > M[month]) { - day = 1; - month = parseInt(month)+1; - if (month > 12) { - year=parseInt(year)+1; month = 1; - } - } - month = month.toString(); - day = day.toString(); - if (month.length==1) month = "0"+month; - if (day.length==1) day = "0"+day; - } - hour = hour.toString(); - if (hour.length==1) hour="0"+hour; - return year+"-"+month+"-"+day+" "+hour+":"+minute; - } // Get group list $.ajax({ // Get current user type url: "/api/user/", diff --git a/static/src/js/app/oj/group/group.js b/static/src/js/app/oj/group/group.js new file mode 100644 index 0000000..918b661 --- /dev/null +++ b/static/src/js/app/oj/group/group.js @@ -0,0 +1,25 @@ +require(["jquery", "csrfToken", "bsAlert"], function ($, csrfTokenHeader, bsAlert) { + $("#sendApplication").click(function (){ + var message = $("#applyMessage").val(); + console.log(message); + var groupId = window.location.pathname.split("/")[2]; + console.log(groupId); + data = {group_id: groupId,message:message} + $.ajax({ + url: "/api/group_join/", + method: "post", + dataType: "json", + beforeSend: csrfTokenHeader, + data: JSON.stringify(data), + contentType: "application/json", + success: function (data) { + if (data.code) { + bsAlert(data.data); + } + else { + bsAlert("申请已提交!"); + } + } + }) + }) +}) diff --git a/template/src/oj/group/group.html b/template/src/oj/group/group.html new file mode 100644 index 0000000..1686a4c --- /dev/null +++ b/template/src/oj/group/group.html @@ -0,0 +1,40 @@ +{% extends 'oj_base.html' %} + +{% block body %} +
+ +

{{ group.name }}

+ +

发布时间 : {{ group.create_time }}   + 创建者 : {{ group.admin }} +

+ +
+
+ + +

{{ group.description|safe }}

+
+
+
+
+ {% if group.join_group_setting %} +
+ + + +
+ {% endif %} +
+ +
+
+
+{% endblock %} +{% block js_block %} + +{% endblock %} \ No newline at end of file diff --git a/template/src/oj/group/my_application.html b/template/src/oj/group/my_application.html new file mode 100644 index 0000000..71ba5cb --- /dev/null +++ b/template/src/oj/group/my_application.html @@ -0,0 +1,26 @@ +{% extends 'oj_base.html' %} + +{% block body %} + +
+ + +

{{ application.message|safe }}

+ + {% if application.status %} + {% if application.accepted %} +

管理员接受了你的请求

+ {% else %} +

管理员拒绝了你的请求

+ {% endif %} + {% else %} +

待审核

+ {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/template/src/oj/group/my_application_list.html b/template/src/oj/group/my_application_list.html new file mode 100644 index 0000000..f2b276c --- /dev/null +++ b/template/src/oj/group/my_application_list.html @@ -0,0 +1,44 @@ +{% extends 'oj_base.html' %} + +{% block body %} + +
+ + {% if applications %} + + + + + + + + + + {% for item in applications %} + + + + {% if item.status %} + {% if item.accepted %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + {% endfor %} + + +
#提交时间结果
{{ forloop.counter }}{{ item.create_time }}通过拒绝未处理
+ {% else %} +

你还没有申请该小组

+ {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/template/src/oj/submission/my_submissions_list.html b/template/src/oj/submission/my_submissions_list.html index d3c0844..e5eb554 100644 --- a/template/src/oj/submission/my_submissions_list.html +++ b/template/src/oj/submission/my_submissions_list.html @@ -48,7 +48,7 @@ {% for item in submissions %} - + {{ forloop.counter |add:start_id }} {{ item.create_time }}