增加《学生加入，退出分组》功能

Signed-off-by: alan <547533434@qq.com>

app/controllers/courses_controller.rb

@@ -78,21 +78,9 @@ class CoursesController < ApplicationController
       format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Course.find(params[:object_id]), :object_id => params[:object_id]} }
     end
   end
-  def join_group
-    group = CourseGroup.find(params[:object_id])
-    member = Member.find(:conditions => {:course_id => @course.id, :user_id => User.current.id}).first
-    member.course_group_id = group.id
-    member.save
-  end
-  def unjoin_group
-    member = Member.find(:conditions => {:course_group_id => params[object_id], :user_id => User.current.id}).first
-    member.course_group_id = 0
-    member.save
-  end
 
-  def new_join_group
 
-  end
+  
   def join_private_courses
     respond_to do |format|
       format.js
@@ -239,20 +227,43 @@ class CoursesController < ApplicationController
     end
     @course_groups = @course.course_groups
   end
-
+  def join_group
+    group = CourseGroup.find(params[:object_id])
+    member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
+    member.course_group_id = group.id
+    member.save
+    @group = group
+    search_group_members group
+  end
+  def unjoin_group
+    group = CourseGroup.find(params[:object_id])
+    member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
+    member.course_group_id = 0
+    member.save
+    @group = group
+    search_group_members group
+  end
   def searchgroupmembers
     @render_file = 'member_list'
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
     if params[:group_id] && params[:group_id] != "0"
       @group = CourseGroup.find(params[:group_id])
-      @results = searchStudent_by_group(@group)
+      @results = searchStudent_by_group(@group, @course)
     else
       @results = searchStudent(@course)
     end
 
     @results = paginateHelper @results
   end
+  def search_group_members group
+    @render_file = 'member_list'
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    @is_remote = true
+
+    @results = searchStudent_by_group(group, @course)
+    @results = paginateHelper @results
+  end
   def member
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'member_list'

app/helpers/courses_helper.rb

@@ -199,7 +199,7 @@ module CoursesHelper
     end
     members
   end
-  def searchStudent_by_group  group
+  def searchStudent_by_group  group, project
     #searchPeopleByRoles(project, StudentRoles)
     members = []
     group.members.each do |m|

app/helpers/watchers_helper.rb

@@ -113,21 +113,27 @@ module WatchersHelper
 
     @isjoin = false
     coursegroups.each do |g|
-      @isjoin = user.member_of_course_group?(g)
+      g.members.each do |mem|
+        if mem.user_id == user.id
+          @isjoin = true
+        end
+      end
     end
     url_t = join_group_path(:object_id => group.id)
-    url_f = try_join_group_path(:object_id => group.id)
+    url_f = join_group_path(:object_id => group.id)
     if @isjoin == true
       joined = user.member_of_course_group?(group)
       text = l(:label_exit_course)
 
       if joined
-        link_to text, url_t, :remote => true, :method => 'delete', :id => "#{group.id}", :confirm => l(:text_are_you_sure_out), :class => []+options
+        link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'delete', :id => "#{group.id}", :confirm => l(:text_are_you_sure_out_group), :class => []+options
 
       end
     else
       text = l(:label_new_join)
-      link_to text, url_f, :remote => true, :method => 'post', :id => "#{group.id}", :class => []+options
+      form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do
+        submit_tag text, class: "submit f_l", style: "width: 43px;height: 21px;"
+      end
     end
   end
 
@@ -146,7 +152,8 @@ module WatchersHelper
     if joined
       link_to text, url_t, :remote => true, :method => method, :id => "#{course.id}", :confirm => l(:text_are_you_sure_out), :class => []+options
     else
-      link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options
+
+       link_to text, url_f, :remote => true, :method => method, :id => "#{course.id}", :class => []+options
     end       
   end
 

app/models/course_group.rb

@@ -1,7 +1,7 @@
 class CourseGroup < ActiveRecord::Base
   # attr_accessible :title, :body
   belongs_to :course
-  has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
+  has_many :members
   has_many :memberships, :class_name => 'Member'
   has_many :member_principals, :class_name => 'Member',
            :include => :principal,

app/models/principal.rb

@@ -26,7 +26,7 @@ class Principal < ActiveRecord::Base
 
   has_many :members, :foreign_key => 'user_id', :dependent => :destroy
   has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}", :order => "#{Project.table_name}.name"
-  has_many :coursememberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :course, :roles ], :conditions => "#{Course.table_name}.status<>#{Course::STATUS_ARCHIVED}", :order => "#{Course.table_name}.name"
+  has_many :coursememberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :course, :roles ],  :order => "#{Course.table_name}.name"
   has_many :projects, :through => :memberships
   #add by nwb
   has_many :courses, :through => :coursememberships

app/views/courses/_groups_name.html.erb

@@ -51,9 +51,6 @@
        </span>
       </li>
     </ul>
-    <div class="cl"></div>
-    <span class="f_l"><%= @group %><%= @subPage_title %></span>
-    <% if !@canShowCode %>
-        <%= join_in_course_group(@course.course_groups,@group, User.current) %>
-    <% end %>
+   
+    
 

app/views/courses/_member_list.html.erb

@@ -1,3 +1,12 @@
+<div style="font-size: 18px">
+<% if @group %>
+      <% if !@canShowCode %>
+          <%= join_in_course_group(@course.course_groups,@group, User.current) %>
+      <% end %>&nbsp;&nbsp;&nbsp;
+    <span ><%= @group.name %><%= @subPage_title %></span>
+
+<% end %>
+</div>
 
 <% if members.any? %>
 	<% members.each do |member| %>

app/views/courses/join_group.js.erb

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

app/views/courses/unjoin_group.js.erb

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

config/routes.rb

@@ -647,6 +647,8 @@ RedmineApp::Application.routes.draw do
       match "searchgroupmembers", :via => [:post, :get]
       match "updategroupname", :via => [:post, :get]
       match "addgroups", :via => [:post, :get]
+      post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
+      delete 'join_in/join_group', :to => 'courses#unjoin_group'
     end
     collection do
       match 'join_private_courses', :via => [:get, :post]