mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
Merge branch 'dev' into hohoTT-dev
This commit is contained in:
commit
90bf7fb782
@ -1,6 +1,6 @@
|
||||
require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||
"validation","tagEditor"],
|
||||
function ($, avalon, editor, uploader) {
|
||||
require(["jquery", "avalon", "editor", "uploader", "bs_alert", "datetimepicker",
|
||||
"validation",],
|
||||
function ($, avalon, editor, uploader, bs_alert) {
|
||||
avalon.vmodels.add_contest = null;
|
||||
$("#add-contest-form")
|
||||
.formValidation({
|
||||
@ -72,10 +72,10 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||
"cpu[]": {
|
||||
validators: {
|
||||
notEmpty: {
|
||||
message: "请输入cpu时间"
|
||||
message: "请输入时间限制"
|
||||
},
|
||||
integer: {
|
||||
message: "请输入一个合法的数字"
|
||||
message: "时间限制用整数表示"
|
||||
},
|
||||
between: {
|
||||
inclusive: true,
|
||||
@ -125,13 +125,13 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||
text += possible.charAt(Math.floor(Math.random() * possible.length));
|
||||
return text;
|
||||
}
|
||||
|
||||
|
||||
var editor1 = editor("#editor");
|
||||
var upLoaderInited = false;
|
||||
editor("#editor");
|
||||
|
||||
var vm = avalon.define({
|
||||
$id: "add_contest",
|
||||
title: "",
|
||||
problemCount: 0,
|
||||
description: "",
|
||||
startTime: "",
|
||||
endTime: "",
|
||||
@ -139,45 +139,27 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||
model: "",
|
||||
openRank: false,
|
||||
problems: [],
|
||||
problemNo: "-1",
|
||||
add_problem: function () {
|
||||
var problem_id = make_id();
|
||||
var problem = {
|
||||
id: problem_id,
|
||||
title: "",
|
||||
cpu: "",
|
||||
memory: "",
|
||||
cpu: 1000,
|
||||
memory: 256,
|
||||
description: "",
|
||||
samples: [],
|
||||
visible: true,
|
||||
test_case_id: "",
|
||||
testCaseList: [],
|
||||
hint: "",
|
||||
isVisible: false,
|
||||
difficulty: 0,
|
||||
tags: [],
|
||||
tag: ""
|
||||
uploadSuccess: false
|
||||
};
|
||||
vm.problems.push(problem);
|
||||
var id = vm.problems.length - 1;
|
||||
editor("#problem-" + problem_id + "-description");
|
||||
var hinteditor = editor("#problem-" + problem_id +"-hint");
|
||||
$("#problem-" + problem_id +"-tags").tagEditor();
|
||||
uploader("#problem-" + problem_id + "-uploader", "/api/admin/test_case_upload/", function (file, respond) {
|
||||
console.log(respond);
|
||||
if (respond.code)
|
||||
bs_alert(respond.data);
|
||||
else {
|
||||
vm.problems[id].test_case_id = respond.data.test_case_id;
|
||||
vm.problems[id].uploadSuccess = true;
|
||||
vm.problems[id].testCaseList = [];
|
||||
for (var i = 0; i < respond.data.file_list.input.length; i++) {
|
||||
vm.problems[id].push({
|
||||
input: respond.data.file_list.input[i],
|
||||
output: respond.data.file_list.output[i]
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
$("#add-contest-form").formValidation('addField', $('[name="problem_name[]"]'));
|
||||
$("#add-contest-form").formValidation('addField', $('[name="cpu[]"]'));
|
||||
$("#add-contest-form").formValidation('addField', $('[name="memory[]"]'));
|
||||
@ -204,6 +186,35 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||
return "展开";
|
||||
}
|
||||
});
|
||||
|
||||
uploader("#uploader", "/api/admin/test_case_upload/", function (file, respond) {
|
||||
if (respond.code)
|
||||
bs_alert(respond.data);
|
||||
else {
|
||||
var index = parseInt(vm.problemNo)-1;
|
||||
vm.problems[index].test_case_id = respond.data.test_case_id;
|
||||
vm.problems[index].uploadSuccess = true;
|
||||
vm.problems[index].testCaseList = [];
|
||||
for (var i = 0; i < respond.data.file_list.input.length; i++) {
|
||||
vm.problems[index].testCaseList.push({
|
||||
input: respond.data.file_list.input[i],
|
||||
output: respond.data.file_list.output[i]
|
||||
});
|
||||
}
|
||||
bs_alert("测试数据添加成功!共添加"+vm.problems[index].testCaseList.length +"组测试数据");
|
||||
}
|
||||
},
|
||||
function(){
|
||||
console.log(vm.problemNo);
|
||||
if (vm.problemNo == "-1")
|
||||
{
|
||||
bs_alert("你还未指定一道题目!");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
);
|
||||
isUploaderInited = true;
|
||||
|
||||
avalon.scan();
|
||||
|
||||
$("#contest_start_time").datetimepicker({
|
||||
|
@ -14,11 +14,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
|
||||
name: "",
|
||||
description: "",
|
||||
join_group_setting: {0: false, 1: false, 2: false},
|
||||
checked_setting: 0,
|
||||
|
||||
getSettingChecked: function (setting) {
|
||||
return setting == vm.join_group_setting;
|
||||
},
|
||||
checked_setting: "0",
|
||||
|
||||
updateGroupInfo: function () {
|
||||
$.ajax({
|
||||
@ -26,7 +22,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
|
||||
url: "/api/admin/group/",
|
||||
method: "put",
|
||||
data: {group_id: avalon.vmodels.admin.group_id, name: vm.name,
|
||||
description: vm.description, join_group_setting: vm.join_group_setting},
|
||||
description: vm.description, join_group_setting: vm.checked_setting},
|
||||
dataType: "json",
|
||||
success: function (data) {
|
||||
if (!data.code) {
|
||||
@ -107,7 +103,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
|
||||
if (!data.code) {
|
||||
vm.name = data.data.name;
|
||||
vm.description = data.data.description;
|
||||
vm.join_group_setting[data.data.join_group_setting] = true;
|
||||
vm.checked_setting = data.data.join_group_setting.toString();
|
||||
}
|
||||
else {
|
||||
bs_alert(data.data);
|
||||
|
@ -134,7 +134,9 @@ require(["jquery", "avalon", "editor", "uploader", "bs_alert", "csrf", "tagEdito
|
||||
input: respond.data.file_list.input[i],
|
||||
output: respond.data.file_list.output[i]
|
||||
});
|
||||
|
||||
}
|
||||
bs_alert("测试数据添加成功!共添加"+vm.testCaseList.length +"组测试数据");
|
||||
}
|
||||
});
|
||||
var hinteditor = editor("#hint");
|
||||
@ -147,7 +149,7 @@ require(["jquery", "avalon", "editor", "uploader", "bs_alert", "csrf", "tagEdito
|
||||
memory: 256,
|
||||
samples: [],
|
||||
hint: "",
|
||||
visible: false,
|
||||
visible: true,
|
||||
difficulty: 0,
|
||||
tags: [],
|
||||
tag: "",
|
||||
|
@ -1,5 +1,5 @@
|
||||
define("uploader", ["webuploader", "csrf"], function(webuploader,csrf){
|
||||
function uploader(selector, server, onSuccess) {
|
||||
function uploader(selector, server, onSuccess, beforeUpload) {
|
||||
var Webuploader= webuploader.create({
|
||||
auto: true,
|
||||
// swf文件路径
|
||||
@ -15,7 +15,7 @@ define("uploader", ["webuploader", "csrf"], function(webuploader,csrf){
|
||||
});
|
||||
Webuploader.on("uploadBeforeSend",csrf);
|
||||
Webuploader.on("uploadSuccess", onSuccess);
|
||||
|
||||
Webuploader.on("beforeFileQueued", beforeUpload);
|
||||
return Webuploader;
|
||||
}
|
||||
|
||||
|
@ -27,8 +27,8 @@
|
||||
</div>
|
||||
<div class="text-right">
|
||||
页数:{{page}}/{{page_count}}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
<button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
|
||||
<button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
|
||||
</div>
|
||||
|
||||
<div ms-visible="isEditing">
|
||||
|
@ -37,9 +37,7 @@
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label>
|
||||
密码保护
|
||||
</label>
|
||||
<label>密码保护</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>
|
||||
@ -77,10 +75,17 @@
|
||||
<div class="col-md-12">
|
||||
<label>添加题目</label>
|
||||
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_problem()">添加</a>
|
||||
<div class="col-md-12">
|
||||
<label>上传测试用例</label>
|
||||
<label>选择题号</label><select ms-duplex="problemNo"><option value="-1">未指定</option><option ms-repeat="problems" ms-attr-value="$index+1">{{$index+1}}</option></select>
|
||||
<div id="uploader">
|
||||
<div>选择文件</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="problem" ms-repeat-problem="problems">
|
||||
<div class="panel panel-default problem-panel" ms-attr-id="problem-{{ problem.id }}">
|
||||
<div class="panel panel-default problem-panel">
|
||||
<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)">
|
||||
@ -91,73 +96,44 @@
|
||||
</a>
|
||||
</div>
|
||||
<div class="panel-body" ms-visible="problem.visible">
|
||||
<div class="col-md-12">
|
||||
<label>题目</label>
|
||||
<div class="form-group col-md-12">
|
||||
<label>题目标题</label>
|
||||
<input type="text" name="problem_name[]" class="form-control" ms-duplex="problem.title">
|
||||
</div>
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<input type="text" name="problem_name[]" class="form-control"
|
||||
ms-duplex="problem.title">
|
||||
</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="form-group">
|
||||
<div class="form-group col-md-12">
|
||||
<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>
|
||||
<div class="form-group col-md-12">
|
||||
<label>提示</label>
|
||||
<textarea ms-attr-id="problem-{{ problem.id }}-hint" placeholder="这里输入内容" ms-duplex="problem.hint"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group"><label>cpu</label>
|
||||
<input type="number" name="cpu[]" class="form-control" ms-duplex="problem.cpu">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group"><label>内存</label>
|
||||
<input type="number" name="memory[]" class="form-control" ms-duplex="problem.memory">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group"><label>难度</label>
|
||||
<input type="number" name="difficulty[]" class="form-control" ms-duplex="problem.difficulty">
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>cpu</label>
|
||||
<input type="number" name="cpu[]" class="form-control" ms-duplex="problem.cpu">
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>前台是否可见</label><br>
|
||||
<label><input type="checkbox" ms-duplex-checked="problem.isVisible">
|
||||
<small> 可见</small>
|
||||
</label>
|
||||
<label>内存</label>
|
||||
<input type="number" name="memory[]" class="form-control" ms-duplex="problem.memory">
|
||||
</div>
|
||||
<div id="tag" class="col-md-12">
|
||||
<label>标签</label><br>
|
||||
<input type="text" ms-attr-id="problem-{{ problem.id }}-tags" >
|
||||
<div class="col-md-3 form-group">
|
||||
<label>难度</label>
|
||||
<input type="number" name="difficulty[]" class="form-control" ms-duplex="problem.difficulty">
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
|
||||
<label>样例</label>
|
||||
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
|
||||
ms-click="add_sample(problem)">
|
||||
添加
|
||||
</a>
|
||||
|
||||
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_sample(problem)">添加</a>
|
||||
<div class="sample">
|
||||
<div class="panel panel-default sample-panel"
|
||||
ms-repeat-sample="problem.samples">
|
||||
<div class="panel panel-default sample-panel" ms-repeat-sample="problem.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)">
|
||||
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="toggle(sample)">
|
||||
{{getBtnContent(sample)}}
|
||||
</a>
|
||||
<a href="javascript:void(0)" class="btn btn-danger btn-sm"
|
||||
ms-click="del_sample(problem, sample)">
|
||||
<a href="javascript:void(0)" class="btn btn-danger btn-sm" ms-click="del_sample(problem, sample)">
|
||||
删除
|
||||
</a>
|
||||
|
||||
</div>
|
||||
<div class="panel-body row" ms-visible="sample.visible">
|
||||
<div class="col-md-6">
|
||||
@ -183,25 +159,19 @@
|
||||
<small class="text-info">请将所有测试用例打包在一个文件中上传,所有文件要在压缩包的根目录,且输入输出文件名要以从1开始连续数字标识要对应例如:<br>
|
||||
1.in 1.out 2.in 2.out
|
||||
</small>
|
||||
<table class="table table-striped" ms-visible="uploadSuccess">
|
||||
<table class="table table-striped" ms-visible="problem.uploadSuccess">
|
||||
<tr>
|
||||
<td>编号</td>
|
||||
<td>输入文件名</td>
|
||||
<td>输出文件名</td>
|
||||
</tr>
|
||||
<tr ms-repeat="testCaseList">
|
||||
<tr ms-repeat="problem.testCaseList">
|
||||
<td>{{$index}}</td>
|
||||
<td>{{el.input}}</td>
|
||||
<td>{{el.output}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<div ms-attr-id="problem-{{ problem.id }}-uploader">选择文件</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -35,8 +35,8 @@
|
||||
|
||||
<div class="text-right">
|
||||
页数:{{page}}/{{page_count}}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
<button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
|
||||
<button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
@ -22,8 +22,8 @@
|
||||
|
||||
<div class="text-right">
|
||||
页数:{{ page }}/{{ page_count }}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
<button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
|
||||
<button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
|
||||
</div>
|
||||
|
||||
<h1>修改小组信息</h1>
|
||||
@ -43,9 +43,9 @@
|
||||
<div class="col-md-12">
|
||||
<div class="form-group">
|
||||
<label>加入小组设置</label>
|
||||
<input type="radio" name="join_group_setting" value="0" ms-duplex-checked="join_group_setting[0]">允许任何人加入
|
||||
<input type="radio" name="join_group_setting" value="1" ms-duplex-checked="join_group_setting[1]">提交请求后管理员审核
|
||||
<input type="radio" name="join_group_setting" value="2" ms-duplex-checked="join_group_setting[2]">不允许任何人加入
|
||||
<input type="radio" name="join_group_setting" value="0" ms-duplex-string="checked_setting">允许任何人加入
|
||||
<input type="radio" name="join_group_setting" value="1" ms-duplex-string="checked_setting">提交请求后管理员审核
|
||||
<input type="radio" name="join_group_setting" value="2" ms-duplex-string="checked_setting">不允许任何人加入
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
|
@ -23,8 +23,8 @@
|
||||
|
||||
<div class="text-right">
|
||||
页数:{{page}}/{{page_count}}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
<button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
|
||||
<button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
@ -39,8 +39,8 @@
|
||||
</div>
|
||||
<div class="text-right">
|
||||
页数:{{page}}/{{page_count}}
|
||||
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
|
||||
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
|
||||
<button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
|
||||
<button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
|
||||
</div>
|
||||
<div ms-visible="isEditing">
|
||||
<h3>修改用户信息</h3>
|
||||
|
Loading…
Reference in New Issue
Block a user