diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 49e6ec290..28e2e192b 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -73,11 +73,17 @@ class HomeworkCommonController < ApplicationController
else
@homework.publish_time = params[:homework_common][:publish_time]
end
+ homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
@homework.end_time = params[:homework_common][:end_time] || Time.now
@homework.course_id = params[:course_id]
- @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
+ if params[:homework_common][:anonymous_comment] && params[:homework_common][:anonymous_comment] != @homework.anonymous_comment
+ if @homework.anonymous_comment == 1
+ homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 1.0 : 0.4
+ else
+ homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
+ end
+ end
- homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
homework_detail_manual.comment_status = 1
end
@@ -94,6 +100,13 @@ class HomeworkCommonController < ApplicationController
@homework.homework_detail_programing ||= HomeworkDetailPrograming.new
@homework_detail_programing = @homework.homework_detail_programing
@homework_detail_programing.language = params[:language_type].to_i
+ if params[:homework_common][:anonymous_comment] && params[:homework_common][:anonymous_comment] != @homework.anonymous_comment
+ if @homework.anonymous_comment == 1
+ @homework_detail_programing.ta_proportion = 0.6
+ else
+ @homework_detail_programing.ta_proportion = 0.5
+ end
+ end
@homework.homework_tests.delete_all
inputs = params[:program][:input]
@@ -116,6 +129,7 @@ class HomeworkCommonController < ApplicationController
@homework_detail_group.base_on_project = params[:base_on_project].to_i
end
+ @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
if @homework.save
@homework_detail_manual.save if @homework_detail_manual
@homework_detail_programing.save if @homework_detail_programing
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a15f37274..7392ed8ff 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -750,7 +750,11 @@ class UsersController < ApplicationController
render_attachment_warning_if_needed(homework)
homework_detail_manual = HomeworkDetailManual.new
- homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
+ if homework.anonymous_comment == 1
+ homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 1.0 : 0.4
+ else
+ homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
+ end
if homework.publish_time > Date.today
homework_detail_manual.comment_status = 0
else
@@ -766,7 +770,11 @@ class UsersController < ApplicationController
if homework.homework_type == 2
homework_detail_programing = HomeworkDetailPrograming.new
homework.homework_detail_programing = homework_detail_programing
- homework_detail_programing.ta_proportion = 0.5
+ if homework.anonymous_comment == 1
+ homework_detail_programing.ta_proportion = 0.6
+ else
+ homework_detail_programing.ta_proportion = 0.5
+ end
homework_detail_programing.language = params[:language_type].to_i
inputs = params[:program][:input]
diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb
index 28ca9e785..edef7053c 100644
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -19,21 +19,21 @@
<% else%>
<% end%>