Merge branch 'szzh' into develop

0)

@@ -0,0 +1 @@
+终止批处理操作吗(Y/N)? 终止批处理操作吗(Y/N)? 终止批处理操作吗(Y/N)? 终止批处理操作吗(Y/N)? 

Gemfile

@@ -16,6 +16,8 @@ gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
+gem 'spreadsheet'
+gem 'ruby-ole'
 
 group :development do
   gem 'better_errors', path: 'lib/better_errors'

app/controllers/application_controller.rb

@@ -759,6 +759,19 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def paginateHelper_for_members obj, pre_size=10
+    @obj_count = StudentsForCourse.find_by_sql("select count(id) as mem_count from students_for_courses where course_id = #{@course.id}")[0][:mem_count].to_s.to_i
+    @obj_pages = Paginator.new @obj_count, pre_size, params['page']
+    if obj.kind_of? ActiveRecord::Base or obj.kind_of?  ActiveRecord::Relation
+      obj.limit(@obj_pages.per_page).offset(0)
+    elsif obj.kind_of? Array
+      obj[0, @obj_pages.per_page]
+    else
+      logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}"
+      raise RuntimeError, 'unknow type, Please input you type into this helper.'
+    end
+  end
+
   #查找首页相关信息
   def find_first_page
     @first_page = FirstPage.find_by_page_type('project')

app/controllers/bids_controller.rb

@@ -492,27 +492,19 @@ class BidsController < ApplicationController
       if @bid.homework_type
         @homework = HomeworkAttach.new
         @is_teacher = is_course_teacher(User.current,@bid.courses.first)
-        teachers = "("
-        teacher_members = searchTeacherAndAssistant(@bid.courses.first)
-        teacher_members.each do |member|
-          if member == teacher_members.last
-            teachers += member.user_id.to_s + ")"
-          else
-            teachers += member.user_id.to_s + ","
-          end
-        end
         if @is_teacher
-          all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
+          all_homework_list = HomeworkAttach.find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score
+              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
               FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
               WHERE table1.t_score IS NULL")
+          @not_batch_homework = true
           @cur_type = 1
         else
-          all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+          all_homework_list = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score,
+              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
-              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id} AND is_teacher_score = #{@is_teacher ? 1 : 0}) AS m_score
               FROM homework_attaches
               INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
               WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC")
@@ -1056,17 +1048,8 @@ class BidsController < ApplicationController
     elsif @bid.comment_status == 1
       @totle_size = 0
       @bid.homeworks.map { |homework| @totle_size += homework.homework_evaluations.count}
-      teachers = "("
-      teacher_members = searchTeacherAndAssistant(@course)
-      teacher_members.each do |member|
-        if member == teacher_members.last
-          teachers += member.user_id.to_s + ")"
-        else
-          teachers += member.user_id.to_s + ","
-        end
-      end
       @cur_size = 0
-      @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
+      @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.is_teacher_score = 0").count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     respond_to do |format|

app/controllers/contests_controller.rb

@@ -134,9 +134,8 @@ class ContestsController < ApplicationController
     @state = false
 
     respond_to do |format|
-      layout_file = 'base_newcontest'
       format.html {
-        render :layout => layout_file
+        render :layout => 'base_newcontest'
       }
       format.api
     end

app/controllers/files_controller.rb

@@ -395,16 +395,18 @@ class FilesController < ApplicationController
           render :layout => 'base_courses'
         }
       end
+   else
+     show_attachments @containers
+     @attachtype = params[:type].to_i
+     @contenttype = params[:contentType].to_s
+
+     respond_to do |format|
+        format.js
+        format.html
+     end
    end
 
-    show_attachments @containers
-    @attachtype = params[:type].to_i
-    @contenttype = params[:contentType].to_s
 
-    respond_to do |format|
-       format.js
-       format.html
-    end
 
   end
 end

app/controllers/members_controller.rb

@@ -129,7 +129,7 @@ class MembersController < ApplicationController
               member =  Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
               role = Role.find_by_id(params[:membership][:role_ids])
               # 这里的判断只能通过角色名，可以弄成常量
-              if role.name == "学生"
+              if role.name == "学生" || role.name == "Student"
                 StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id)
               end
               members << member
@@ -210,7 +210,7 @@ class MembersController < ApplicationController
         if (params[:membership][:role_ids])
           role = Role.find(params[:membership][:role_ids][0])
           # 这里的判断只能通过角色名，可以弄成常量
