Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/controllers/courses_controller.rb

app/controllers/courses_controller.rb

@@ -79,6 +79,8 @@ class CoursesController < ApplicationController
     end
   end
 
+
+  
   def join_private_courses
     respond_to do |format|
       format.js
@@ -196,28 +198,102 @@ class CoursesController < ApplicationController
     end
   end
 
+  def searchmembers
+    @render_file = 'member_list'
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    @is_remote = true
+    q = "#{params[:name].strip}"
+      #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+    @results = searchStudent_by_name(@course, q)
+    @result_count = @results.count
+    @results = paginateHelper @results
+
+  end
+
+  def addgroups
+    if params[:group_name]
+      group = CourseGroup.new
+      group.name = params[:group_name]
+      group.course_id = @course.id
+      group.save
+    end
+    @course_groups = @course.course_groups
+  end
+
+  def updategroupname
+    if params[:group_name]
+      group = CourseGroup.find(params[:group_id])
+      group.name = params[:group_name]
+      group.save
+    end
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    @is_remote = true
+    @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, @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
     ## 有角色参数的才是课程，没有的就是项目
-    if User.current.member_of_course?(@course) || User.current.admin?
-      @render_file = 'member_list'
-      @teachers= searchTeacherAndAssistant(@course)
-      @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
-      case params[:role]
-        when '1'
-          @subPage_title = l :label_teacher_list
-          @members = searchTeacherAndAssistant(@course)
-        when '2'
-          @subPage_title = l :label_student_list
-          @members = searchStudent(@course)
+    @render_file = 'member_list'
+    @teachers= searchTeacherAndAssistant(@course)
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    @role = params[:role]
+    @course_groups = @course.course_groups if @course.course_groups
+    @course_group_id = params[:@course_group_id] unless params[:@course_group_id].nil?
+    case params[:role]
+      when '1'
+        @subPage_title = l :label_teacher_list
+        @members = searchTeacherAndAssistant(@course)
+      when '2'
+        @subPage_title = l :label_student_list
+        if @course_group_id
+           @members = search_student_in_group(@course, @course_group_id)
         else
-          @subPage_title = ''
-          @members = @course.member_principals.includes(:roles, :principal).all.sort
-      end
-      @members = paginateHelper @members
-      render :layout => 'base_courses'
-    else
-       render_403
+          @members = searchStudent(@course)
+        end
+      else
+        @subPage_title = ''
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
     end
+    @members = paginateHelper @members
+    render :layout => 'base_courses'
   end
 
   #判断指定用户是否为课程教师
@@ -270,11 +346,12 @@ class CoursesController < ApplicationController
       @course.setup_time = params[:setup_time]
       @course.endup_time = params[:endup_time]
       @course.class_period = params[:class_period]
+    end
 
-      @issue_custom_fields = IssueCustomField.sorted.all
-      @trackers = Tracker.sorted.all
+    @issue_custom_fields = IssueCustomField.sorted.all
+    @trackers = Tracker.sorted.all
 
-      if  @course.save
+    if  @course.save
         #unless User.current.admin?
         r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
         m = Member.new(:user => User.current, :roles => [r])
@@ -300,16 +377,13 @@ class CoursesController < ApplicationController
           }
           format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
         end
-      else
+     else
         #@course.destroy
         respond_to do |format|
           format.html { render :action => 'new', :layout => 'base' } #Added by young
           format.api { render_validation_errors(@course) }
         end
-      end
-    else
-      redirect_to my_account_url
-    end
+     end
   end
 
   def course
@@ -669,29 +743,24 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-    if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
-      page = params[:page]
-      # Find the page of the requested reply
-      @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-      @limit =  10
-      if params[:r] && page.nil?
-        offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
-        page = 1 + offset / @limit
-      end
-
-      #@feedback_count = @jours.count
-      #@feedback_pages = Paginator.new @feedback_count, @limit, page
-      #@offset ||= @feedback_pages.offset
-      @jour = paginateHelper @jours,10
-      @state = false
-      respond_to do |format|
-        format.html{render :layout => 'base_courses'}
-        format.api
-      end
-    else
-      render_403
+    page = params[:page]
+    # Find the page of the requested reply
+    @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @limit =  10
+    if params[:r] && page.nil?
+      offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
+      page = 1 + offset / @limit
+    end
+
+    #@feedback_count = @jours.count
+    #@feedback_pages = Paginator.new @feedback_count, @limit, page
+    #@offset ||= @feedback_pages.offset
+    @jour = paginateHelper @jours,10
+    @state = false
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+      format.api
     end
