From 254e1f44f618b822612a3f3e1ca7ca9185962382 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 14 Jun 2016 15:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=BE=E7=BD=AE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=BF=AE=E6=94=B9=E4=B8=8E=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_set_score_rule_detail.html.erb           | 24 +++++++++++++++----
 public/javascripts/course.js                  |  2 +-
 public/javascripts/new_user.js                | 18 ++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)

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 fe2c734e5..eaabc81df 100644
--- a/app/views/student_work/_set_score_rule_detail.html.erb
+++ b/app/views/student_work/_set_score_rule_detail.html.erb
@@ -2,12 +2,14 @@
   <span class="uploadText">评分设置</span>
   <div class="mt15">
     <span class="f14 fontGrey3 mr10">迟交扣分</span>
-    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <span class="f12 c_red ml10">请输入0-50数值</span>
   </div>
   <% if homework.anonymous_comment == 0 %>
-      <div>
+      <div class="mt10">
         <span class="f14 fontGrey3 mr10">缺评扣分</span>
-        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+        <span class="f12 c_red ml10">请输入0-50数值</span>
       </div>
   <% end %>
 
@@ -55,11 +57,23 @@
   </div>
   <div>
     <div class="courseSendSubmit">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();clickCanel();">确定</a>
+      <a href="javascript:void(0);" class="sendSourceText" onclick="set_score_rule_submit();">确定</a>
     </div>
     <div class="courseSendCancel">
       <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="hideModal();">取消</a>
     </div>
   </div>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+  function set_score_rule_submit() {
+      if($("#late_penalty_num").val() == ""){
+          $("#late_penalty_num").val("0");
+      }
+      if($("#absence_penalty_num").val() == ""){
+          $("#absence_penalty_num").val("0");
+      }
+      $('#ajax-modal').find('form').submit();
+      clickCanel();
+  }
+</script>
\ No newline at end of file
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 9f6b6aabd..6fbf9f8c4 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -550,7 +550,7 @@ function check_late_penalty(id)
     }
     else
     {
-        obj.val("0");
+        obj.val("");
     }
 }
 
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index b6301afad..2771dd191 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -259,6 +259,24 @@ function regex_evaluation_end(){
     }
 }
 
+//处理迟交、缺评扣分
+function check_late_penalty(id)
+{
+    var obj = $("#" + id);
+    var regex = /^\d+$/;
+    if(regex.test(obj.val()))
+    {
+        if(obj.val() > 50)
+        {
+            obj.val("50");
+        }
+    }
+    else
+    {
+        obj.val("");
+    }
+}
+
 //验证匿评数量
 function regex_evaluation_num(){
     var evaluation_num = $.trim($("#evaluation_num").val());