<% homework = HomeworkCommon.new %>
+ <% homework.homework_detail_manual = HomeworkDetailManual.new%>
<%= labelled_form_for homework,:url => user_new_homework_users_path,:method => "post" do |f| %>
<%= render :partial => 'users/user_homework_form', :locals => { :homework => homework,:f => f,:edit_mode => false } %>
diff --git a/db/schema.rb b/db/schema.rb
index 1c6760345..1f40c93b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -497,23 +497,26 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
add_index "documents", ["project_id"], :name => "documents_project_id"
- create_table "dts", :force => true do |t|
- t.string "IPLineCode"
- t.string "Description"
- t.string "Num"
- t.string "Variable"
- t.string "TraceInfo"
- t.string "Method"
+ create_table "dts", :primary_key => "Num", :force => true do |t|
+ t.string "Defect", :limit => 50
+ t.string "Category", :limit => 50
t.string "File"
- t.string "IPLine"
- t.string "Review"
- t.string "Category"
- t.string "Defect"
- t.string "PreConditions"
- t.string "StartLine"
+ t.string "Method"
+ t.string "Module", :limit => 20
+ t.string "Variable", :limit => 50
+ t.integer "StartLine"
+ t.integer "IPLine"
+ t.string "IPLineCode", :limit => 200
+ t.string "Judge", :limit => 15
+ t.integer "Review", :limit => 1
+ t.string "Description"
+ t.text "PreConditions", :limit => 2147483647
+ t.text "TraceInfo", :limit => 2147483647
+ t.text "Code", :limit => 2147483647
t.integer "project_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.integer "id", :null => false
end
create_table "enabled_modules", :force => true do |t|
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index e5f5e8b4c..95d85e48c 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -56,18 +56,20 @@ function show_more_project(url){
}
//老师提交 新建/修改 作业
-function submit_homework(id)
-{
- if(!regex_homework_name())
- {
+function submit_homework(id){
+ if(!regex_homework_name()){
$("#homework_name").focus();
}
- else if(!regex_homework_end_time())
- {
+ else if(!regex_homework_end_time()){
$("#homework_end_time").focus();
}
- else if(!regex_course_id())
- {
+ else if(!regex_evaluation_start()){
+ $("#evaluation_start_time").focus()
+ }
+ else if(!regex_evaluation_end()){
+ $("#evaluation_end_time").focus()
+ }
+ else if(!regex_course_id()){
$("#course_id").focus();
}
else{
@@ -134,6 +136,42 @@ function search_homework_by_name(url){
);
}
+//验证匿评开启时间：大于截止时间,或者为空
+function regex_evaluation_start(){
+ var evaluation_start = $.trim($("#evaluation_start_time").val());
+ if(evaluation_start == ""){
+ return true;
+ }
+ var end_time = new Date($.trim($("#homework_end_time").val()));
+ var evaluation_start_time = new Date(evaluation_start);
+ if(evaluation_start_time > end_time){
+ return true;
+ }else{
+ $("#homework_end_time_span").text("开启匿评日期必须大于截止日期");
+ return false;
+ }
+}
+
+//验证匿评结束时间：大于匿评开启时间,或者为空。当匿评开启时间为空时，匿评结束时间必须为空
+function regex_evaluation_end(){
+ var evaluation_start = $.trim($("#evaluation_start_time").val());
+ var evaluation_end = $.trim($("#evaluation_end_time").val());
+ if(evaluation_end == ""){
+ return true;
+ }else if(evaluation_start == ""){
+ $("#homework_end_time_span").text("开启匿评日期为空时，关闭匿评日期必须为空");
+ return false;
+ }
+ var evaluation_start_time = new Date(evaluation_start);
+ var evaluation_end_time = new Date(evaluation_end);
+ if(evaluation_end_time > evaluation_start_time){
+ return true;
+ }else{
+ $("#homework_end_time_span").text("关闭匿评日期必须大于开启匿评日期");
+ return false;
+ }
+}
+
//提交新建作品
function new_student_work()
{
