替换掉商业版的 formvalidation

This commit is contained in:
hohoTT
2015-08-16 20:53:18 +08:00
parent 30348f0c5d
commit d88dde18bb
10 changed files with 214 additions and 336 deletions

View File

@@ -1,4 +1,4 @@
require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "formValidation"],
require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "validator"],
function ($, avalon, csrfTokenHeader, bsAlert, editor) {
@@ -122,26 +122,15 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "formValidation"]
}
//新建公告表单验证与数据提交
$("#announcement-form")
.formValidation({
framework: "bootstrap",
fields: {
title: {
validators: {
notEmpty: {
message: "请填写公告标题"
}
}
}
}
}
).on('success.form.fv', function (e) {
e.preventDefault();
$('form').validator().on('submit', function (e) {
if (!e.isDefaultPrevented()) {
var title = $("#title").val();
var content = createAnnouncementEditor.getValue();
if (content == "") {
bsAlert("请填写公告内容");
return;
return false;
}
$.ajax({
beforeSend: csrfTokenHeader,
@@ -156,11 +145,13 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "formValidation"]
createAnnouncementEditor.setValue("");
getPageData(1);
} else {
bs_alert(data.data);
bsAlert(data.data);
}
}
})
});
return false;
}
})
});
avalon.scan();
});

View File

@@ -1,4 +1,4 @@
require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function ($, avalon, csrfTokenHeader, bsAlert) {
require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) {
avalon.ready(function () {

View File

@@ -1,4 +1,4 @@
require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function ($, avalon, csrfTokenHeader, bsAlert) {
require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, avalon, csrfTokenHeader, bsAlert) {
// avalon:定义模式 group_list
@@ -90,58 +90,33 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function
}
});
$("#edit_group_form")
.formValidation({
framework: "bootstrap",
fields: {
name: {
validators: {
notEmpty: {
message: "请填写小组名"
},
stringLength: {
max: 20,
message: '小组名长度必须在20位之内'
$('form').validator().on('submit', function (e) {
if (!e.isDefaultPrevented()) {
var group_id = avalon.vmodels.admin.groupId;
var name = vm.name;
var description = vm.description;
var join_group_setting = vm.checkedSetting;
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/group/",
method: "put",
data: {group_id: group_id, name: name, description: description,
join_group_setting: join_group_setting},
dataType: "json",
success: function (data) {
if (!data.code) {
bsAlert("修改成功");
}
else {
bsAlert(data.data);
}
}
},
description: {
validators: {
notEmpty: {
message: "请填写描述"
},
stringLength: {
max: 300,
message: '描述长度必须在300位之内'
}
}
}
});
return false;
}
}
).on('success.form.fv', function (e) {
e.preventDefault();
var data = {
group_id: avalon.vmodels.admin.groupId,
name: vm.name,
description: vm.description,
join_group_setting: vm.checkedSetting
};
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/group/",
method: "put",
data: data,
dataType: "json",
success: function (data) {
if (!data.code) {
bsAlert("修改成功");
}
else {
bsAlert(data.data);
}
}
})
});
})
});
});

View File