-
   end
 
 

app/helpers/courses_helper.rb

@@ -155,10 +155,39 @@ module CoursesHelper
     members
   end
 
+  def search_student_in_group(project, course_group_id)
+    #searchPeopleByRoles(project, StudentRoles)
+    members = []
+    project.members.each do |m|
+      members << m  if m && m.user && m.user.allowed_to?(:as_student,project)
+    end
+    members
+  end
   def searchStudent project
+      #searchPeopleByRoles(project, StudentRoles)
+      members = []
+      project.members.each do |m|
+        members << m  if m && m.user && m.user.allowed_to?(:as_student,project)
+      end
+    members
+  end
+  def searchStudent_by_name  project, name
     #searchPeopleByRoles(project, StudentRoles)
     members = []
     project.members.each do |m|
+      if m && m.user && m.user.allowed_to?(:as_student,project)
+        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))
+          members << m
+        end
+      end
+    end
+    members
+  end
+  def searchStudent_by_group  group, project
+    #searchPeopleByRoles(project, StudentRoles)
+    members = []
+    group.members.each do |m|
       members << m  if m && m.user && m.user.allowed_to?(:as_student,project)
     end
     members

app/helpers/watchers_helper.rb

@@ -108,6 +108,37 @@ module WatchersHelper
       link_to text, url, :remote => true, :method => method, :id => "#{course.id}", :class => []+options
     end       
   end
+  def join_in_course_group(coursegroups,group, user, options=[])
+    return '' unless user && user.logged?
+
+    @isjoin = false
+    coursegroups.each do |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 = 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, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"},
+                :remote => true, :method => 'delete',
+                :id => "#{group.id}", :style => "padding: 8px 8px 4px;",
+                :confirm => l(:text_are_you_sure_out_group), :class => 'group_in'
+
+      end
+    else
+      text = l(:label_new_join)
+      form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do
+        submit_tag text, class: "group_in", style: "width: 43px;height: 21px;"
+      end
+    end
+  end
 
   # 用户是否允许加入课程判断
   # add by nwb
@@ -124,7 +155,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.rb

@@ -29,6 +29,8 @@ class Course < ActiveRecord::Base
   has_many :news, :dependent => :destroy, :include => :author
   has_one :course_status, :class_name => "CourseStatus", :dependent => :destroy
 
+  has_many :course_groups, :dependent => :destroy
+
   acts_as_taggable
   acts_as_nested_set :order => 'name', :dependent => :destroy
   acts_as_attachable :view_permission => :view_course_files,

app/models/course_group.rb

@@ -0,0 +1,21 @@
+class CourseGroup < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :course
+  has_many :members
+  has_many :memberships, :class_name => 'Member'
+  has_many :member_principals, :class_name => 'Member',
+           :include => :principal,
+           :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
+  has_many :principals, :through => :member_principals, :source => :principal
+  has_many :users, :through => :members
+
+  before_destroy :set_member_nil
+
+  attr_accessible :name
+
+  def set_member_nil
+    if self.members && self.members.count > 0
+       self.members.update_all("course_group_id = 0")
+    end
+  end
+end

app/models/member.rb

@@ -24,6 +24,7 @@ class Member < ActiveRecord::Base
   belongs_to :project
   belongs_to :course
 
+  belongs_to :course_group
   validates_presence_of :principal
   validates_uniqueness_of :user_id, :scope => [:project_id,:course_id]
   validate :validate_role

app/models/principal.rb

@@ -26,10 +26,11 @@ 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
+  has_many :course_groups, :through => :coursememberships
   has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
 
   # Groups and active users

app/models/user.rb

@@ -690,6 +690,9 @@ class User < Principal
     courses.to_a.include?(course)
   end
 