-          if role.name == "学生"
+          if role.name == "学生"  || role.name == "Student"
             StudentsForCourse.create(:student_id => @member.user_id, :course_id =>@course.id)
           else
             joined = StudentsForCourse.where('student_id = ? and course_id = ?', @member.user_id,@course.id)

app/controllers/users_controller.rb

@@ -376,8 +376,8 @@ class UsersController < ApplicationController
       "show_changesets" => true
     }
        scope = User.logged.status(@status)
-       @search_by = params[:search_by] ? params[:search_by][:id] : 0
+       @search_by = params[:search_by] ? params[:search_by] :"0"
-       scope = scope.like(params[:name],"0") if params[:name].present?
+       scope = scope.like(params[:name], @search_by) if params[:name].present?
        @user_count = scope.count
        @user_pages = Paginator.new @user_count, @limit, params['page']
        @user_base_tag = params[:id] ? 'base_users':'users_base'

app/controllers/welcome_controller.rb

@@ -110,6 +110,7 @@ class WelcomeController < ApplicationController
   def search
     search_condition = params[:q] 
     search_type = params[:search_type].to_sym unless search_condition.blank?
+    search_by = params[:search_by]
 
     if search_type.nil? && params[:contests_search] && params[:name] != ""
       search_type  = :contests
@@ -127,11 +128,11 @@ class WelcomeController < ApplicationController
         when :contests
           redirect_to contests_url(:name => search_condition)
         when :users
-          redirect_to users_search_url(:name => search_condition)
+          redirect_to users_search_url(:name => search_condition,:search_by => search_by)
         when :users_teacher
-          redirect_to users_search_url(:name => search_condition, :role => :teacher)
+          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :teacher)
         when :users_student
-          redirect_to users_search_url(:name => search_condition, :role => :student)
+          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :student)
         else
           #redirect_to home_path, :alert => l(:label_sumbit_empty)
         (redirect_to home_url, :notice => l(:label_sumbit_empty);return) #if params[:name].blank?

app/helpers/courses_helper.rb

@@ -194,19 +194,23 @@ module CoursesHelper
   def searchmember_by_name  members, name
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
-   members.each do |m|
+    if name != ""
+     members.each do |m|
 
         username = m.user[:lastname].to_s + m.user[:firstname].to_s
         if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
           mems << m
         end
-
+      end
+    else
+     mems = members
    end
     mems
   end
   def searchgroupmember_by_name  members, name, group
     #searchPeopleByRoles(project, StudentRoles)
     mems = []
+    if name != ""
     members.each do |m|
     if m.course_group_id == group.id
       username = m.user[:lastname].to_s + m.user[:firstname].to_s
@@ -215,6 +219,9 @@ module CoursesHelper
       end
     end
     end
+    else
+      mems = members
+    end
     mems
   end
   def searchgroupstudent_by_name(group, project, name)

app/models/member.rb

@@ -117,25 +117,16 @@ class Member < ActiveRecord::Base
   # 查找每个学生每个作业的评分
   def student_homework_score
     score_count = 0
-    homework_score = HomeworkAttach.find_by_sql("SELECT bids.`name`, 0 as score,
+    homework_score = HomeworkAttach.find_by_sql("SELECT bids.name, homework_attaches.score as score
-            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach'
-									AND rateable_id = homework_attaches.id ) AS t_score,
-            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach'
-								AND rateable_id = homework_attaches.id ) AS s_score
             FROM homework_attaches, bids where homework_attaches.user_id = #{self.user_id}
 							and homework_attaches.bid_id IN (SELECT bid_id FROM homework_for_courses where course_id = #{self.course_id})
 							AND homework_attaches.bid_id = bids.id  ")
     homework_score.each do |homework|
-      if !homework.t_score.nil? && homework.t_score != 0
+      mem_score = 0
-        score = homework.t_score
+      if homework[:score]
-      else
+        mem_score = homework[:score]
-        if !homework.s_score.nil?
-          score= homework.s_score
-        else
-          score =  0
-        end
       end
-      score_count = score_count + score
+      score_count = score_count + mem_score
     end
     [homework_score, format("%0.2f", score_count)]
   end

app/models/query.rb

@@ -173,6 +173,7 @@ class Query < ActiveRecord::Base
     :string => [ "=", "~", "!", "!~", "!*", "*" ],
     :text => [  "~", "!~", "!*", "*" ],
     :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
+    :integer_done => [ "=", ">=", "<=", "><", "!*", "*" ],
     :float => [ "=", ">=", "<=", "><", "!*", "*" ],
     :relation => ["=", "=p", "=!p", "!p", "!*", "*"]
   }
