diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 6e5fa6700..a947f2416 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -8,8 +8,7 @@ class HomeworkCommonController < ApplicationController before_filter :find_course, :only => [:index,:new,:create] before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set, :set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works, - :set_score_open,:alert_score_open_modal,:add_to_homework_bank,:publish_homework,:setting,:publish_setting,:late_setting, - :anon_setting,:score_setting,:public_setting,:set_public] + :set_score_open,:alert_score_open_modal,:add_to_homework_bank,:publish_homework,:setting,:set_public,:homework_setting] before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment, :start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works, :open_student_works,:add_to_homework_bank,:publish_homework] @@ -207,32 +206,24 @@ class HomeworkCommonController < ApplicationController end end - def publish_setting + def homework_setting @homework.publish_time = params[:homework_publish_time] if params[:homework_publish_time] @homework.end_time = params[:homework_end_time] if params[:homework_end_time] @homework.archive_time = params[:homework_archive_time] if params[:homework_archive_time] - @homework.save - @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) - respond_to do |format| - format.js + if @homework.archive_time < Time.now && @homework_detail_manual.comment_status < 6 + @homework_detail_manual.comment_status = 6 + elsif @homework.archive_time > Time.now && @homework_detail_manual.comment_status == 6 + @homework_detail_manual.comment_status = 5 end - end - def late_setting if params[:homework_allow_late] == '1' @homework.allow_late = true - #@homework.late_time = params[:homework_late_time] @homework.late_penalty = params[:homework_late_penalty].to_i else @homework.allow_late = false - #@homework.late_time = nil @homework.late_penalty = 0 end - @homework.save - @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) - end - def anon_setting anonymous_comment = @homework.anonymous_comment absence_penalty = @homework_detail_manual.absence_penalty appeal_penalty = @homework_detail_manual.appeal_penalty @@ -291,12 +282,7 @@ class HomeworkCommonController < ApplicationController student_work.save end end - @homework.save - @homework_detail_manual.save - @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) - end - def score_setting if params[:homework_ta_mode] && @homework_detail_manual.ta_mode.to_i != params[:homework_ta_mode].to_i @homework_detail_manual.ta_mode = params[:ta_mode].to_i @homework_detail_manual.save @@ -346,21 +332,7 @@ class HomeworkCommonController < ApplicationController end end end - # @homework_detail_manual.ta_mode = params[:homework_ta_mode].to_i - # @homework_detail_manual.final_mode = params[:homework_final_mode].to_i == 1 ? false : true - # unless @homework_detail_manual.final_mode - # @homework_detail_manual.te_proportion = params[:te_proportion] - # @homework_detail_manual.ta_proportion = params[:ta_proportion] - # if @homework.homework_type == 2 - # @homework_detail_programing.ta_proportion = params[:sy_proportion] - # end - # end - # @homework_detail_manual.save - # @homework_detail_programing.save if @homework_detail_programing - @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) - end - def public_setting if @homework.homework_type == 4 @homework.score_open = params[:homework_score_open] ? 1 : 0 else @@ -369,7 +341,8 @@ class HomeworkCommonController < ApplicationController @homework.answer_public = params[:homework_answer_public] ? 1 : 0 end @homework.save - @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) + @homework_detail_manual.save + redirect_to setting_homework_common_path(@homework) end def edit diff --git a/app/views/homework_common/_edit_anon_setting.html.erb b/app/views/homework_common/_edit_anon_setting.html.erb index 72e38656f..85dcbf050 100644 --- a/app/views/homework_common/_edit_anon_setting.html.erb +++ b/app/views/homework_common/_edit_anon_setting.html.erb @@ -1,11 +1,8 @@

匿评设置

- - -
+
- <%= form_tag(anon_setting_homework_common_path(@homework), :remote => true, :method => "post", :id => 'anon_setting_form') do |f| %> - <% end %>
\ No newline at end of file diff --git a/app/views/homework_common/_edit_late_setting.html.erb b/app/views/homework_common/_edit_late_setting.html.erb index 08fc68aec..50eba8ff3 100644 --- a/app/views/homework_common/_edit_late_setting.html.erb +++ b/app/views/homework_common/_edit_late_setting.html.erb @@ -1,11 +1,8 @@

补交设置

