From 16348654a543834867a6e847220ce58ec03e50b0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 21 Apr 2016 17:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=8C=BF=E8=AF=84=E5=92=8C?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84=E6=97=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb  | 18 ++++++++++++++++--
 app/controllers/users_controller.rb            | 12 ++++++++++--
 .../_set_score_rule_detail.html.erb            |  8 ++++----
 3 files changed, 30 insertions(+), 8 deletions(-)

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 @@
 
       <script>
           $("#sy_proportion").change(function(){
-              var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100);
+              var ta_proportion = 100 - parseInt(parseFloat($("#sy_proportion").val()) * 100);
               $("#ta_proportion").replaceWith(build_selector(ta_proportion));
               $("#student_proportion").val("0%");
           });
 
           $("#ta_proportion").live("change",function(){
-              var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100) - parseInt($("#ta_proportion").val() * 100);
+              var ta_proportion = 100 - parseInt(parseFloat($("#sy_proportion").val()) * 100) - parseInt(parseFloat($("#ta_proportion")).val() * 100);
               $("#student_proportion").val(ta_proportion  + "%");
           });
       </script>
   <% else%>
       <script>
           $("#ta_proportion").change(function(){
-              var ta_proportion = $("#ta_proportion").val();
-              $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
+              var ta_proportion = parseFloat($("#ta_proportion").val());
+              $("#student_proportion").val((100 - parseFloat(parseInt(ta_proportion * 100))) + "%");
           });
       </script>
   <% end%>