+  def member_of_course_group?(course_group)
+    course_groups.to_a.include?(course_group)
+  end
   # Returns a hash of user's projects grouped by roles
   def projects_by_role
     return @projects_by_role if @projects_by_role

app/views/courses/_groups_name.html.erb

@@ -0,0 +1,60 @@
+
+
+
+    <ul>
+
+      <li style=" color:#8b8b8b;">分班:</li>
+
+      <li class="classbox">
+        <% course_member_count = l(:label_all) + "(" + @course.members.count.to_s + "人)" %>
+      <%= form_tag( searchgroupmembers_course_path(@course, :group_id => 0), method: 'get',:remote=>true) do %>
+
+
+        <%= hidden_field_tag "all", params[:group_id], name: 'all' %>
+        <%= submit_tag  course_member_count, :style => "background: #f8df8c; border:0px; color: black" %>
+
+      <% end %>
+      </li>
+      <% if course_groups.any? %>
+      <% course_groups.each do |group| %>
+      <% group_display = group.name + "(" + group.members.count.to_s + "人)" %>
+      <li class="classbox" id="group_name_<%= group.id %>">
+        <%= form_tag(searchgroupmembers_course_path(@course,:group_id => group.id), method: 'get', remote: true) do %>
+            <%#= text_field_tag "group_id", params[:group_id] %>
+            <%= submit_tag group_display, :onclick => "$asign_id(#{group.id})",:style => "background: #f8df8c; border:0px; color: black; float:left;"%>
+            <% if @canShowCode %>
+            <a href="javascript:void(0)" class="f_l" onclick="$('#add_tag_<%= group.id %>').slideToggle();"><img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" /></a>
+            <% end %>
+        <% end %>
+           </li>
+      <li>
+        <%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, update: 'group_name') do %>
+                <span id="add_tag_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l">
+                    <%= text_field_tag "group_name", params[:group_name], :size=>10, :class=>"isTxt w90 f_l", :style=>"padding: 0px", :max => 100 %>
+                    <!--<input type="button" class="submit f_l" onclick="addTag();" style="width: 43px"/>-->
+                  <%= submit_tag '', class: "submit f_l", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
+                   </span>
+            <% end %>
+      </li>
+      <% end %>
+     <% end %>
+      <% if @canShowCode %>
+      <li style="margin-left:15px;">
+        <a href="javascript:void(0)" class="st_add f_l" onclick="$('#add_tag04').slideToggle();">+添加分班</a>
+      </li>
+      <li>
+        <span id="add_tag04" style="display:none; vertical-align: middle;" class="ml10 f_l">
+        <%= form_tag( addgroups_course_path(@course),  method: 'get',:remote=>true) do %>
+
+                    <%= text_field_tag "group_name", params[:group_name], size: "20", class: "isTxt w90 f_l", style: "padding: 0px",  maxlength: "100" %>
+                    <%= submit_tag '', class: "submit f_l", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
+                    <%= link_to_function '', "$('#add_tag04').slideToggle();", class: "submit_2", style: "width: 43px"%>
+
+       <% end %>
+       </span>
+      </li>
+      <% end %>
+    </ul>
+   
+    
+

app/views/courses/_member_list.html.erb

@@ -1,4 +1,17 @@
+<div >
+<% if @group %>
+      <% if !@canShowCode %>
+          <%= join_in_course_group(@course.course_groups,@group, User.current) %>
+      <% end %>&nbsp;&nbsp;&nbsp;
+    <span style="font-size: 18px"><%= @group.name %><%= @subPage_title %></span>
+
+<% end %>
+</div>
+
 <% if members.any? %>
+    <% if @result_count %>
+        <p style="font-size: 18px;"><%= l(:label_search_member_count) %><%= @result_count %><%= l(:label_member_people) %></p>
+    <% end %>
 	<% members.each do |member| %>
 	<div class="well">
 		<% next if member.new_record?  %>

app/views/courses/addgroups.js.erb

@@ -0,0 +1 @@
+$("#st_groups").html("<%= escape_javascript(  render :partial => 'groups_name', locals: {:course_groups => @course_groups})%>");

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/member.html.erb