@@ -217,6 +218,8 @@ class Query < ActiveRecord::Base
         case type_for(field)
         when :integer
           add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) }
+          when :integer_done
+          add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) || (v.match(/^[+-]?\d+$/) && (v.to_i<0 || v.to_i> 100)) }
         when :float
           add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) }
         when :date, :date_past
@@ -602,6 +605,12 @@ class Query < ActiveRecord::Base
           else
             sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
           end
+        when :integer_done
+          if is_custom_filter
+            sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) = #{value.first.to_i})"
+          else
+            sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
+          end
         when :float
           if is_custom_filter
             sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"

app/models/seems_rateable_rates.rb

@@ -0,0 +1,3 @@
+class SeemsRateableRates < ActiveRecord::Base
+  attr_accessible :rater_id, :rateable_id, :rateable_type, :stars, :dimension, :is_teacher_score
+end

app/views/bids/_homework_list.html.erb

@@ -59,7 +59,7 @@
                :locals => {:homeworks => @homework_list,
                            :homework_count => @obj_count,
                            :remote => false,
-                           :is_student_batch_homework => @is_student_batch_homework}%>
+                           :not_batch_homework => @not_batch_homework,:is_student_batch_homework => @is_student_batch_homework}%>
   </div>
 </div>
 </div>

app/views/courses/_join_private_course.html.erb

@@ -13,7 +13,7 @@
       a{ text-decoration:none; }
       a:hover{ }
 
-
+      .alert_box {width:488px;height:550px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
       #popbox{width:488px;height:308px;}
       .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px;  }
       .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
@@ -21,7 +21,7 @@
       .C_top p{ color:#a9aaaa; line-height:22px;}
       .C_form{ margin:20px 0 0 60px;}
       .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
-      .C_form ul li input{ margin-left:30px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;  }
+      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
       .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:90px;}
       .width190{ width:190px; height:26px; border-color:#e1e1e1;}
       .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
@@ -35,6 +35,11 @@
           hideModal(obj);
           $("#new-watcher-form").submit();
       }
+
+      function hidden_join_course_form()
+      {
+          hideModal($("#popbox"));
+      }
   </script>
 </head>
 
@@ -55,6 +60,7 @@
             <li>
               <span class="tips">课&nbsp;程&nbsp;ID：</span>
               <input class=" width190" name="object_id" id="object_id" type="text" value="" >
+              <input type="text" style="display: none"/>
             </li>
             <li class="mB5">课程ID是所在课程网址中显示的序号</li>
             <li>
@@ -62,8 +68,12 @@
               <input class=" width190" type="password" name="course_password" id="course_password" value="" >
             </li>
             <li>
-              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);"><%= l(:label_new_join)  %></a>
+              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
-              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);"><%= l(:button_cancel)%></a>
+                <%= l(:label_new_join)  %>
+              </a>
+              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);">
+                <%= l(:button_cancel)%>
+              </a>
             </li>
           </ul>
       <% end%>

app/views/courses/_member_list.html.erb

@@ -1,13 +1,4 @@
-<script type=" text/javascript" charset="utf-8">
+
-  function change_pic(id){
-      var classname = document.getElementById(id).className
-      if(classname == 'st_up') {
-          document.getElementById(id).className = 'st_down'
-      }
-      else
-          document.getElementById(id).className = 'st_up'
-  }
-</script>
 <div style="margin-left: 15px" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
 <% if User.current.logged? && User.current.member_of_course?(@course) && @group  %>
       <% if !@canShowCode %>
@@ -34,16 +25,22 @@
     <div class="st_box">
       <ul class="st_box_top" style="margin-left: 17px;">
         <% if @subPage_title == l(:label_student_list) %>
-            <li class="ml358"><%= link_to '作业积分', member_score_sort_course_path ,method: 'get', remote: true, :onclick => "change_pic('pic')"%>
+            <li class="ml358"><%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0)) ,:result => members,method: 'get', remote: true%>
-              <a id="pic" href="#" class="st_down"></a>
+             <% if @score_sort_by == 'desc' %>
-            </li>
+              <a id="pic" href="#" class= "st_down"></a>
+            <% else %>
+                  <a id="pic" href="#" class= "st_up"></a>
+            <% end %>
+                  </li>
             <li class="ml50">
               <a href="#" >加入时间</a>
             </li>
         <% else %>
