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

[前端]修改完善了添加比赛页面, 比赛列表功能仍不全面,稍后改进[CI SKIP]

Browse Source
This commit is contained in:
esp
2015-08-22 19:20:22 +08:00
parent c0b4999b1a
commit 4361f4d6e4
4 changed files with 255 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
static/src/js/app/admin/contest/add_contest.js
View File

@@ -3,41 +3,58 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) { function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
avalon.vmodels.add_contest = null; avalon.vmodels.add_contest = null;
$("#add-contest-form").validator().on('submit', function (e) { $("#add-contest-form").validator().on('submit', function (e) {
if (!e.isDefaultPrevented()){ if (!e.isDefaultPrevented()){
alert("smoething went wrong!"); e.preventDefault();
var ajaxData = {
title: vm.title,
description: vm.description,
mode: vm.mode,
contest_type: 0,
show_rank: vm.showRank,
show_user_submission: vm.showSubmission,
//password: vm.password,
start_time: vm.startTime,
end_time: vm.endTime,
visible: true
};
if (vm.choseGroupList[0].id == 0) //everyone | public contest
if (vm.password == "")
ajaxData.contest_type = 1;
else{
ajaxData.password = vm.password;
}
else { // Add groups info
ajaxData.groups = [];
for (var i = 0; vm.choseGroupList[i]; i++)
ajaxData.groups.push(parseInt(vm.choseGroupList[i].id))
} }
else{
var data = {
title: vm.title, console.log(ajaxData);
description: vm.description, $.ajax({
start_time: vm.startTime, beforeSend: csrfTokenHeader,
end_time: vm.endTime, url: "/api/admin/contest/",
password: vm.password, dataType: "json",
mode: vm.model, contentType: "application/json",
show_rank: vm.openRank data: JSON.stringify(ajaxData),
}; method: "post",
$.ajax({ contentType: "application/json",
beforeSend: csrfTokenHeader, success: function (data) {
url: "/api/admin/contest/", if (!data.code) {
dataType: "json", bsAlert("添加成功！");
data: data, console.log(data);
method: "post", }
contentType: "application/json", else {
success: function (data) { bsAlert(data.data);
if (!data.code) { console.log(data);
bsAlert("添加成功！"); }
console.log(data); }
} });
else { console.log(JSON.stringify(ajaxData));
bsAlert(data.data); }
console.log(data); return false;
} });
}
});
console.log(data);
}
return false;
})
editor("#editor"); editor("#editor");
editor("#problemDescriptionEditor"); editor("#problemDescriptionEditor");
editor("#problemHintEditor"); editor("#problemHintEditor");
@@ -57,8 +74,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
editSamples: [], editSamples: [],
editTestCaseList: [], editTestCaseList: [],
group: "-1", group: "-1",
groupList: [{name:"Group one", id :3, choosed: false},{name:"Group two", id:5, choosed: false}], groupList: [],
choosedGroupList: [], choseGroupList: [],
showProblemEditArea: function (problemIndex) { showProblemEditArea: function (problemIndex) {
if (vm.editingProblemId == problemIndex){ if (vm.editingProblemId == problemIndex){
vm.problems[vm.editingProblemId-1].samples = vm.editSamples; vm.problems[vm.editingProblemId-1].samples = vm.editSamples;
@@ -126,50 +143,48 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
if (vm.group == -1) return; if (vm.group == -1) return;
if (vm.groupList[vm.group].id == 0){ if (vm.groupList[vm.group].id == 0){
vm.passwordUsable = true; vm.passwordUsable = true;
vm.choosedGroupList = []; vm.choseGroupList = [];
for (var key in vm.groupList){ for (var key in vm.groupList){
vm.groupList[key].choosed = true; vm.groupList[key].chose = true;
} }
} }
vm.groupList[vm.group]. choosed = true; vm.groupList[vm.group]. chose = true;
vm.choosedGroupList .push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id}); vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id});
}, },
unchoosed: function(groupIndex){ unchose: function(groupIndex){
if (vm.groupList[vm.choosedGroupList[groupIndex].index].id == 0){ if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){
vm.passwordUsable = false; vm.passwordUsable = false;
for (key in vm.groupList){ for (key in vm.groupList){
vm.groupList[key].choosed = false; vm.groupList[key].chose = false;
} }
} }
vm.groupList[vm.choosedGroupList[groupIndex].index].choosed = false; vm.groupList[vm.choseGroupList[groupIndex].index].chose = false;
vm.choosedGroupList.remove(vm.choosedGroupList[groupIndex]); vm.choseGroupList.remove(vm.choseGroupList[groupIndex]);
} }
}); });
var isSuperAdmin = true; var isSuperAdmin = true;
$.ajax({ //用于获取该用户创建的所有小组的ajax请求 $.ajax({ //用于获取该用户创建的所有小组的ajax请求
beforeSend: csrfTokenHeader, beforeSend: csrfTokenHeader,
url: "/api/admin/group/?my_group=true", url: "/api/admin/group/?my_group=true",
dataType: "json", dataType: "json",
method: "get", method: "get",
contentType: "application/json", contentType: "application/json",
success: function (data) { success: function (data) {
if (!data.code) { if (!data.code) {
for (var key in data.data) if (isSuperAdmin)
{ vm.groupList.push({id:0, name:"所有人", chose: false});
data.data[key].choosed = false; for (var key in data.data) {
vm.groupList.push(data.data[key]); data.data[key].chose = false;
} vm.groupList.push(data.data[key]);
if (isSuperAdmin) }
vm.groupList.push({id:0, name:"everyone", choosed: false}); }
console.log(data); else {
} bsAlert(data.data);
else { console.log(data);
bsAlert(data.data); }
console.log(data); }
} });
}
});