@@ -1,10 +1,28 @@
-<div class="member_header">
-	<p>
-		<%= @subPage_title %>
-	</p>
-</div>
-<div class="member_content">
-	<%= error_messages_for 'member' %>
-	<%= render :partial => @render_file, :locals => {:members => @members} %>			
+<%= 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">
+    <span class="f_l"><%= @subPage_title %></span>
+    <% if @subPage_title == l(:label_student_list) %>
+        <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true) do %>
+            <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1'%>
+            <%= submit_tag l(:label_search), :class => "f_2"%>
+            <%#= link_to l(:label_search),'' , :class => 'f_2' %>
+        <% end %>
+    <% end %>
+  </div>
+  <div class="cl"></div>
+
+  <div class="st_addclass" id = "st_groups">
+    <%= render :partial => 'groups_name', locals: {:course_groups => @course_groups} %>
+  </div>
+
+
+  <div class="cl"></div>
+
+  <div class="member_content" id = "member_content">
+    <%= error_messages_for 'member' %>
+    <%= render :partial => @render_file, :locals => {:members => @members} %>
+  </div>
 </div>
 

app/views/courses/searchgroupmembers.js.erb

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

app/views/courses/searchmembers.js.erb

@@ -0,0 +1,4 @@
+/**
+ * Created by Administrator on 2014/12/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})%>");

app/views/courses/updategroupname.js.erb

@@ -0,0 +1,4 @@
+/**
+ * Created by Administrator on 2014/12/3.
+ */
+$("#st_groups").html("<%= escape_javascript(  render :partial => 'groups_name', locals: {:course_groups => @course_groups})%>");

config/locales/zh.yml

@@ -569,7 +569,9 @@ zh:
   label_role_plural: 角色
   label_role_new: 新建角色
   label_role_and_permissions: 角色和权限
-  label_member: 成员
+  label_member:
+  label_search_member_count: 共搜索到
+  label_member_people: 人
   label_member_new: 添加成员
   label_member_plural: 成员
   label_tracker: 跟踪标签
@@ -1120,6 +1122,7 @@ zh:
   text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
   text_are_you_sure: 您确定要删除吗？
   text_are_you_sure_out: 你确定要退出该课程吗？
+  text_are_you_sure_out_group: 你确定要退出该分组吗？
   text_journal_changed: "%{label} 从 %{old} 变更为 %{new}"
   text_journal_set_to: "%{label} 被设置为 %{value}"
   text_journal_deleted: "%{label} 已删除 (%{old})"

config/routes.rb

@@ -643,10 +643,16 @@ RedmineApp::Application.routes.draw do
       get 'member', :controller => 'courses', :action => 'member', :as => 'member'
       post 'finishcourse'
       post 'restartcourse'
-
+      match "searchmembers", :controller => 'courses', :action => 'searchmembers', :via => [:post,:get]
+      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]
+
     end
 
     match '/member', :to => 'courses#member',  :as => 'member', :via => :get
@@ -739,6 +745,8 @@ RedmineApp::Application.routes.draw do
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
+  post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
+  delete 'join_in/join_group', :to => 'courses#unjoin_group'
   post 'calls/:id/join_in_contest', :to => 'bids#join_in_contest', :as => 'join_in_contest'
   delete 'calls/:id/join_in_contest', :to => 'bids#unjoin_in_contest'
   match 'calls/:id/show_participator', :to => 'bids#show_participator'  # bai
@@ -747,6 +755,7 @@ RedmineApp::Application.routes.draw do
 
   delete 'attachment/:id', :to => 'attachments#delete_homework'
   match 'new_join', :to => 'courses#new_join', :as => 'try_join'
+  match 'new_join_group', :to => 'courses#new_join_group', :as => 'try_join_group'
   match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
   match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]

db/migrate/20141126091207_create_course_groups.rb

@@ -0,0 +1,11 @@
+class CreateCourseGroups < ActiveRecord::Migration
+  def change
+    create_table :course_groups do |t|
+      t.string :name
+      t.integer :course_id
+
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20141126091750_add_column_to_members.rb

@@ -0,0 +1,5 @@
+class AddColumnToMembers < ActiveRecord::Migration
+  def change
+    add_column :members, :course_group_id, :integer, default: 0
+  end
+end