+            <li class="ml50">
+            </li>
             <li class="ml50" style="margin-left: 470px">
             </li>
-            <li class="ml50">
+            <li class="ml50" style="margin-left: 80%">
               <a href="#" >加入时间</a>
             </li>
         <% end %>
@@ -53,7 +50,7 @@
           <% members.each do |member| %>
               <div class="cl"></div><!--st_box_top end-->
               <div class="st_boxlist">
-                <% next if member.new_record?  %>
+
                 <a href="#" class="st_img" style="float:left;">
                   <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40))  %>
                 </a>
@@ -79,7 +76,7 @@
                   <% end %>
                 </ul>
                 <% if @subPage_title == l(:label_student_list) %>
-                    <%= link_to format("%0.2f",member.score.to_s), {
+                    <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
                             :action => 'show_member_score',
                             :member_id => member.id,
                             :remote => true},
@@ -101,7 +98,7 @@
 	    </div>
       </div>
 	<div class="pagination">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+      <%= pagination_links_full @obj_pages,   @obj_count,:per_page_links => false, :remote =>@is_remote %>
     </div>
 <% else %>
 	<p class="nodata">

app/views/courses/_searchmembers.html.erb

@@ -0,0 +1,12 @@
+<% if @subPage_title && @subPage_title == l(:label_student_list)%>
+    <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
+        <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px; float: left;"%>
+        <% if @group %>
+            <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
+            <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2", :style => "float: left "%>
+        <% else %>
+            <%= submit_tag l(:label_search_member),:style => "float: left", :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
+        <% end %>
+    <% end %>
+    <%= link_to l(:label_export_excel), export_course_member_excel_course_path(@course,:format => 'xls'),:class=>'xls'%>
+<% end %>

app/views/courses/_show_member_score.html.erb

@@ -40,16 +40,8 @@
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
       <% @member_score.student_homework_score[0].each do |homework_score| %>
-          <% if !homework_score.t_score.nil? && homework_score.t_score != 0 %>
+
-              <% score = homework_score.t_score %>
+            <li><span class="c_grey02 w280"><%= homework_score.name %></span><span class="c_red w70"><%= format("%0.2f",homework_score[:score].nil? ? 0 : homework_score[:score]) %></span></li>
-          <% else %>
-              <% if !homework_score.s_score.nil? %>
-                  <% score = homework_score.s_score %>
-              <% else %>
-                  <% score = 0 %>
-              <% end %>
-          <% end %>
-            <li><span class="c_grey02 w280"><%= homework_score.name %></span><span class="c_red w70"><%= format("%0.2f",score) %></span></li>
        <% end %>
       <li><span class="c_blue03 w280">作业积分（总得分）</span><span class="c_red w70"><%= @member_score.student_homework_score[1] %></span></li>
     </ul>

app/views/courses/join_private_courses.js.erb

@@ -1,3 +1,9 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
 showModal('ajax-modal', '510px');
-$('#ajax-modal').css('height','330px');
+$('#ajax-modal').css('height','330px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+        "<a href='#' onclick='hidden_join_course_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("alert_box");

app/views/courses/member.html.erb

@@ -57,20 +57,10 @@
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
 <div class="st_list">
-  <div class="st_search" style="margin-left: 14px">
+  <div class="st_search" style="margin-left: 14px" >
     <span class="f_l"><%= @subPage_title %></span>
-        <span>
+        <span id = "search_members">
-          <% if @subPage_title && @subPage_title == l(:label_student_list)%>
+          <%= render :partial => 'searchmembers' %>
-              <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
-                  <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px; float: left;"%>
-                  <% if @group %>
-                      <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
-                      <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2", :style => "float: left "%>
-                  <% else %>
-                      <%= submit_tag l(:label_search_member),:style => "float: left", :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
-                  <% end %>
-              <% end %>
-          <% end %>
         </span>
   </div>
   <div class="cl"></div>

app/views/courses/member.js.erb

@@ -0,0 +1 @@
+$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @members})%>");

app/views/courses/member_score_sort.js.erb

@@ -1,4 +1,4 @@
 /**
  * Created by Administrator on 2014/12/3.
  */
-$("#list_detail").html("<%= escape_javascript( render :partial => 'member_list_detail', :locals => {:members => @results})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @results})%>");