From a8401ac24140e4ae8f2e419e8dae32535ea04355 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 19 May 2017 19:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A87=E4=B8=AAt?=
 =?UTF-8?q?ab=E4=B8=8E=E6=94=B6=E7=BC=A9=E6=A1=86=E5=B9=B6=E5=88=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_homework_search_form.html.erb            |  2 +-
 app/views/homework_common/index.html.erb      | 56 ++++++++++++++++---
 public/javascripts/edu/course.js              |  6 --
 3 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index c315e733e..71a128c13 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,4 +1,4 @@
 <%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
-    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" />
+    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" id="homework_name_search" />
     <a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt10"><i class="fa fa-search"></i></a>
 <% end %>
\ No newline at end of file
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 34e3f3a9d..95024f16e 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -9,22 +9,60 @@
     <div class="edu-class-innner-conbox">
       <div class="edu-con-top clearfix" >
         <p class="fl task-form-60 mt3 ml15">
-          <a href="<%= homework_common_index_path(:course => @course.id) %>" class="edu-filter-cir-grey mr5 active" data-remote="true">全部</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 0, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">挂起</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 1, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">提交中</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 2, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">补交中</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 3, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">匿评中</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 4, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">申诉中</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 5, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">评阅中</a>
-          <a href="<%= homework_common_index_path(:course => @course.id, :order => 6, :search => @search) %>" class="edu-filter-cir-grey mr5" data-remote="true">已结束</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5 active" data-remote="true" id="all">全部</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="hang_up">挂起</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="submiting">提交中</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="resubmiting">补交中</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="anonymous">匿评中</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="alleging">申诉中</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="reading">评阅中</a>
+          <a href="javascript:void(0);" class="edu-filter-cir-grey mr5" data-remote="true" id="ending">已结束</a>
         </p>
         <div id="search_div" class="edu-position fr task-form-30 mr15">
           <%= render :partial =>  'homework_search_form', :locals => {:course => @course} %>
         </div>
-      </div>      <div id="homework_index_list">
+      </div>
+      <div id="homework_index_list">
         <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %>
       </div>
     </div>
   </div>
 </div>
 
+<script>
+    /* ------------------------- 作业列表全部/挂机/提交中/补交中....的点击事情 ----------------------------*/
+    $(".edu-filter-cir-grey").live("click", function(ev){
+        var nStatus = $(".edu-filter-cir-grey");       // 所有状态的jquery标签
+        var search = $("#homework_name_search").val(); // 搜索课程名称
+        var id = $(this).attr("id");                   // 获取点击标签的id
+        var order = null;                              // 后台判定状态的标志
+
+        // tab标签样式切换
+        nStatus.removeClass("active");
+        $(this).addClass("active");
+
+        // 获取order的值
+        if(id == "hang_up"){
+            order = 0;
+        }else if(id == "submiting"){
+            order = 1;
+        }else if(id == "resubmiting"){
+            order = 2;
+        }else if(id == "anonymous"){
+            order = 3;
+        }else if(id == "alleging"){
+            order = 4;
+        }else if(id == "reading"){
+            order = 5;
+        }else if(id == "ending"){
+            order = 6;
+        }
+
+        // 提交数据局部刷新
+        $.ajax({
+            url: "<%= homework_common_index_path %>" + ".js",
+            data: { order: order, search: search, course: <%= @course.id %> }
+        });
+
+    });
+</script>
\ No newline at end of file
diff --git a/public/javascripts/edu/course.js b/public/javascripts/edu/course.js
index 1fba90492..2fd74b99c 100644
--- a/public/javascripts/edu/course.js
+++ b/public/javascripts/edu/course.js
@@ -133,12 +133,6 @@ $(function() {
         }
     });
 
-    /* ------------------------- 作业列表全部/挂机/提交中/补交中....的点击事情 ----------------------------*/
-    $(".edu-filter-cir-grey").live("click", function(ev){
-        var nStatus = $(".edu-filter-cir-grey");
-        nStatus.removeClass("active");
-        $(this).addClass("active");
-    });
 
 //    var changeColor = function(c){
 //        if(c.find(".blue").css("display") == "none") {