@@ -1,135 +1,72 @@
require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "formValidation", "jqueryUI"],
require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI"],
function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
avalon.ready(function () {
avalon.vmodels.addProblem = null;
$("#add-problem-form")
.formValidation({
framework: "bootstrap",
fields: {
title: {
validators: {
notEmpty: {
message: "请填写题目名称"
},
stringLength: {
min: 1,
max: 30,
message: "名称不能超过30个字"
}
}
},
cpu: {
validators: {
notEmpty: {
message: "请输入时间限制"
},
integer: {
message: "请输入一个合法的数字"
},
between: {
inclusive: true,
min: 1,
max: 5000,
message: "只能在1-5000之间"
}
}
},
memory: {
validators: {
notEmpty: {
message: "请输入内存限制"
},
integer: {
message: "请输入一个合法的数字"
}
}
},
difficulty: {
validators: {
notEmpty: {
message: "请输入难度"
},
integer: {
message: "难度用一个整数表示"
}
}
},
input_description: {
validators: {
notEmpty: {
message: "请填写输入描述"
}
}
},
output_description: {
validators: {
notEmpty: {
message: "请填写输出描述"
}
$("#add-problem-form").validator()
.on('submit', function (e) {
if (!e.isDefaultPrevented()){
if (vm.testCaseId == "") {
bsAlert("你还没有上传测试数据!");
return false;
}
if (vm.description == "") {
bsAlert("题目描述不能为空!");
return false;
}
if (vm.samples.length == 0) {
bsAlert("请至少添加一组样例!");
return false;
}
for (var i = 0; i < vm.samples.length; i++) {
if (vm.samples[i].input == "" || vm.samples[i].output == "") {
bsAlert("样例输入与样例输出不能为空!");
return false;
}
}
}
})
.on("success.form.fv", function (e) {
e.preventDefault();
if (vm.testCaseId == "") {
bsAlert("你还没有上传测试数据!");
return;
}
if (vm.description == "") {
bsAlert("题目描述不能为空!");
return;
}
if (vm.samples.length == 0) {
bsAlert("请至少添加一组样例!");
return;
}
for (var i = 0; i < vm.samples.length; i++) {
if (vm.samples[i].input == "" || vm.samples[i].output == "") {
bsAlert("样例输入与样例输出不能为空!");
return;
var tags = $("#tags").tagEditor("getTags")[0].tags;
if (tags.length == 0) {
bsAlert("请至少添加一个标签,这将有利于用户发现你的题目!");
return false;
}
}
if (tags.length == 0) {
bsAlert("请至少添加一个标签,这将有利于用户发现你的题目!");
return;
}
var ajaxData = {
title: vm.title,
description: vm.description,
time_limit: vm.timeLimit,
memory_limit: vm.memoryLimit,
samples: [],
test_case_id: vm.testCaseId,
hint: vm.hint,
source: vm.source,
tags: $("#tags").tagEditor("getTags")[0].tags,
input_description: vm.inputDescription,
output_description: vm.outputDescription,
difficulty: vm.difficulty
};
var ajaxData = {
id: avalon.vmodels.admin.problemId,
title: vm.title,
description: vm.description,
time_limit: vm.timeLimit,
memory_limit: vm.memoryLimit,
samples: [],
test_case_id: vm.testCaseId,
hint: vm.hint,
source: vm.source,
visible: vm.visible,
tags: tags,
input_description: vm.inputDescription,
output_description: vm.outputDescription,
difficulty: vm.difficulty
};
for (var i = 0; i < vm.samples.$model.length; i++) {
ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output});
}
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/problem/",
dataType: "json",
data: JSON.stringify(ajaxData),
method: "post",
contentType: "application/json",
success: function (data) {
if (!data.code) {
bsAlert("题目添加成功!");
}
else {
bsAlert(data.data);
}
for (var i = 0; i < vm.samples.$model.length; i++) {
ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output});
}
})
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/problem/",
dataType: "json",
data: JSON.stringify(ajaxData),
method: "post",
contentType: "application/json",
success: function (data) {
if (!data.code) {
bsAlert("题目添加成功!");
}
else {
bsAlert(data.data);
}
}
});
return false;
}
});
var testCaseUploader = uploader("#testCaseFile", "/api/admin/test_case_upload/", function (file, response) {

View File

@@ -1,139 +1,75 @@
require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "formValidation", "jqueryUI"],
require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagEditor", "validator", "jqueryUI"],
function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) {
avalon.ready(function () {
avalon.vmodels.editProblem = null;
$("#edit-problem-form")
.formValidation({
framework: "bootstrap",
fields: {
title: {
validators: {
notEmpty: {
message: "请填写题目名称"
},
stringLength: {
min: 1,
max: 30,
message: "名称不能超过30个字"
}
}
},
cpu: {
validators: {
notEmpty: {
message: "请输入时间限制"
},
integer: {
message: "请输入一个合法的数字"
},
between: {
inclusive: true,
min: 1,
max: 5000,
message: "只能在1-5000之间"
}
}
},
memory: {
validators: {
notEmpty: {
message: "请输入内存限制"
},
integer: {
message: "请输入一个合法的数字"
}
}
},
difficulty: {
validators: {
notEmpty: {
message: "请输入难度"
},
integer: {
message: "难度用一个整数表示"
}
}
},
input_description: {
validators: {
notEmpty: {
message: "请填写输入描述"
}
}
},
output_description: {
validators: {
notEmpty: {
message: "请填写输出描述"
}
$("#edit-problem-form").validator()
.on('submit', function (e) {
if (!e.isDefaultPrevented()){
if (vm.testCaseId == "") {
bsAlert("你还没有上传测试数据!");
return false;
}
if (vm.description == "") {
bsAlert("题目描述不能为空!");
return false;
}
if (vm.samples.length == 0) {
bsAlert("请至少添加一组样例!");
return false;
}
for (var i = 0; i < vm.samples.length; i++) {
if (vm.samples[i].input == "" || vm.samples[i].output == "") {
bsAlert("样例输入与样例输出不能为空!");
return false;
}
}
}
})
.on("success.form.fv", function (e) {
e.preventDefault();
if (vm.testCaseId == "") {
bsAlert("你还没有上传测试数据!");
return;
}
if (vm.description == "") {
bsAlert("题目描述不能为空!");
return;
}
if (vm.samples.length == 0) {
bsAlert("请至少添加一组样例!");
return;
}
for (var i = 0; i < vm.samples.length; i++) {
if (vm.samples[i].input == "" || vm.samples[i].output == "") {
bsAlert("样例输入与样例输出不能为空!");
return;
var tags = $("#tags").tagEditor("getTags")[0].tags;
if (tags.length == 0) {
bsAlert("请至少添加一个标签,这将有利于用户发现你的题目!");
return false;
}
}
if (tags.length == 0) {
bsAlert("请至少添加一个标签,这将有利于用户发现你的题目!");
return;
}
var ajaxData = {
id: avalon.vmodels.admin.problemId,
title: vm.title,
description: vm.description,
time_limit: vm.timeLimit,
memory_limit: vm.memoryLimit,
samples: [],
test_case_id: vm.testCaseId,
hint: vm.hint,
source: vm.source,
visible: vm.visible,
tags: $("#tags").tagEditor("getTags")[0].tags,
input_description: vm.inputDescription,
output_description: vm.outputDescription,
difficulty: vm.difficulty
};
var ajaxData = {
id: avalon.vmodels.admin.problemId,
title: vm.title,
description: vm.description,
time_limit: vm.timeLimit,
memory_limit: vm.memoryLimit,
samples: [],
test_case_id: vm.testCaseId,
hint: vm.hint,
source: vm.source,
visible: vm.visible,
tags: tags,
input_description: vm.inputDescription,
output_description: vm.outputDescription,
difficulty: vm.difficulty
};
for (var i = 0; i < vm.samples.$model.length; i++) {
ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output});
}
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/problem/",
dataType: "json",
data: JSON.stringify(ajaxData),
method: "put",
contentType: "application/json",
success: function (data) {
if (!data.code) {
bsAlert("题目编辑成功!");
}
else {
bsAlert(data.data);
}
for (var i = 0; i < vm.samples.$model.length; i++) {
ajaxData.samples.push({input: vm.samples.$model[i].input, output: vm.samples.$model[i].output});
}
})
$.ajax({
beforeSend: csrfTokenHeader,
url: "/api/admin/problem/",
dataType: "json",
data: JSON.stringify(ajaxData),
method: "put",
contentType: "application/json",
success: function (data) {
if (!data.code) {
bsAlert("题目编辑成功!");
}
else {
bsAlert(data.data);
}
}
});
return false;
}
});
var vm = avalon.define({

View File

@@ -1,4 +1,4 @@
require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function ($, avalon, csrfTokenHeader, bsAlert) {
require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) {
avalon.ready(function () {
avalon.vmodels.problemList = null;

View File

@@ -53,11 +53,17 @@
<h3>添加公告</h3>
<form id="announcement-form">
<div class="form-group"><label>标题</label>
<input name="title" type="text" class="form-control" id="title" placeholder="公告标题"></div>
<div class="form-group">
<label>标题</label>
<input name="title" type="text" class="form-control" id="title" placeholder="公告标题"
data-error="请填写公告标题" maxlength="50" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label>内容</label>
<textarea id="create-announcement-editor" placeholder="公告内容"></textarea>
<textarea id="create-announcement-editor" placeholder="公告内容" maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>

View File

@@ -30,12 +30,17 @@
<form id="edit_group_form">
<div class="col-md-12">
<div class="form-group"><label>小组名</label>
<input type="text" name="name" class="form-control" ms-duplex="name">
<input type="text" name="name" class="form-control" ms-duplex="name"
data-error="请填写小组名" maxlength="20" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">
<div class="form-group"><label>描述</label>
<textarea rows="3" name="description" class="form-control" ms-duplex="description"></textarea>
<textarea rows="3" name="description" class="form-control" ms-duplex="description"
data-error="请填写描述" maxlength="300" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">

View File

@@ -3,7 +3,9 @@
<div class="form-group col-md-12">
<label>题目标题</label>
<input type="text" name="title" autofocus class="form-control" ms-duplex="title">
<input type="text" name="title" autofocus class="form-control" ms-duplex="title"
data-error="请填写题目名称(名称不能超过30个字)" maxlength="30" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-12">
@@ -15,17 +17,23 @@
<div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label>
<input type="number" name="cpu" class="form-control" ms-duplex="cpu">
<input type="number" name="cpu" class="form-control" ms-duplex="cpu"
data-error="请输入时间限制(保证是一个1-5000的合法整数)" maxlength="5000" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</label>
<input type="number" name="memory" class="form-control" ms-duplex="memory">
<input type="number" name="memory" class="form-control" ms-duplex="memory"
data-error="请输入内存限制(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>难度</label>
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty">
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
data-error="请输入难度(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3 form-group">
@@ -41,12 +49,18 @@
<div class="col-md-12 form-group">
<label>输入描述</label><br>
<textarea class="form-control" rows="5" name="input_description"
ms-duplex="inputDescription"></textarea>
ms-duplex="inputDescription"data-error="请填写输入描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12 form-group">
<label>输出描述</label><br>
<textarea class="form-control" rows="5" name="output_description"
ms-duplex="outputDescription"></textarea>
ms-duplex="outputDescription"data-error="请填写输出描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12"><br>
<label>样例</label>

View File

@@ -3,7 +3,9 @@
<div class="form-group col-md-12">
<label>题目标题</label>
<input type="text" name="title" autofocus class="form-control" ms-duplex="title">
<input type="text" name="title" autofocus class="form-control" ms-duplex="title"
data-error="请填写题目名称(名称不能超过30个字)" maxlength="30" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-12">
@@ -15,17 +17,23 @@
<div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label>
<input type="number" name="cpu" class="form-control" ms-duplex="timeLimit">
<input type="number" name="cpu" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个1-5000的合法整数)" maxlength="5000" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</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>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>难度</label>
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty">
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
data-error="请输入难度(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3 form-group">
@@ -41,12 +49,18 @@
<div class="col-md-12 form-group">
<label>输入描述</label><br>
<textarea class="form-control" rows="5" name="input_description"
ms-duplex="inputDescription"></textarea>
ms-duplex="inputDescription" data-error="请填写输入描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12 form-group">
<label>输出描述</label><br>
<textarea class="form-control" rows="5" name="output_escription"
ms-duplex="outputDescription"></textarea>
ms-duplex="outputDescription" data-error="请填写输出描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12"><br>
<label>样例</label>