71
static/src/js/app/admin/contest/contest_list.js
View File

@@ -13,10 +13,25 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
nextPage: 0, nextPage: 0,
page: 1, page: 1,
totalPage: 1, totalPage: 1,
group: "-1",
groupList: [],
keyword: "", keyword: "",
editingContestId: 0, editingContestId: 0,
editTitle: "", editTitle: "",
editingProblemList: [], editProblemList: [],
editPassword: "",
editStartTime: "",
editEndTime: "",
editMode: "",
editShowRank: false,
editShowSubmission: false,
editProblemList: [],
editingProblemId: 0,
editSamples: [],
editTestCaseList: [],
editChoseGroupList: [],
modelNameList: ["ACM", "AC总数", "分数"],
contestTypeNameList: ["小组赛", "公开赛", "有密码保护的公开赛"],
getNext: function () { getNext: function () {
if (!vm.nextPage) if (!vm.nextPage)
return; return;
@@ -44,6 +59,24 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
else { else {
vm.editingContestId = contestId; vm.editingContestId = contestId;
vm.editTitle = vm.contestList[contestId-1].title; vm.editTitle = vm.contestList[contestId-1].title;
vm.editEndTime = vm.contestList[contestId-1].end_time;
vm.editPassword = vm.contestList[contestId-1].password;
vm.editStartTime = vm.contestList[contestId-1].start_time;
vm.editMode = vm.contestList[contestId-1].mode;
vm.editChoseGroupList = [];
//= vm.contestList[contestId-1].group;//
/*for (var key in vm.contestList[contestId-1].groups){
var id = parseInt(vm.contestList[contestId-1].groups);
for ()
vm.editChoseGroupList.push({
name:vm.groupList[vm.group].name,
index:index,
id:parseInt(vm.contestList[contestId-1].groups)
});
}*/
vm.editShowRank = vm.contestList[contestId-1].show_rank;
vm.editShowSubmission = vm.contestList[contestId-1].show_user_submission;
//vm.editProblemList = vm.contestList[contestId-1].problems
editor("#editor").setValue(vm.contestList[contestId-1].description); editor("#editor").setValue(vm.contestList[contestId-1].description);
vm.editingProblemList = vm.contestList[contestId-1].problemList; vm.editingProblemList = vm.contestList[contestId-1].problemList;
} }
@@ -54,7 +87,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
} }
function getPageData(page) { function getPageData(page) {
/*
var url = "/api/admin/contest/?paging=true&page=" + page + "&page_size=10"; var url = "/api/admin/contest/?paging=true&page=" + page + "&page_size=10";
if (vm.keyword != "") if (vm.keyword != "")
url += "&keyword=" + vm.keyword; url += "&keyword=" + vm.keyword;
@@ -75,20 +108,30 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
} }
} }
}); });
*/
vm.contestList =[{
id: 1, title:"The first contest",
created_by: {username:"owen"},
description:"<p>this contest is just for<h1>fun</h1></p>",
problemList:[{title:"A+B problem", id:1, testCaseList:[1,2], samples:[1,2]}]
}];
vm.totalPage = 1;
vm.previousPage = false;
vm.nextPage = false;
vm.page = 1;
} }
var isSuperAdmin = true;
$.ajax({ //用于获取该用户创建的所有小组的ajax请求
beforeSend: csrfTokenHeader,
url: "/api/admin/group/?my_group=true",
dataType: "json",
method: "get",
contentType: "application/json",
success: function (data) {
if (!data.code) {
if (isSuperAdmin)
vm.groupList.push({id:0, name:"所有人", chose: false});
for (var key in data.data) {
data.data[key].chose = false;
vm.groupList.push(data.data[key]);
}
}
else {
bsAlert(data.data);
console.log(data);
}
}
});
}); });
avalon.scan(); avalon.scan();
}); });

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

