From 859fe01c523487a9f028042ddeeb20a7a8e09559 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 18 Sep 2015 11:14:59 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E7=BC=BA=E8=AF=84=E3=80=81?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=88=97=E8=A1=A8=202=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E4=B8=9A=E8=AF=84=E5=88=86=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |  2 +-
 .../student_work/_set_score_rule.html.erb     |  4 +-
 app/views/student_work/index.html.erb         |  4 +-
 public/javascripts/course.js                  | 54 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cf6305e4d..2a8b4b74a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -453,7 +453,7 @@ 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.2
+        homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
         homework_detail_manual.comment_status = 1
         homework_detail_manual.evaluation_start = Time.now
         homework_detail_manual.evaluation_end = Time.now
diff --git a/app/views/student_work/_set_score_rule.html.erb b/app/views/student_work/_set_score_rule.html.erb
index 97deafde8..532972c45 100644
--- a/app/views/student_work/_set_score_rule.html.erb
+++ b/app/views/student_work/_set_score_rule.html.erb
@@ -13,7 +13,7 @@
       <% if homework.homework_type == 2%>
           <div>
             <span class="f14 fontGrey3 mr10">系统评分</span>
-            <%= select_tag :sy_proportion,options_for_select(ta_proportion_option), {:class => "markPercentage"}  %>
+            <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "markPercentage"}  %>
           </div>
 
           <script>
@@ -43,7 +43,7 @@
       </div>
       <div>
         <span class="f14 fontGrey3 mr10">学生匿评</span>
-        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion* 100).to_i%>%" class="markPercentage" readonly>
+        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
       </div>
       <div class="mb20">
         <span class="f14 fontGrey3 mr10">教师优先</span>
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 9dfebefbb..db704a7de 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -67,10 +67,10 @@
                     <% end%>
                   </li>
                   <li>
-                    <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey') if @homework.homework_type == 1%>
+                    <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
                   </li>
                   <li>
-                    <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey') if @homework.homework_type == 1%>
+                    <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
                   </li>
                   <li>
                     <a href="javascript:void(0);" class="hworkSetting resourcesGrey" onclick="set_score_rule();">评分设置</a>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 43341658e..4f091560d 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -482,18 +482,18 @@ function regex_evaluation_num()
 
 //点击是否开启匿评单选框效果
 $(function(){
-    $("#homework_common_homework_type").click(function(){
-        if($("#homework_common_homework_type").attr("checked") == "checked")
-        {
-            $("#evaluation_setting").slideDown();
-            $("#ta_proportion").removeAttr("disabled");
-        }
-        else
-        {
-            $("#evaluation_setting").slideUp();
-            $("#ta_proportion").attr("disabled","disabled");
-        }
-    });
+    //$("#homework_common_homework_type").click(function(){
+    //    if($("#homework_common_homework_type").attr("checked") == "checked")
+    //    {
+    //        $("#evaluation_setting").slideDown();
+    //        $("#ta_proportion").removeAttr("disabled");
+    //    }
+    //    else
+    //    {
+    //        $("#evaluation_setting").slideUp();
+    //        $("#ta_proportion").attr("disabled","disabled");
+    //    }
+    //});
 
     $("#absence_penalty").change(function(){
         $("#absence_penalty_notice").html("&nbsp;"+ $("#absence_penalty").val() +"&nbsp;");
@@ -520,21 +520,21 @@ function build_selector(max_num){
 }
 
 //第一次加载时，如果未开启匿评作业，隐藏显示匿评配置信息
-$(function(){
-    if($("#homework_common_homework_type").attr("id") != null && $("#homework_common_homework_type").val() != 2)
-    {
-        if($("#homework_common_homework_type").attr("checked") == "checked")
-        {
-            $("#evaluation_setting").show();
-            $("#ta_proportion").removeAttr("disabled");
-        }
-        else
-        {
-            $("#evaluation_setting").hide();
-            $("#ta_proportion").attr("disabled","disabled");
-        }
-    }
-});
+//$(function(){
+//    if($("#homework_common_homework_type").attr("id") != null && $("#homework_common_homework_type").val() != 2)
+//    {
+//        if($("#homework_common_homework_type").attr("checked") == "checked")
+//        {
+//            $("#evaluation_setting").show();
+//            $("#ta_proportion").removeAttr("disabled");
+//        }
+//        else
+//        {
+//            $("#evaluation_setting").hide();
+//            $("#ta_proportion").attr("disabled","disabled");
+//        }
+//    }
+//});
 
 //老师提交 新建/修改 作业
 function submit_homework(id)