- - -
+
- <%= form_tag(late_setting_homework_common_path(@homework), :remote => true, :method => "post", :id => 'late_setting_form') do |f| %> - <% end %>
\ No newline at end of file diff --git a/app/views/homework_common/_edit_public_setting.html.erb b/app/views/homework_common/_edit_public_setting.html.erb index a224632d1..4a042d78b 100644 --- a/app/views/homework_common/_edit_public_setting.html.erb +++ b/app/views/homework_common/_edit_public_setting.html.erb @@ -6,12 +6,9 @@

公开设置

- -
- <%= form_tag(public_setting_homework_common_path(@homework), :remote => true, :method => "post", :id => 'public_setting_form') do |f| %> - <% end %>
\ No newline at end of file diff --git a/app/views/homework_common/_edit_publish_setting.html.erb b/app/views/homework_common/_edit_publish_setting.html.erb index 6ccbe6128..898a049e4 100644 --- a/app/views/homework_common/_edit_publish_setting.html.erb +++ b/app/views/homework_common/_edit_publish_setting.html.erb @@ -1,12 +1,9 @@

发布设置

- -
- <% end %>
\ No newline at end of file diff --git a/app/views/homework_common/_edit_score_setting.html.erb b/app/views/homework_common/_edit_score_setting.html.erb index 46a1bad88..aa24b4970 100644 --- a/app/views/homework_common/_edit_score_setting.html.erb +++ b/app/views/homework_common/_edit_score_setting.html.erb @@ -1,11 +1,8 @@

评分设置

- -
- <%= form_tag(score_setting_homework_common_path(@homework), :remote => true, :method => "post", :id => 'score_setting_form') do |f| %> - <% end %>
\ No newline at end of file diff --git a/app/views/homework_common/_show_anon_setting.html.erb b/app/views/homework_common/_show_anon_setting.html.erb index 45ee57f59..cd54ed1c6 100644 --- a/app/views/homework_common/_show_anon_setting.html.erb +++ b/app/views/homework_common/_show_anon_setting.html.erb @@ -1,8 +1,5 @@

匿评设置

- <% if @is_teacher %> - - <% end %>
diff --git a/app/views/homework_common/_show_late_setting.html.erb b/app/views/homework_common/_show_late_setting.html.erb index 81f2e9997..ce561ca89 100644 --- a/app/views/homework_common/_show_late_setting.html.erb +++ b/app/views/homework_common/_show_late_setting.html.erb @@ -1,8 +1,5 @@

补交设置

- <% if @is_teacher %> - - <% end %>
diff --git a/app/views/homework_common/_show_public_setting.html.erb b/app/views/homework_common/_show_public_setting.html.erb index c97cbc054..aa6588747 100644 --- a/app/views/homework_common/_show_public_setting.html.erb +++ b/app/views/homework_common/_show_public_setting.html.erb @@ -9,9 +9,6 @@

公开设置

- <% if @is_teacher %> - - <% end %>
diff --git a/app/views/homework_common/_show_publish_setting.html.erb b/app/views/homework_common/_show_publish_setting.html.erb index 2788a2f5d..2f8a6df06 100644 --- a/app/views/homework_common/_show_publish_setting.html.erb +++ b/app/views/homework_common/_show_publish_setting.html.erb @@ -1,7 +1,7 @@

发布设置

<% if @is_teacher %> - + 编辑 <% end %>
diff --git a/app/views/homework_common/_show_score_setting.html.erb b/app/views/homework_common/_show_score_setting.html.erb index 65784dd87..909fe0208 100644 --- a/app/views/homework_common/_show_score_setting.html.erb +++ b/app/views/homework_common/_show_score_setting.html.erb @@ -1,8 +1,5 @@

评分设置