@@ -51,7 +51,7 @@
<div class="form-group"> <div class="form-group">
<select class="form-control" name="password" ms-duplex="group" ms-change="addGroup" value="-1"> <select class="form-control" name="password" ms-duplex="group" ms-change="addGroup" value="-1">
<option value="-1">请选择</option> <option value="-1">请选择</option>
<option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.choosed">{{el.name}}</option> <option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
</select> </select>
</div> </div>
</div> </div>
@@ -61,7 +61,7 @@
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div ms-repeat="choosedGroupList" class="group-tag" ms-click="unchoosed($index)">{{el.name}}</div> <div ms-repeat="choseGroupList" class="group-tag" ms-click="unchose($index)">{{el.name}}</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label>排名方式</label> <label>排名方式</label>
@@ -231,4 +231,3 @@
</div> </div>
<script src="/static/js/app/admin/contest/add_contest.js"></script> <script src="/static/js/app/admin/contest/add_contest.js"></script>
<link href="/static/css/add_contest.css" rel="stylesheet">

177
template/admin/contest/contest_list.html
View File

@@ -16,27 +16,21 @@
<th>ID</th> <th>ID</th>
<th>比赛</th> <th>比赛</th>
<th>比赛类型</th> <th>比赛类型</th>
<th>比赛模式</th>
<th>公开排名</th> <th>公开排名</th>
<th>开始时间</th> <th>开始时间</th>
<th>结束时间</th> <th>结束时间</th>
<th>创建时间</th> <th>创建时间</th>
<th>创建者</th> <th>创建者</th>
<td></td>
</tr> </tr>
<tr ms-repeat="contestList"> <tr ms-repeat="contestList" ms-click="showEditContestArea($index+1)">
<td>{{ el.id }}</td> <td>{{ el.id }}</td>
<td>{{ el.title }}</td> <td>{{ el.title }}</td>
<td>{{ el.type }}</td> <td>{{ contestTypeNameList[el.contest_type] }}</td>
<td>{{ el.mode }}</td>
<td>{{ el.show_rank }}</td> <td>{{ el.show_rank }}</td>
<td>{{ el.start_time|date("yyyy-MM-dd HH:mm:ss")}}</td> <td>{{ el.start_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
<td>{{ el.end_time|date("yyyy-MM-dd HH:mm:ss")}}</td> <td>{{ el.end_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
<td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td> <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
<td>{{ el.created_by.username }}</td> <td>{{ el.created_by.username }}</td>
<td>
<button class="btn-sm btn-info" ms-click="showEditContestArea($index+1)">详情</button>
</td>
</tr> </tr>
</table> </table>
<div class="text-right"> <div class="text-right">
@@ -45,72 +39,129 @@
<button ms-attr-class="getBtnClass('next')" ms-click="getNext">下一页</button> <button ms-attr-class="getBtnClass('next')" ms-click="getNext">下一页</button>
</div> </div>
<div ms-visible="editingContestId"> <div ms-visible="editingContestId">
<div class="col-md-12"> <div class="col-md-12">
<label>比赛名称</label> <label>比赛名称</label>
<input type="text" name="name" class="form-control" ms-duplex="editTitle"> </div>
<label>说明</label> <div class="col-md-12">
<div class="form-group">
<input type="text" name="name" class="form-control" ms-duplex="editTitle"
data-error="请填写比赛名称(名称不能超过50个字)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">
<label>说明</label>
</div>
<div class="col-md-12">
<div class="form-group">
<textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="editDescription"></textarea> <textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="editDescription"></textarea>
<div class="help-block with-errors"></div>
<small ms-visible="description==''" style="color:red">请填写比赛描述</small> <small ms-visible="description==''" style="color:red">请填写比赛描述</small>
</div> </div>
<div class="col-md-6 form-group"> </div>
<label>开始时间</label> <div class="col-md-6">
</div> <label>开始时间</label>
<div class="col-md-6 form-group"> </div>
<label>结束时间</label> <div class="col-md-6">
</div> <label>结束时间</label>
<div class="col-md-6 form-group"> </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="editStartTime"> ms-duplex="editStartTime" data-error="请填写比赛开始时间" required>
<div class="help-block with-errors"></div>
</div> </div>
<div class="col-md-6 form-group"> </div>
<input type="text" class="form-control" name="editEnd_time" id="contest_end_time" ms-duplex="endTime"> <div class="col-md-6">
<div class="form-group">
<input type="text" class="form-control" name="end_time" id="contest_end_time"
ms-duplex="editEndTime" data-error="请填写比赛结束时间" required>
<div class="help-block with-errors"></div>
</div> </div>
<div class="col-md-6 form-group"> </div>
<label>密码保护</label> <div class="col-md-6">
<label>允许参加的用户</label>
</div>
<div class="col-md-6">
<label>密码保护</label>
</div>
<div class="col-md-6">
<div class="form-group">
<select class="form-control" name="password" ms-duplex="group" ms-change="addGroup" value="-1">
<option value="-1">请选择</option>
<option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
</select>
</div> </div>
<div class="col-md-3 form-group"> </div>
<label>模式</label> <div class="col-md-6">
<div class="form-group">
<input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword"
ms-attr-readonly="!passwordUsable">
</div> </div>
<div class="col-md-3 form-group"> </div>
<label>结束前是否开放排名</label> <div class="col-md-12">
<div ms-repeat="choseGroupList" class="group-tag" ms-click="unchose($index)">{{el.name}}</div>
</div>
<div class="col-md-6">
<label>排名方式</label>
</div>
<div class="col-md-3">
<label>结束前是否开放排名</label>
</div>
<div class="col-md-3">
<label>是否公开提交记录</label>
</div>
<div class="col-md-6">
<div class="form-group">
<label><input type="radio" name="mode" ms-duplex-string="editMode" value="0">
<small>ACM</small>
</label>
<label><input type="radio" name="mode" ms-duplex-string="editMode" value="1">
<small>AC数量</small>
</label>
<label><input type="radio" name="mode" ms-duplex-string="editMode" value="2">
<small>分数</small>
</label>
</div> </div>
<div class="col-md-6 form-group"> </div>
<input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword"> <div class="col-md-3">
<div class="form-group">
<label class="text"><input type="checkbox" ms-duplex-checked="editShowRank">
<small>开放排名</small>
</label>
</div> </div>
<div class="col-md-3 form-group"> </div>
<label><input type="radio" name="mode" ms-duplex-checked="editMode"> <div class="col-md-3">
<small>OI</small> <div class="form-group">
</label> <label class="text"><input type="checkbox" ms-duplex-checked="editShowSubmission">
<label><input type="radio" name="mode"> <small>允许查看提交记录</small>
<small>ACM</small> </label>
</label>
</div> </div>
<div class="col-md-3"> </div>
<div class="form-group"> <div class="col-md-12">
<label class="text"><input type="checkbox" ms-duplex-checked="editShowRank"> <label>添加题目</label>
<small>开放排名</small> <a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_problem()">添加</a>
</label> <table class="table table-striped">
</div> <tr>
</div> <th>编号</th>
<div class="col-md-12"> <th>题目</th>
<table class="table table-striped"> <th>测试数据</th>
<tr> <td></td>
<th>编号</th> </tr>
<th>题目</th> <tr ms-repeat="editProblemList">
<th>测试数据</th> <td>题目{{ $index+1 }}</td>
<td></td> <td>{{ el.title }}</td>
</tr> <td>{{ el.testCaseList.length }}组</td>
<tr ms-repeat="editingProblemList"> <td>
<td>题目{{ $index+1 }}</td> <a href="javascript:void(0)" class="btn-sm btn-info"
<td>{{ el.title }}</td> ms-click="showProblemEditArea($index+1)">编辑</a>
<td>{{ el.testCaseList.length }}组</td> <a href="javascript:void(0)" class="btn-sm btn-danger" ms-click="del_problem($index+1)">删除</a>
<td> </td>
<a href="javascript:void(0)"class="btn-sm btn-info" ms-click="showProblemEditArea($index+1)">编辑</a> </tr>
<a href="javascript:void(0)"class="btn-sm btn-danger" ms-click="del_problem($index+1)">删除</a> </table>
</td>
</tr> </div>
</table>
</div>
</div> </div>
</div> </div>