From 17c82c5291c4f07b8a60dff788d4a473a4fc8954 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 29 Sep 2016 17:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=8F=90=E4=BA=A4=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E5=8F=AF=E6=89=A9?=
 =?UTF-8?q?=E5=A4=A7=E5=88=86=E7=BB=84=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/edit.html.erb      |  2 +-
 app/views/users/_user_group_attr.html.erb    | 32 +++++++++++++++++---
 app/views/users/_user_homework_form.html.erb |  2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index ec5ecc31c..b2bc236ca 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -47,7 +47,7 @@
       <% elsif @homework.homework_type == 2 %>
           <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和测试集。</p>
       <% elsif @homework.homework_type == 3 %>
-          <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置。</p>
+          <p class="c_red mb5">已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置(可扩大分组范围)。</p>
       <% end %>
   <% elsif stu_pro_count != 0 && @homework.homework_type == 3 %>
       <p class="c_red mb5">已有<%=stu_pro_count %>个学生关联项目，不允许再修改作业类型。</p>
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 4596ef411..5d1475991 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -1,10 +1,10 @@
 <div id="groupHomework">
   <div> <span class="f14 mt5 fl fontGrey3 mr10">分组设置：</span>
     <div class="mr50 fl"> <span class="f14 fontGrey3 mr5">每组最小人数：</span>
-      <input id="min_num" type="text" name="min_num" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" <%=not_allow_select ? 'disabled' : '' %>/>人
+      <input id="min_num" type="text" name="min_num" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.min_num : 2 %>" <%=not_allow_select ? "onchange = regex_scope(#{homework.homework_detail_group.min_num}, 1)" : '' %>/>人
     </div>
     <div class="fl"> <span class="f14 fontGrey3 mr5">每组最大人数：</span>
-      <input id="max_num" type="text" name="max_num" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" <%=not_allow_select ? 'disabled' : '' %>/>人
+      <input id="max_num" type="text" name="max_num" class="markInput" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.max_num : 10 %>" <%=not_allow_select ? "onchange = regex_scope(#{homework.homework_detail_group.max_num}, 2)" : '' %>/>人
     </div>
     <span class="c_red undis ml20 mt7 fl" id="min_max_num_notice"></span>
     <div class="cl"></div>
@@ -21,7 +21,29 @@
 <div class="cl"></div>
 
 <script>
-    if($.trim($("#base_on_project").val()) == 1) {
-        $("#base_on_project").attr('checked','checked');
-    }
+    $(function () {
+        if($.trim($("#base_on_project").val()) == 1) {
+            $("#base_on_project").attr('checked','checked');
+        }
+        <% if not_allow_select %>
+        $("#min_num").on('change', function() {
+            var min_num = <%=homework.homework_detail_group.min_num %>;
+            if(parseInt($(this).val()) > min_num) {
+                $(this).val(min_num);
+                $("#min_max_num_notice").html('分组范围不可缩小').show();
+            } else {
+                $("#min_max_num_notice").html('').hide();
+            }
+        });
+        $("#max_num").on('change', function() {
+            var max_num = <%=homework.homework_detail_group.max_num %>;
+            if(parseInt($(this).val()) < max_num) {
+                $(this).val(max_num);
+                $("#min_max_num_notice").html('分组范围不可缩小').show();
+            } else {
+                $("#min_max_num_notice").html('').hide();
+            }
+        });
+        <% end %>
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index f225e4fcd..b8785dc9a 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -7,7 +7,7 @@
       var first_click = true;
       $(function(){
         $("#homework_type_option").on("change",function(){
-            var type = $(this).children('option:selected').val()
+            var type = $(this).children('option:selected').val();
             if(type == "1"){
                 $("#homeworkSetting").addClass("undis");
                 $("#homeworkSetting").html("");