From 7cba1e5f76345eb4bb5f9b68267ffcbba5d87d3f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 17:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=86=85=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js   | 94 ++++++++++++++++++++++------------
 public/javascripts/new_user.js |  7 ---
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 46a98ed6d..eeb11575a 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -410,22 +410,6 @@ function show_bid_dead_line(year,month,day,divname)
     + "<p class='fr'>作品提交还剩：</p>");
 }
 
-//验证新建作业的名字
-function regex_homework_name()
-{
-    var name = $.trim($("#homework_name").val());
-
-    if(name=="")
-    {
-        $("#homework_name_span").text("名称不能为空");
-        return false;
-    }
-    else
-    {
-        $("#homework_name_span").text("");
-        return true;
-    }
-}
 
 //处理迟交、缺评扣分
 function check_late_penalty(id)
@@ -579,22 +563,68 @@ function regex_evaluation_num(){
 }
 
 //老师提交 新建/修改 作业
-//function submit_homework(id)
-//{
-//    if(!regex_homework_name())
-//    {
-//        $("#homework_name").focus();
-//    }
-//    else if(!regex_evaluation_num())
-//    {
-//        $("#evaluation_num").focus();
-//    }
-//    else
-//    {
-//        homework_description_editor.sync();
-//        $("#"+id).submit();
-//    }
-//}
+function submit_homework(id){
+    if(!regex_homework_name()){
+        $("#homework_name").focus();
+    }
+    else if(!regex_homework_end_time()){
+        $("#homework_end_time").focus();
+    }
+    else if(!regex_course_id()){
+        $("#course_id").focus();
+    }
+    else{
+        homework_description_editor.sync();
+        $("#"+id).submit();
+    }
+}
+
+//验证新建作业的名字
+function regex_homework_name()
+{
+    var name = $.trim($("#homework_name").val());
+
+    if(name=="")
+    {
+        $("#homework_name_span").text("名称不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_name_span").text("");
+        return true;
+    }
+}
+//验证截止时间
+function regex_homework_end_time()
+{
+    var name = $.trim($("#homework_end_time").val());
+    if(name=="")
+    {
+        $("#homework_end_time_span").text("截止时间不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_end_time_span").text("");
+        return true;
+    }
+}
+
+//验证发送到课程
+function regex_course_id(){
+    var course_id = $("#course_id").val();
+    if(course_id == -1)
+    {
+        $("#homework_course_id_span").text("发布课程不能为空");
+        return false;
+    }
+    else
+    {
+        $("#homework_course_id_span").text("");
+        return true;
+    }
+}
 
 function regexHomeworkCommonName()
 {
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 28fa9597f..be3119257 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -63,17 +63,10 @@ function submit_homework(id){
     else if(!regex_homework_end_time()){
         $("#homework_end_time").focus();
     }
-    //else if(!regex_evaluation_start()){
-    //    $("#evaluation_start_time").focus()
-    //}
-    //else if(!regex_evaluation_end()){
-    //    $("#evaluation_end_time").focus()
-    //}
     else if(!regex_course_id()){
         $("#course_id").focus();
     }
     else{
-
         homework_description_editor.sync();
         $("#"+id).submit();
     }