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

完善后台admin对时间和内存设定的提示并调整admin布局

Browse Source
This commit is contained in:
virusdefender
2016-03-31 23:42:09 +08:00
parent 847c82a500
commit b1d191eda9
7 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
problem/serizalizers.py
View File

@@ -25,8 +25,8 @@ class CreateProblemSerializer(serializers.Serializer):
# [{"input": "1 1", "output": "2"}] # [{"input": "1 1", "output": "2"}]
samples = ProblemSampleSerializer() samples = ProblemSampleSerializer()
test_case_id = serializers.CharField(max_length=40) test_case_id = serializers.CharField(max_length=40)
time_limit = serializers.IntegerField(min_value=1) time_limit = serializers.IntegerField(min_value=1, max_value=10000)
memory_limit = serializers.IntegerField(min_value=1) memory_limit = serializers.IntegerField(min_value=16)
difficulty = serializers.IntegerField() difficulty = serializers.IntegerField()
tags = serializers.ListField(child=serializers.CharField(max_length=10)) tags = serializers.ListField(child=serializers.CharField(max_length=10))
hint = serializers.CharField(max_length=3000, allow_blank=True) hint = serializers.CharField(max_length=3000, allow_blank=True)

10
static/src/js/app/admin/contest/editProblem.js
View File

@@ -16,8 +16,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
bsAlert("题目描述不能为空!"); bsAlert("题目描述不能为空!");
return false; return false;
} }
if (vm.timeLimit < 30 || vm.timeLimit > 5000) { if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
bsAlert("保证时间限制是一个30-5000的合法整数"); bsAlert("保证时间限制是一个1-10000的整数");
return false;
}
if (vm.memoryLimit < 16) {
bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
return false; return false;
} }
if (vm.samples.length == 0) { if (vm.samples.length == 0) {
@@ -91,7 +95,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
description: "", description: "",
timeLimit: 1000, timeLimit: 1000,
memoryLimit: 128, memoryLimit: 128,
samples: [], samples: [{input: "", output: "", "visible": true}],
hint: "", hint: "",
sortIndex: "", sortIndex: "",
visible: true, visible: true,

8
static/src/js/app/admin/problem/addProblem.js
View File

@@ -14,8 +14,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
bsAlert("题目描述不能为空!"); bsAlert("题目描述不能为空!");
return false; return false;
} }
if (vm.timeLimit < 30 || vm.timeLimit > 5000) { if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
bsAlert("保证时间限制是一个30-5000的合法整数"); bsAlert("保证时间限制是一个1-10000的整数");
return false;
}
if (vm.memoryLimit < 16) {
bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
return false; return false;
} }
if (vm.samples.length == 0) { if (vm.samples.length == 0) {

8
static/src/js/app/admin/problem/editProblem.js
View File

@@ -15,8 +15,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert",
bsAlert("题目描述不能为空!"); bsAlert("题目描述不能为空!");
return false; return false;
} }
if (vm.timeLimit < 100 || vm.timeLimit > 5000) { if (vm.timeLimit < 1 || vm.timeLimit > 10000) {
bsAlert("保证时间限制是一个100-5000的合法整数"); bsAlert("保证时间限制是一个1-10000的整数");
return false;
}
if (vm.memoryLimit < 16) {
bsAlert("最低内存不能低于16M(注意:Java最低需要内存32M)");
return false; return false;
} }
if (vm.samples.length == 0) { if (vm.samples.length == 0) {

12
template/src/admin/contest/edit_problem.html
View File

@@ -26,17 +26,17 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>时间限制(ms)</label> <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit" <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个30-5000的合法整数)" required> data-error="请输入时间限制" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>内存限制(MB)</label> <div class="form-group"><label>请输入内存限制(MB, 最低16M, Java不能低于32M)</label>
<input type="number" name="memory" class="form-control" ms-duplex="memoryLimit" <input type="number" name="memory" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required> data-error="请输入内存限制" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>

16
template/src/admin/problem/add_problem.html
View File

@@ -14,17 +14,17 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>时间限制(ms)</label> <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit" <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个100-5000的合法整数)" required> data-error="请输入时间限制" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>内存限制(MB)</label> <div class="form-group"><label>内存限制(MB, 最低16M, Java不能低于32M)</label>
<input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit" <input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required> data-error="请输入内存限制(Java不能低于32M)" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
@@ -45,8 +45,8 @@
<small> 可见</small> <small> 可见</small>
</label> </label>
</div> </div>
<div id="tag" class="col-md-12"> <div id="tag" class="col-md-6">
<label>标签</label><br> <label>标签(按回车创建)</label><br>
<input type="text" id="tags"> <input type="text" id="tags">
</div> </div>
<div class="col-md-12 form-group"> <div class="col-md-12 form-group">

14
template/src/admin/problem/edit_problem.html
View File

@@ -20,17 +20,17 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>时间限制(ms)</label> <div class="form-group"><label>时间限制(ms, 范围1-10000ms)</label>
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit" <input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个100-5000的合法整数)" required> data-error="请输入时间限制" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-6">
<div class="form-group"><label>内存限制(MB)</label> <div class="form-group"><label>内存限制(MB, 最低16M, Java不能低于32M)</label>
<input type="number" name="memory" class="form-control" ms-duplex="memoryLimit" <input type="number" name="memory" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required> data-error="请输入内存限制" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
@@ -51,7 +51,7 @@
<small> 可见</small> <small> 可见</small>
</label> </label>
</div> </div>
<div id="tag" class="col-md-12"> <div id="tag" class="col-md-6">
<label>标签</label><br> <label>标签</label><br>
<input type="text" id="tags"> <input type="text" id="tags">
</div> </div>