- <% if @is_teacher %> - - <% end %>
diff --git a/app/views/homework_common/anon_setting.js.erb b/app/views/homework_common/anon_setting.js.erb deleted file mode 100644 index 4d08101be..000000000 --- a/app/views/homework_common/anon_setting.js.erb +++ /dev/null @@ -1,23 +0,0 @@ -$("#show_anon_setting").html("<%= j(render :partial => 'show_anon_setting') %>").show(); -$("#show_score_setting").html("<%= j(render :partial => 'show_score_setting') %>"); -$("#edit_score_setting").html("<%= j(render :partial => 'edit_score_setting') %>"); -$("#edit_anon_setting").html("<%= j(render :partial => 'edit_anon_setting') %>").hide(); - -$("input[name='homework_evaluation_start']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false -}); -$("input[name='homework_evaluation_end']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false -}); -$("input[name='homework_appeal_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false -}); \ No newline at end of file diff --git a/app/views/homework_common/late_setting.js.erb b/app/views/homework_common/late_setting.js.erb deleted file mode 100644 index 54bfbca58..000000000 --- a/app/views/homework_common/late_setting.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#show_late_setting").html("<%= j(render :partial => 'show_late_setting') %>").show(); -$("#edit_late_setting").html("<%= j(render :partial => 'edit_late_setting') %>").hide(); \ No newline at end of file diff --git a/app/views/homework_common/public_setting.js.erb b/app/views/homework_common/public_setting.js.erb deleted file mode 100644 index 9f3d3cd15..000000000 --- a/app/views/homework_common/public_setting.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#show_public_setting").html("<%= j(render :partial => 'show_public_setting') %>").show(); -$("#edit_public_setting").html("<%= j(render :partial => 'edit_public_setting') %>").hide(); \ No newline at end of file diff --git a/app/views/homework_common/publish_setting.js.erb b/app/views/homework_common/publish_setting.js.erb deleted file mode 100644 index 2074d863c..000000000 --- a/app/views/homework_common/publish_setting.js.erb +++ /dev/null @@ -1,50 +0,0 @@ -$("#show_publish_setting").html("<%= j(render :partial => 'show_publish_setting') %>").show(); -$("#edit_publish_setting").html("<%= j(render :partial => 'edit_publish_setting') %>").hide(); -<% unless @homework.publish_time.nil? %> -$("#homework_late_setting").html('
<%= j(render :partial => 'show_late_setting') %>
<%= j(render :partial => 'edit_late_setting') %>
'); -<% if @homework.homework_type != 4 %> -$("#homework_anon_setting").html('
<%= j(render :partial => 'show_anon_setting') %>
<%= j(render :partial => 'edit_anon_setting') %>
'); -$("#homework_score_setting").html('
<%= j(render :partial => 'show_score_setting') %>
<%= j(render :partial => 'edit_score_setting') %>
'); -<% end %> -$("#homework_public_setting").html('
<%= j(render :partial => 'show_public_setting') %>
<%= j(render :partial => 'edit_public_setting') %>
'); -<% end %> -$("input[name='homework_publish_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false, - onSelectDate:function() { - $("#reset_publish_time").show(); - if($.trim($("input[name='homework_archive_time']").val()) == ""){ - var date = new Date(Date.parse($("input[name='homework_publish_time']").val().replace(/-/g, "/"))); - $("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1)))); - } - }, - onSelectTime:function() { - $("#reset_publish_time").show(); - if($.trim($("input[name='homework_archive_time']").val()) == ""){ - var date = new Date(Date.parse($("input[name='homework_publish_time']").val().replace(/-/g, "/"))); - $("input[name='homework_archive_time']").val(formate_time(new Date(date.setMonth(date.getMonth()+1)))); - } - } -}); - -$("input[name='homework_end_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false, - onSelectDate:function() { - $("#reset_end_time").show(); - }, - onSelectTime:function() { - $("#reset_end_time").show(); - } -}); - -$("input[name='homework_archive_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false -}); \ No newline at end of file diff --git a/app/views/homework_common/score_setting.js.erb b/app/views/homework_common/score_setting.js.erb deleted file mode 100644 index 948e6e0cd..000000000 --- a/app/views/homework_common/score_setting.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#show_score_setting").html("<%= j(render :partial => 'show_score_setting') %>").show(); -$("#edit_score_setting").html("<%= j(render :partial => 'edit_score_setting') %>").hide(); \ No newline at end of file diff --git a/app/views/homework_common/setting.html.erb b/app/views/homework_common/setting.html.erb index f1279c3fc..aae9313f7 100644 --- a/app/views/homework_common/setting.html.erb +++ b/app/views/homework_common/setting.html.erb @@ -14,110 +14,84 @@ <%= link_to '作业详情', student_work_index_path(:homework => @homework.id), :class => 'fr font-12 mr15 color-blue mt3' %>
-
- <% if @is_new && @is_teacher %> -
+ <%= form_tag(homework_setting_homework_common_path(@homework), :method => "post", :id => 'homework_setting_form') do |f| %> +
+ <% edit_mode = @is_new && @is_teacher %> +
<%= render :partial => 'show_publish_setting' %>
-
+
<%= render :partial => 'edit_publish_setting' %>
- <% else %> -
- <%= render :partial => 'show_publish_setting' %> -
-
- <%= render :partial => 'edit_publish_setting' %> -
- <% end %> -
-
- <% if @is_empty %> -
-

补交设置

- <%= @is_teacher ? '请先设置发布时间' : '还未设置,暂时无法查看' %> -
- <% else %> -
+
+ +
+
<%= render :partial => 'show_late_setting' %>
-
+
<%= render :partial => 'edit_late_setting' %>
- <% end %> -
- <% if @homework.homework_type != 4 %> -
- <% if @is_empty %> -
-

匿评设置

- <%= @is_teacher ? '请先设置发布时间' : '还未设置,暂时无法查看' %> -
- <% else %> -
+
+ + <% if @homework.homework_type != 4 %> +
+
<%= render :partial => 'show_anon_setting' %>
-
+
<%= render :partial => 'edit_anon_setting' %>
- <% end %> -
- <% end %> -
- <% if @homework.homework_type == 4 %> -
-

评分设置

-
-
-
-
    -
  • - -
  • -
  • - - - -
  • -
-
-
- <% else %> - <% if @is_empty %> -
-

评分设置

- <%= @is_teacher ? '请先设置发布时间' : '还未设置,暂时无法查看' %> -
- <% else %> -
- <%= render :partial => 'show_score_setting' %> -
-
- <%= render :partial => 'edit_score_setting' %> -
- <% end %> - <% end %> -
-
- <% if @is_empty %> -
-

公开设置

- <%= @is_teacher ? '请先设置发布时间' : '还未设置,暂时无法查看' %> -
- <% else %> -
+
+ <% end %> + +
+ <% if @homework.homework_type == 4 %> +
+

评分设置

+
+
+
+
    +
  • + +
  • +
  • + + + +
  • +
+
+
+ <% else %> +
+ <%= render :partial => 'show_score_setting' %> +
+
+ <%= render :partial => 'edit_score_setting' %> +
+ <% end %> +
+
+
<%= render :partial => 'show_public_setting' %>
-
+
<%= render :partial => 'edit_public_setting' %>
- <% end %> -
+
+ +
+ 提交 + 取消 +
+ <% end %>
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index fde690704..6451c93cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -430,11 +430,7 @@ RedmineApp::Application.routes.draw do get 'add_to_homework_bank' get 'publish_homework' get 'setting' - post 'publish_setting' - post 'late_setting' - post 'anon_setting' - post 'score_setting' - post 'public_setting' + post 'homework_setting' get 'set_public' end diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index 029b50d4b..40d307669 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -160,6 +160,25 @@ $(function(){ validateOnBlur:false }); + $("input[name='homework_evaluation_start']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); + $("input[name='homework_evaluation_end']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); + $("input[name='homework_appeal_time']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); + // $("#reset_publish_time").live('click', function(){ // $("input[name='homework_publish_time']").val(""); // $("#reset_publish_time").hide(); @@ -170,7 +189,7 @@ $(function(){ // $("#reset_end_time").hide(); // }); - $("#publish_setting_form_submit").live('click', function(){ + $("#homework_setting_form_submit").live('click', function(){ var myDate = new Date(); var result = true; if($("input[name='homework_publish_time']").prop("disabled")==false && $.trim($("input[name='homework_publish_time']").val()) != ""){ @@ -215,53 +234,11 @@ $(function(){ } else{ $("#homework_archive_time_notice").hide(); } - } else if($.trim($("#show_evaluation_end").val()) != ""){ - var end_time = Date.parse($("#show_evaluation_end").val()); - var archive_time = Date.parse($("input[name='homework_archive_time']").val()); - if(archive_time <= end_time){ - $("#homework_archive_time_notice").html("作业结束时间应晚于匿评结束时间").show(); - result = false; - } else{ - $("#homework_archive_time_notice").hide(); - } - }else if($.trim($("input[name='homework_appeal_time']").val()) != ""){ - var end_time = Date.parse($("input[name='homework_appeal_time']").val()); - var archive_time = Date.parse($("input[name='homework_archive_time']").val()); - if(archive_time <= end_time){ - $("#homework_archive_time_notice").html("作业结束时间应晚于申诉结束时间").show(); - result = false; - } else{ - $("#homework_archive_time_notice").hide(); - } } else{ $("#homework_archive_time_notice").hide(); } } - if(result){ - if($.trim($("input[name='homework_publish_time']").val()) == "" && $.trim($("input[name='homework_end_time']").val()) == ""){ - var htmlvalue = '

提示

'+ - '

发布时间为空,其他设置将不能编辑
确认要保存发布设置吗?

'; - pop_box_new(htmlvalue, 578, 205); - } else{ - $("#publish_setting_form").submit(); - } - } - }); - - $("#edit_allow_late_1").live('click', function(){ - $("#edit_late_notice").html("允许补交,则在结束日期之前,学生可以补交作品
是在提交截止时间之后才提交作品的学生,将被扣迟交分"); - $("input[name='homework_late_penalty']").val("5"); - }); - - $("#edit_allow_late_0").live('click', function(){ - $("#edit_late_notice").html("禁止补交,则在提交截止时间之后,学生不能再提交作品"); - $("input[name='homework_late_penalty']").val("0"); - }); - - $("#late_setting_form_submit").live('click', function(){ - var result = true; if($("input[name='homework_allow_late']:checked").val() == '1'){ if($.trim($("input[name='homework_late_penalty']").val()) == ""){ result = false; @@ -277,97 +254,14 @@ $(function(){ } } } - if(result){ - $("#late_setting_form").submit(); - } - }); - $("input[name='homework_evaluation_start']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - $("input[name='homework_evaluation_end']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - $("input[name='homework_appeal_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - - $("input[name='homework_anonymous_comment']").live('click', function(){ - $("input[name='homework_evaluation_start']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - $("input[name='homework_evaluation_end']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - if($(this).is(':checked')){ - $(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled'); - $(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg'); - $("#anon_relate_setting_ul").show(); - var my_date = new Date(); - var end_date = new Date(Date.parse($("#show_end_time").val().replace(/-/g, "/"))); - var max_date = my_date > end_date ? my_date : end_date; - $("input[name='homework_evaluation_start']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7)))); - $("input[name='homework_evaluation_end']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+14)))); - $("input[name='homework_evaluation_num']").val("3"); - $("input[name='homework_absence_penalty']").val("2"); - } else{ - $(this).parent().parent('ul').find('input[type="text"]').attr('disabled', 'disabled'); - $(this).parent().parent('ul').find('input[type="text"]').addClass('disabled-bg'); - $("input[name='homework_evaluation_start']").val(""); - $("input[name='homework_evaluation_end']").val(""); - $("input[name='homework_evaluation_num']").val("0"); - $("input[name='homework_absence_penalty']").val("0"); - $("#anon_relate_setting_ul").hide(); - } - }); - - $("input[name='homework_anonymous_appeal']").live('click', function(){ - $("input[name='homework_appeal_time']").datetimepicker({ - allowBlank:true, - lang:'ch', - format:'Y-m-d H:i', - validateOnBlur:false - }); - if($(this).is(':checked')){ - $(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled'); - $(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg'); - var my_date = new Date(); - var end_date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/"))); - var max_date = my_date > end_date ? my_date : end_date; - $("input[name='homework_appeal_time']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+2)))); - $("input[name='homework_appeal_penalty']").val("2"); - } else{ - $(this).parent().parent('ul').find('input[type="text"]').attr('disabled', 'disabled'); - $(this).parent().parent('ul').find('input[type="text"]').addClass('disabled-bg'); - $("input[name='homework_appeal_time']").val(""); - $("input[name='homework_appeal_penalty']").val("0"); - } - }); - - $("#anon_setting_form_submit").live('click', function(){ - var result = true; if($("input[name='homework_anonymous_comment']").is(':checked')){ if($.trim($("input[name='homework_evaluation_start']").val()) == ""){ $("#homework_evaluation_start_notice").html("匿评开始时间不能为空").show(); result = false; } else{ - var end_time = Date.parse($("#show_end_time").val()); - var archive_time = Date.parse($("#show_archive_time").val()); + var end_time = Date.parse($("input[name='homework_end_time']").val()); + var archive_time = Date.parse($("input[name='homework_archive_time']").val()); var eva_start = Date.parse($("input[name='homework_evaluation_start']").val()); var eva_end = Date.parse($("input[name='homework_evaluation_end']").val()); if(eva_start <= end_time){ @@ -418,7 +312,7 @@ $(function(){ $("#homework_appeal_time_notice").html("申诉结束时间不能为空").show(); result = false; } else{ - var archive_time = Date.parse($("#show_archive_time").val()); + var archive_time = Date.parse($("input[name='homework_archive_time']").val()); var eva_end = Date.parse($("input[name='homework_evaluation_end']").val()); var appeal_time = Date.parse($("input[name='homework_appeal_time']").val()); if(eva_end >= appeal_time){ @@ -445,9 +339,37 @@ $(function(){ } } } - if(result){ - $("#anon_setting_form").submit(); + + if($("input[name='homework_final_mode']:checked").val() == '0'){ + var te_pro = (parseFloat($("select[name='te_proportion']").val()))*100; + var ta_pro = (parseFloat($("select[name='ta_proportion']").val()))*100; + var st_pro = (parseFloat($("select[name='st_proportion']").val()))*100; + if($("select[name='sy_proportion']").length == 1){ + var sy_pro = (parseFloat($("select[name='sy_proportion']").val()))*100; + } else{ + var sy_pro = 0; + } + if(parseInt(te_pro + ta_pro + st_pro + sy_pro) != 100){ + result = false; + $("#homework_final_mode_notice").html("各评分比例之和应为100%").show(); + } else{ + $("#homework_final_mode_notice").hide(); + } } + + if(result){ + $("#homework_setting_form").submit(); + } + }); + + $("#edit_allow_late_1").live('click', function(){ + $("#edit_late_notice").html("允许补交,则在结束日期之前,学生可以补交作品
是在提交截止时间之后才提交作品的学生,将被扣迟交分"); + $("input[name='homework_late_penalty']").val("5"); + }); + + $("#edit_allow_late_0").live('click', function(){ + $("#edit_late_notice").html("禁止补交,则在提交截止时间之后,学生不能再提交作品"); + $("input[name='homework_late_penalty']").val("0"); }); $("#homework_final_mode_1").live('click', function(){ @@ -460,33 +382,6 @@ $(function(){ $("select.normal-bg").addClass("disabled-bg"); }); - $("#score_setting_form_submit").live('click', function(){ - var result = true; - if($("input[name='homework_final_mode']:checked").val() == '0'){ - var te_pro = (parseFloat($("select[name='te_proportion']").val()))*100; - var ta_pro = (parseFloat($("select[name='ta_proportion']").val()))*100; - var st_pro = (parseFloat($("select[name='st_proportion']").val()))*100; - if($("select[name='sy_proportion']").length == 1){ - var sy_pro = (parseFloat($("select[name='sy_proportion']").val()))*100; - } else{ - var sy_pro = 0; - } - if(parseInt(te_pro + ta_pro + st_pro + sy_pro) != 100){ - result = false; - $("#homework_final_mode_notice").html("各评分比例之和应为100%").show(); - } else{ - $("#homework_final_mode_notice").hide(); - } - } - if(result){ - $("#score_setting_form").submit(); - } - }); - - $("#public_setting_form_submit").live('click', function(){ - $("#public_setting_form").submit(); - }); - $(".group_member_li").live("dblclick",function(e){ var doc = $(e.target).parents('.group_member_li'); var id = doc.attr("data-id"); @@ -735,6 +630,20 @@ function submit_new_common_homework(type, edit_mode){ } } +function show_edit_setting(){ + $('#edit_publish_setting').show(); + $('#show_publish_setting').hide(); + $('#edit_late_setting').show(); + $('#show_late_setting').hide(); + $('#edit_anon_setting').show(); + $('#show_anon_setting').hide(); + $('#edit_score_setting').show(); + $('#show_score_setting').hide(); + $('#edit_public_setting').show(); + $('#show_public_setting').hide(); + $('#homework_setting_submit_block').show(); +} + function setting_cancel_edit(fn){ var htmlvalue = '

提示

'+ '

修改的内容将全部丢失
是否确认取消保存