xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sxw-dev' into virusdefender-dev

Browse Source 
* sxw-dev:
  [前端-添加题目，添加比赛 ]: 1.新增添加题目页面。 2.修改添加比赛页面，统一了avalon的用法，新增富文本编辑框的非空验证 3.收集新增比赛和新增题目页面输入，提交表单后可以在console中看到提交的值
  增加了AdminRequired的测试用例
This commit is contained in:
virusdefender
2015-08-09 22:07:09 +08:00
parent b6c31ba7a6 4f9ef5f1c2
commit 80697ddefb
9 changed files with 338 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/middleware.py
View File

@@ -8,7 +8,7 @@ class AdminRequiredMiddleware(object):
def process_request(self, request):
path = request.path_info
if path.startswith("/admin/") or path.startswith("/api/admin/"):
if not request.user.is_authenticated():
if not(request.user.is_authenticated() and request.user.admin_type):
if request.is_ajax():
return HttpResponse(json.dumps({"code": 1, "data": u"请先登录"}),
content_type="application/json")

68
admin/tests.py
View File

@@ -0,0 +1,68 @@
# coding=utf-8
import json
from django.test import TestCase, Client
from django.core.urlresolvers import reverse
from django.http import HttpResponse
from account.models import User
def middleware_test_func(request):
return HttpResponse(json.dumps({"code": 0}))
class AdminRequiredMidlewareTest(TestCase):
urls = "admin.test_urls"
def setUp(self):
admin_user = User.objects.create(username="test", admin_type=0)
admin_user.set_password("test")
admin_user.save()
admin_user = User.objects.create(username="test1", admin_type=1)
admin_user.set_password("test")
admin_user.save()
super_admin_user = User.objects.create(username="test2", admin_type=2)
super_admin_user.set_password("test")
super_admin_user.save()
self.client = Client()
def test_need_admin_login(self):
url = "/admin/"
response = self.client.get(url)
self.assertRedirects(response, "/login/")
self.client.login(username="test", password="test")
response = self.client.get(url)
self.assertRedirects(response, "/login/")
self.client.logout()
self.client.login(username="test1", password="test")
response = self.client.get(url)
self.assertTemplateUsed(response, "admin/admin.html")
self.client.logout()
self.client.login(username="test2", password="test")
response = self.client.get(url)
self.assertTemplateUsed(response, "admin/admin.html")
def test_need_admin_login_ajax(self):
url = "/api/admin/test/"
response = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(json.loads(response.content), {"code": 1, "data": u"请先登录"})
self.client.login(username="test", password="test")
rresponse = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(json.loads(response.content), {"code": 1, "data": u"请先登录"})
self.client.logout()
self.client.login(username="test1", password="test")
response = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(json.loads(response.content)["code"], 0)
self.client.logout()
self.client.login(username="test2", password="test")
response = self.client.get(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(json.loads(response.content)["code"], 0)

2
oj/settings.py
View File

@@ -39,7 +39,6 @@ ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
@@ -50,6 +49,7 @@ INSTALLED_APPS = (
'announcement',
'utils',
'group',
'admin',
'rest_framework',
'rest_framework_swagger',

64
static/src/js/app/admin/contest/contest.js
View File

@@ -19,6 +19,13 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
}
}
},
description:{
validators: {
notEmpty: {
message: "请输入描述"
}
}
},
start_time: {
validators: {
notEmpty: {
@@ -93,9 +100,18 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
})
.on("success.form.fv", function (e) {
e.preventDefault();
alert("1111");
var data = {title: vm.title, description: vm.description, start_time: vm.startTime, end_time: vm.endTime,
password: vm.password, model: vm.model, open_rank: vm.openRank, problems:[]};
for (var i = 0; i < vm.problems.length; i++) {
var problem = {title: vm.problems[i].title, description:vm.problems[i].description,
cpu:vm.problems[i].cpu, memory:vm.problems[i].memory,samples:[]};
for (var j = 0; j < vm.problems[i].samples.length; j++) {
problem.samples.push({input:vm.problems[i].samples[j].input, output:vm.problems[i].samples[j].output})
}
data.problems.push(problem);
}
console.log(data);
});
function make_id() {
var text = "";
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@@ -107,17 +123,20 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
var vm = avalon.define({
$id: "add_contest",
title : "",
description: "",
startTime: "",
endTime: "",
password: "",
model: "",
openRank: false,
problems: [],
add_problem: function () {
var problem = {};
var problem_id = make_id();
problem["id"] = problem_id;
problem["samples"] = [];
problem["webuploader"] = {};
problem["toggle_string"] = "折叠";
var problem={id: problem_id, title: "", cpu: "", memory: "", description: "",samples: [], webuploader: {}, visible: true};
vm.problems.push(problem);
uploader("#problem-" + problem_id + "-uploader");
console.log(vm.problems);
uploader("#problem-" + problem_id + "-uploader","");
editor("#problem-" + problem_id + "-description")
$("#add-contest-form").formValidation('addField', $('[name="problem_name[]"]'));
$("#add-contest-form").formValidation('addField', $('[name="cpu[]"]'));
$("#add-contest-form").formValidation('addField', $('[name="memory[]"]'));
@@ -127,31 +146,21 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
vm.problems.remove(problem);
}
},
toggle_problem: function (problem) {
$("#" + "problem-" + problem.id + "-body").toggle();
if (problem["toggle_string"] == "展开") {
problem["toggle_string"] = "折叠";
}
else {
problem["toggle_string"] = "展开";
}
toggle: function (item) {
item.visible = !item.visible;
},
add_sample: function (problem) {
problem["samples"].push({"id": make_id(), "toggle_string": "折叠"});
problem.samples.push({id: make_id(), visible: true, input: "", output: ""});
},
del_sample: function (problem, sample) {
if (confirm("你确定要删除么?")) {
problem["samples"].remove(sample);
problem.samples.remove(sample);
}
},
toggle_sample: function (problem, sample) {
$("#" + "problem-" + problem.id + "-sampleio-" + sample.id + "-body").toggle();
if (sample["toggle_string"] == "展开") {
sample["toggle_string"] = "折叠";
}
else {
sample["toggle_string"] = "展开";
}
getBtnContent: function (item) {
if (item.visible)
return "折叠";
return "展开";
}
});
avalon.scan();
@@ -168,7 +177,6 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
weekStart: 1,
language: "zh-CN"
});
$("#contest_start_time").datetimepicker()
.on("hide", function (ev) {
$("#add-contest-form")

108
static/src/js/app/admin/problem/add_problem.js Normal file
View File

@@ -0,0 +1,108 @@
require(["jquery", "avalon", "editor", "uploader", "validation"],
function ($, avalon, editor, uploader) {
avalon.vmodels.add_problem = null;
$("#add-problem-form")
.formValidation({
framework: "bootstrap",
fields: {
title: {
validators: {
notEmpty: {
message: "请填写题目名称"
},
stringLength: {
min: 1,
max: 30,
message: "名称不能超过30个字"
}
}
},
description:{
validators: {
notEmpty: {
message: "请输入描述"
}
}
},
cpu: {
validators: {
notEmpty: {
message: "请输入cpu时间"
},
integer: {
message: "请输入一个合法的数字"
},
between: {
inclusive: true,
min: 1,
max: 5000,
message: "只能在1-5000之间"
}
}
},
memory: {
validators: {
notEmpty: {
message: "请输入内存"
},
integer: {
message: "请输入一个合法的数字"
}
}
}
}
})
.on("success.form.fv", function (e) {
e.preventDefault();
var ajaxData = {
title: vm.title,
description: vm.description,
cpu: vm.cpu,
memory: vm.memory,
samples: []
};
for (var i = 0; i < vm.samples.length; i++) {
ajaxData.samples.push({input: vm.samples[i].input, output: vm.samples[i].output});
}
console.log(ajaxData);
});
var problemDiscription = editor("#problemDescription");
var testCaseUploader = uploader("#testCaseFile", "/admin/api/testCase");//{
/*auto: true,
swf: '/static/js/lib/webuploader/Uploader.swf',
server: 'http://webuploader.duapp.com/server/fileupload.php',
multiple:false,
accept: {
title: 'Zip',
extensions: 'zip',
mimeTypes: 'zip/*'
}*/
// });
var vm = avalon.define({
$id: "add_problem",
title: "",
description: "",
cpu: 0,
memory: 0,
samples: [],
add_sample: function () {
vm.samples.push({input: "", output: "", "visible": true});
},
del_sample: function (sample) {
if (confirm("你确定要删除么?")) {
vm.samples.remove(sample);
}
},
toggle_sample: function (sample) {
sample.visible = !sample.visible;
},
getBtnContent: function (item) {
if (item.visible)
return "折叠";
return "展开";
}
});
avalon.scan();
});

0
static/src/img/Uploader.swf → static/src/js/lib/webuploader/Uploader.swf
View File

4
static/src/js/utils/uploader.js
View File

@@ -1,12 +1,12 @@
define("uploader", ["webuploader"], function(webuploader){
function uploader(selector) {
function uploader(selector, server) {
return webuploader.create({
// swf文件路径
swf: "/js/Uploader.swf",
// 文件接收服务端。
server: "http://webuploader.duapp.com/server/fileupload.php",
server: server,
// 选择文件的按钮。可选。
// 内部根据当前运行是创建，可能是input元素，也可能是flash.

78
template/admin/contest/add_contest.html
View File

@@ -2,11 +2,11 @@
<form id="add-contest-form">
<div class="col-md-9">
<div class="col-md-12">
<label>比赛题目</label>
<label>比赛名称</label>
</div>
<div class="col-md-12">
<div class="form-group">
<input type="text" name="name" class="form-control">
<input type="text" name="name" class="form-control" ms-duplex="title">
</div>
</div>
<div class="col-md-12">
@@ -14,7 +14,8 @@
</div>
<div class="col-md-12">
<div class="form-group">
<textarea id="editor" placeholder="这里输入内容" autofocus></textarea>
<textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="description"></textarea>
<small ms-visible="description==''" style="color:red">请填写比赛描述</small>
</div>
</div>
<div class="col-md-6">
@@ -25,12 +26,13 @@
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" class="form-control" name="start_time" id="contest_start_time">
<input type="text" class="form-control" name="start_time" id="contest_start_time"
ms-duplex="startTime">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" class="form-control" name="end_time" id="contest_end_time">
<input type="text" class="form-control" name="end_time" id="contest_end_time" ms-duplex="endTime">
</div>
</div>
@@ -51,18 +53,24 @@
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" class="form-control" name="password" placeholder="留空就是公开赛">
<input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="password">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<input type="radio" name="mode">OI
<input type="radio" name="mode">ACM
<label><input type="radio" name="mode" ms-duplex-checked="model">
<small>OI</small>
</label>
<label><input type="radio" name="mode">
<small>ACM</small>
</label>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<input type="checkbox" value="open_rank">开放排名
<label class="text"><input type="checkbox" ms-duplex-checked="openRank">
<small>开放排名</small>
</label>
</div>
</div>
@@ -75,23 +83,22 @@
<div class="panel panel-default problem-panel" ms-attr-id="problem-{{ problem.id }}">
<div class="panel-heading">
<span class="panel-title">题目{{$index + 1}} </span>
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
ms-click="toggle_problem(problem)">
{{ problem.toggle_string }}
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="toggle(problem)">
{{getBtnContent(problem)}}
</a>
<a href="javascript:void(0)" class="btn btn-danger btn-sm"
ms-click="del_problem(problem)">
<a href="javascript:void(0)" class="btn btn-danger btn-sm" ms-click="del_problem(problem)">
删除
</a>
</div>
<div class="panel-body" ms-attr-id="problem-{{ problem.id }}-body">
<div class="panel-body" ms-visible="problem.visible">
<div class="col-md-12">
<label>题目</label>
</div>
<div class="col-md-12">
<div class="form-group">
<input type="text" name="problem_name[]" class="form-control">
<input type="text" name="problem_name[]" class="form-control"
ms-duplex="problem.title">
</div>
</div>
<div class="col-md-6">
@@ -102,14 +109,18 @@
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" name="cpu[]" class="form-control">
<input type="text" name="cpu[]" class="form-control" ms-duplex="problem.cpu">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" name="memory[]" class="form-control">
<input type="text" name="memory[]" class="form-control" ms-duplex="problem.memory">
</div>
</div>
<label>题目描述</label>
<textarea ms-attr-id="problem-{{ problem.id }}-description" placeholder="这里输入内容"
ms-duplex="problem.description"></textarea>
<small ms-visible="problem.description==''" style="color:red">请填写题目描述</small>
<div class="col-md-12">
<label>样例</label>
@@ -125,8 +136,8 @@
<span class="panel-title">样例{{$index + 1}}</span>
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
ms-click="toggle_sample(problem, sample)">
{{ sample.toggle_string }}
ms-click="toggle(sample)">
{{getBtnContent(sample)}}
</a>
<a href="javascript:void(0)" class="btn btn-danger btn-sm"
ms-click="del_sample(problem, sample)">
@@ -134,23 +145,18 @@
</a>
</div>
<div class="panel-body"
ms-attr-id="problem-{{ problem.id }}-sampleio-{{ sample.id }}-body">
<div class="col-md-12">
<div class="panel-body row" ms-visible="sample.visible">
<div class="col-md-6">
<div class="form-group">
<label>样例输入</label>
<textarea class="form-control" rows="5"
ms-duplex="sample.input"></textarea>
</div>
<div class="col-md-12">
</div>
<div class="col-md-6">
<div class="form-group">
<textarea class="form-control" rows="5"></textarea>
</div>
</div>
<div class="col-md-12">
<label>样例输出</label>
</div>
<div class="col-md-12">
<div class="form-group">
<textarea class="form-control" rows="5"></textarea>
<textarea class="form-control" rows="5" ms-duplex="sample.output"></textarea>
</div>
</div>
</div>
@@ -163,14 +169,18 @@
<div class="col-md-12">
<div class="form-group">
<div ms-attr-id="problem-{{ problem.id }}-uploader">选择文件</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<input type="submit" class="btn btn-success btn-lg" value="发布比赛">
</div>
</div>
</div>
</form>
</div>

78
template/admin/problem/add_problem.html Normal file
View File

@@ -0,0 +1,78 @@
<div ms-controller="add_problem" class="col-md-9">
<form id="add-problem-form">
<div class="col-md-12">
<div class="form-group">
<label>题目标题</label>
<input type="text" name="title" class="form-control" ms-duplex="title">
</div>
<div class="form-group">
<label>题目描述</label>
<textarea id="problemDescription" placeholder="这里输入内容" autofocus ms-duplex="description"></textarea>
<small ms-visible="description==''" style="color:red">请填写题目描述</small>
</div>
<div class="col-md-6">
<label>cpu</label>
</div>
<div class="col-md-6">
<label>内存</label>
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" name="cpu" class="form-control" ms-duplex="cpu">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<input type="text" name="memory" class="form-control" ms-duplex="memory">
</div>
</div>
<div class="col-md-12">
<label>样例</label>
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_sample()">添加</a>
<div class="sample">
<div class="panel panel-default sample-panel" ms-repeat-sample="samples">
<div class="panel-heading">
<span class="panel-title">样例{{$index + 1}}</span>
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
ms-click="toggle_sample(sample)">
{{getBtnContent(sample)}}
</a>
<a href="javascript:void(0)" class="btn btn-danger btn-sm"
ms-click="del_sample(sample)">
删除
</a>
</div>
<div class="panel-body row" ms-visible="sample.visible">
<div class="col-md-6">
<div class="form-group">
<label>样例输入</label>
<textarea class="form-control" rows="5" ms-duplex="sample.input"></textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label>样例输出</label>
<textarea class="form-control" rows="5" ms-duplex="sample.output"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<label>测试数据</label>
</div>
<div class="col-md-12">
<div class="form-group">
<div id="testCaseFile">选择文件</div>
</div>
</div>
</div>
<div class="col-md-12">
<input type="submit" class="btn btn-success btn-lg" value="发布题目" id="submitBtn">
</div>
</form>
</div>
<script src="/static/js/app/admin/problem/add_problem.js"></script>