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

Merge branch 'dev-sxw' into virusdefender-dev

Browse Source 
* dev-sxw:
  添加到编辑比赛页的入口[CI SKIP]
  修复重复进入页面导致小组列表不断增加的问题，每次先清空[CI SKIP]
  修改一些小问题，主要是在非管理员用户时，会调用models的字典对象的get方法，实际上这个字典没有get方法，会引发500，修改成了判断比赛（或者比赛题目）的创建者是否等于request.user；   另外仿照problem添加了对单个比赛信息的GETapi
  添加admin编辑比赛页面以及js[CI SKIP]
  修改提交样式
  调整顺序
  更新
  Revert "修改比赛单个题目列表的样式"
  修改比赛单个题目列表的样式
  update contest_problem.html
  update contest_problem.html
  添加运行判体脚本[CI SKIP]
  对盘题系统针对新测试服务器进行调整,该分支将不会并入主分支[CI SKIP]
  correct the path of test case in judger
  原来的dockerimage里没有MySQL-python,所以又改了下[CI SKIP]
  漏了一个import[CI SKIP]
  这是为了能以root身份运行celery[CI SKIP]
  为了在qduoj.cf上运行做了改动，因为判题和web都在一台机器上，这个docker image是从digitalOcean上download下来的[CI SKIP]
This commit is contained in:
virusdefender
2015-10-29 17:46:05 +08:00
parent 7eb47571a5 118fd45e3e
commit bad544544a
9 changed files with 314 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/src/js/app/admin/contest/addContest.js
View File

@@ -104,6 +104,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组");
return;
}
vm.allGroups = [];
for (var i = 0; i < data.data.length; i++) {
var item = data.data[i];
item["isSelected"] = false;

3
static/src/js/app/admin/contest/contestList.js
View File

@@ -24,7 +24,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
editContest: function(contestId){
avalon.vmodels.admin.contestId = contestId;
// todo 修改template_url
avalon.vmodels.admin.template_url = "template/contest/edit_contest.html";
},
showContestProblems: function(contestId){
avalon.vmodels.admin.contestId = contestId;
@@ -51,7 +51,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker",
success: function (data) {
if (!data.code) {
vm.contestList = data.data.results;
vm.announcementList = data.data.results;
avalon.vmodels.contestListPager.totalPage = data.data.total_page;
}
else {

180
static/src/js/app/admin/contest/editContest.js Normal file
View File

@@ -0,0 +1,180 @@
require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "datetimePicker",
"validator", "editorComponent"],
function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
$("#edit-contest-form").validator().on('submit', function (e) {
if (!e.isDefaultPrevented()) {
e.preventDefault();
var ajaxData = {
id: avalon.vmodels.admin.contestId,
title: vm.title,
description: avalon.vmodels.contestDescriptionEditor.content,
contest_type: 0,
real_time_rank: vm.realTimeRank,
start_time: vm.startTime,
end_time: vm.endTime,
visible: vm.visible
};
var selectedGroups = [];
if (!vm.isGlobal) {
for (var i = 0; i < vm.allGroups.length; i++) {
if (vm.allGroups[i].isSelected) {
selectedGroups.push(vm.allGroups[i].id);
}
}
ajaxData.groups = selectedGroups;
}
else {
if (vm.password) {
ajaxData.password = vm.password;
ajaxData.contest_type = 2;
}
else
ajaxData.contest_type = 1;
}
if (!vm.isGlobal && !selectedGroups.length) {
bsAlert("你没有选择参赛用户!");
return false;
}
if (ajaxData.description.trim() == "") {
bsAlert("比赛描述不能为空!");
return false;
}
$.ajax({
url: "/api/admin/contest/",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(ajaxData),
method: "put",
success: function (data) {
if (!data.code) {
bsAlert("修改成功！");
vm.showContestListPage();
}
else {
bsAlert(data.data);
}
}
});
}
return false;
});
if (avalon.vmodels.edit_contest)
var vm = avalon.vmodels.edit_contest;
else
var vm = avalon.define({
$id: "edit_contest",
title: "",
startTime: "",
endTime: "",
password: "",
isGlobal: true,
allGroups: [],
showGlobalViewRadio: true,
realTimeRank: true,
visible: false,
showContestListPage: function() {
avalon.vmodels.admin.template_url = "template/contest/contest_list.html";
},
contestDescriptionEditor: {
editorId: "contest-description-editor",
placeholder: "比赛介绍内容"
}
});
$.ajax({
url: "/api/user/",
method: "get",
dataType: "json",
success: function (data) {
if (!data.code) {
var admin_type = data.data.admin_type;
if (data.data.admin_type == 1) {
vm.isGlobal = false;
vm.showGlobalViewRadio = false;
}
}
$.ajax({
url: "/api/admin/group/",
method: "get",
dataType: "json",
success: function (data) {
if (!data.code) {
if (!data.data.length) {
if (admin_type != 2)
bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组");
return;
}
vm.allGroups = [];
for (var i = 0; i < data.data.length; i++) {
var item = data.data[i];
item["isSelected"] = false;
vm.allGroups.push(item);
}
}
else {
bsAlert(data.data);
}
}
});
}
});
$.ajax({
url: "/api/admin/contest/?contest_id=" + avalon.vmodels.admin.contestId,
method: "get",
dataType: "json",
success: function (data) {
if (data.code) {
bsAlert(data.data);
}
else {
var contest = data.data;
vm.title = contest.title;
avalon.vmodels.contestDescriptionEditor.content = contest.description;
vm.visible = contest.visible;
vm.realTimeRank = contest.real_time_rank;
vm.startTime = contest.start_time.substring(0, 16).replace("T", " ");
vm.endTime = contest.end_time.substring(0, 16).replace("T", " ");
if (contest.contest_type == 0) { //contest_type == 0, 小组内比赛
vm.isGlobal = false;
for (var i = 0; i < vm.allGroups.length; i++) {
vm.allGroups[i].isSelected = false;
}
for (var i = 0; i < contest.groups.length; i++) {
var id = parseInt(contest.groups[i]);
console.log(id);
for (var index = 0; vm.allGroups[index]; index++) {
if (vm.allGroups[index].id == id) {
vm.allGroups[index].isSelected = true;
console.log(id+"asdf");
break;
}
}
}
}
else {
vm.isGlobal = true;
}
}
}
});
avalon.scan();
$("#contest_start_time").datetimepicker({
format: "yyyy-mm-dd hh:ii",
minuteStep: 5,
weekStart: 1,
language: "zh-CN"
});
$("#contest_end_time").datetimepicker({
format: "yyyy-mm-dd hh:ii",
minuteStep: 5,
weekStart: 1,
language: "zh-CN"
});
});