From 43192b8648ff593c31ddb8c114d57bd1c28540a8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 15 Jun 2016 17:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E7=9A=84?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A2=9E=E5=8A=A0=E4=BA=BA=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E3=80=81=E7=82=B9=E5=87=BB=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=97=B6=E8=BF=98=E5=8E=9F=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_group_attr.html.erb |  3 ++
 public/javascripts/homework.js            | 48 +++++++++++++++++++++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 681f158e7..952a3396e 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -3,11 +3,14 @@
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最小人数：</span>
   <input id="min_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" />人
+  <span class="c_red undis" id="min_num_notice"></span>
 </div>
 <div class="mt10">
   <span class="f14 fontGrey3 mr5">每组最大人数：</span>
   <input id="max_num" type="text" name="" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" />人
+  <span class="c_red undis" id="max_num_notice"></span>
 </div>
+<p class="c_red undis" id="min_max_num_notice"></p>
 <div class="mb10 mt10">
   <label>
     <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index e9ef7ad6c..1578d72df 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -194,9 +194,11 @@ $(function(){
             $("#GroupPopupBox").dialog("open");
             $(".ui-dialog-titlebar").hide();
             $("a.popClose").on('click', function(){
+                reset_group_attr();
                 $("#GroupPopupBox" ).dialog("close");
             });
             $("#cancel_group").on('click', function(){
+                reset_group_attr();
                 $("#GroupPopupBox" ).dialog("close");
             });
             $('#min_num').focus();
@@ -351,29 +353,67 @@ $(function(){
             $("#GroupPopupBox").dialog("open");
             $(".ui-dialog-titlebar").hide();
             $("a.popClose").on('click', function () {
+                reset_group_attr();
                 $("#GroupPopupBox").dialog("close");
             });
             $("#cancel_group").on('click', function () {
+                reset_group_attr();
                 $("#GroupPopupBox").dialog("close");
             });
             $('#min_num').focus();
         }
     });
 
+    var reset_group_attr = function() {
+        $("#min_num_notice").hide();
+        $("#min_max_num_notice").hide();
+        $("#max_num_notice").hide();
+        if($("input[name=min_num]").length > 0 && $("input[name=max_num]").length > 0) {
+            $("#min_num").val($("input[name=min_num]").val());
+            $("#max_num").val($("input[name=max_num]").val());
+        } else {
+            $("#min_num").val(2);
+            $("#max_num").val(10);
+        }
+    };
     var saveGroupAttr = function() {
         var valid = true;
         var base_on_project = 0;
         var min = $.trim($("#min_num").val());
         var max = $.trim($("#max_num").val());
-        if(min.length <= 0) {
+        var regex = /^\d+$/;
+        if(!regex.test(min) || parseInt(min) <= 0) {
+            $("#min_num_notice").html("请输入正整数");
+            $("#max_num_notice").html("");
+            $("#min_max_num_notice").html("");
+            $("#min_num_notice").show();
             $("#min_num").focus();
-            valid = false;
             return false;
+        } else {
+            $("#min_num_notice").html("");
+            $("#min_num_notice").hide();
+        }
+        if(!regex.test(max) || parseInt(max) <= 0) {
+            $("#max_num_notice").html("请输入正整数");
+            $("#min_num_notice").html("");
+            $("#min_max_num_notice").html("");
+            $("#max_num_notice").show();
+            $("#max_num").focus();
+            return false;
+        } else {
+            $("#max_num_notice").html("");
+            $("#max_num_notice").hide();
         }
-        if(max.length <= 0) {
+        if(parseInt(min) > parseInt(max)) {
+            $("#min_max_num_notice").html("最小人数不得大于最大人数");
+            $("#min_num_notice").html("");
+            $("#max_num_notice").html("");
+            $("#min_max_num_notice").show();
             $("#max_num").focus();
-            valid = false;
             return false;
+        } else {
+            $("#min_max_num_notice").html("");
+            $("#min_max_num_notice").hide();
         }
         if ($("#base_on_project").is(":checked")) {
             base_on_project = 1;