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

app/assets/javascripts/org_courses.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/org_courses.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the org_courses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/courses_controller.rb

@@ -29,6 +29,30 @@ class CoursesController < ApplicationController
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
 
+  #查找组织
+  def search_public_orgs_not_in_course
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
+    if course_org_ids.empty?
+      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+    else
+      course_org_ids = "(" + course_org_ids.join(',') +  ")"
+      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+    end
+    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
+    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @hint_flag = params[:hint_flag]
+    #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def join
     if User.current.logged?
         cs = CoursesService.new

app/controllers/files_controller.rb

@@ -24,7 +24,7 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
 
   helper :sort
   include SortHelper

app/controllers/issues_controller.rb

@@ -20,11 +20,11 @@ class IssuesController < ApplicationController
   default_search_scope :issues
 
   before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -397,6 +397,23 @@ class IssuesController < ApplicationController
     end
   end
 
+  def add_journal_in_org
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save
+      org_activity = OrgActivity.where("org_act_type='Issue' and org_act_id =#{@issue.id}").first
+      org_activity.updated_at = jour.created_on
+      org_activity.save
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
 
   def find_project

app/controllers/messages_controller.rb

@@ -174,6 +174,11 @@ class MessagesController < ApplicationController
       user_activity.updated_at = Time.now
       user_activity.save
     end
+    org_activity = OrgActivity.where("org_act_type='Message' and org_act_id =#{@topic.id}").first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/org_courses_controller.rb

@@ -0,0 +1,18 @@
+class OrgCoursesController < ApplicationController
+  def create
+    org_ids = params[:orgNames]
+    @course = Course.find(params[:course_id])
+    org_ids.each do |org_id|
+      OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    @course = Course.find(params[:course_id])
+    @org_course = OrgCourse.find(params[:id])
+    @org_course.destroy
+  end
+end

app/controllers/org_document_comments_controller.rb

@@ -12,7 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
-      #flash[:notice] = 'success'
+      flash.keep[:notice] = l(:notice_successful_create)
       OrgActivity
       redirect_to organization_org_document_comments_path(@organization)
     else
@@ -20,15 +20,23 @@ class OrgDocumentCommentsController < ApplicationController
     end
   end
   def show
-
+    @document = OrgDocumentComment.find(params[:id])
   end
 
   def index
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc")
+    else
+      render_403
+    end
   end
   def update
     @org_document =  OrgDocumentComment.find(params[:id])
     @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    if @org_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
+      act.update_attributes(:updated_at => @org_document.updated_at)
+    end
     respond_to do |format|
       format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)}
     end
@@ -41,12 +49,24 @@ class OrgDocumentCommentsController < ApplicationController
 
   def add_reply
     @document = OrgDocumentComment.find(params[:id]).root
+    @act = OrgActivity.find(params[:id])
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
     @comment.content = params[:org_content]
     @document.children << @comment
     @document.save
   end
 
+  def add_reply_in_doc
+    @document = OrgDocumentComment.find(params[:id]).root
+    @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:org_comment][:org_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+
   def find_organization
     @organization = Organization.find(params[:organization_id])
   end
@@ -59,5 +79,66 @@ class OrgDocumentCommentsController < ApplicationController
         org.home_id == nil
       end
     end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def delete_reply
+    @org_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @org_document_comment.root
+    org = @org_document_comment.organization
+    @org_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
   end
 end

app/controllers/org_member_controller.rb

@@ -16,7 +16,7 @@ class OrgMemberController < ApplicationController
       member_ids = params[:membership][:user_ids]
       role_id = params[:orgRole]
       member_ids.each do |user_id|
-        member =  OrgMember.create(:user_id=>user_id)
+        member =  OrgMember.create(:user_id=>user_id, :created_at => Time.now)
         @org.org_members << member
         OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id)
       end

app/controllers/org_projects_controller.rb

@@ -4,7 +4,6 @@ class OrgProjectsController < ApplicationController
     @project = Project.find(params[:project_id])
     org_ids.each do |org_id|
       OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
-      p 1
     end
     respond_to do |format|
       format.js
@@ -14,18 +13,5 @@ class OrgProjectsController < ApplicationController
     @project = Project.find(params[:project_id])
     @org_project = OrgProject.find(params[:id])
     @org_project.destroy
-
-    condition = '%%'
-    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id)
-    if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10)
-      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
-    else
-      project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10)
-      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
-    end
-    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
-    @orgs_page = Paginator.new @org_count, 10,1
   end
 end

app/controllers/organizations_controller.rb

@@ -55,22 +55,38 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
-      @org_activities  = OrgActivity.where('container_id =? and container_type =? ',
-                                       @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10)
-      @org_activities_count  = OrgActivity.where('container_id =? and container_type =? ',
-                                           @organization.id, 'Organization ').order('updated_at desc').count
       project_ids = @organization.projects.map(&:id) << 0
-      @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page]  || 1).per(10)
-      @org_project_activties_count =  ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
-      #@org_activities = paginateHelper @org_activities, 10
-      @page = params[:page]
-    else
-      render_403
+      course_ids = @organization.courses.map(&:id) << 0
+      course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+      case params[:type]
+        when nil
+          @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
+                                             "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                             "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+                                             @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_issue'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_message'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'org'
+          @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_homework'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_news'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_message'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_poll'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
       end
+      @page = params[:page]
       respond_to do |format|
         format.html
         format.js
       end
+    else
+      render_403
+    end
   end
 
   def update
@@ -135,13 +151,26 @@ class OrganizationsController < ApplicationController
   end
 
   def members
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @members = OrgMember.where("organization_id =?", @organization.id)
+    else
+      render_403
+    end
   end
 
   def  more_org_projects
     @organization = Organization.find params[:id]
     @page = params[:page]
-    @org_projects = @organization.org_projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def more_org_courses
+    @organization = Organization.find(params[:id])
+    @page = params[:page]
+    @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5)
     respond_to do |format|
       format.js
     end

app/controllers/projects_controller.rb

@@ -86,6 +86,7 @@ class ProjectsController < ApplicationController
     end
    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @no_roll_hint = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json
     respond_to do |format|
       format.js

app/controllers/repositories_controller.rb

@@ -42,7 +42,7 @@ class RepositoriesController < ApplicationController
   include RepositoriesHelper
   helper :project_score
   #@root_path = RepositoriesHelper::ROOT_PATH
-
+  $g=Gitlab.client
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
@@ -315,14 +315,34 @@ update
       #Modified by young
       #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
-      count = 0
-      (0..100).each do |page|
-        if g.commits(@project.gpid,:page => page).count == 0
-          break
+
+      # count = 0
+      # (0..100).each do |page|
+      #   if g.commits(@project.gpid,:page => page).count == 0
+      #     break
+      #   else
+      #     count = count + g.commits(@project.gpid,:page => page).count
+      #   end
+      # end
+
+
+      #add by hx
+      if g.commits(@project.gpid , :page=>25).count==0
+        count = count_commits(@project.gpid , 0 , 25)
+      elsif g.commits(@project.gpid , :page=>50).count ==0
+        count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
+      elsif g.commits(@project.gpid , :page=>75).count ==0
+        count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
+      elsif g.commits(@project.gpid , :page=>100).count== 0
+        count = count_commits(@project.gpid , 75 , 100) + 75 * 20
+      elsif g.commits(@project.gpid , :page=>125).count==0
+        count = count_commits(@project.gpid , 100 , 125) + 100 * 20
+      elsif g.commits(@project.gpid , :page=>150).count==0
+        count = count_commits(@project.gpid , 125 , 150) + 125 * 20
       else
-          count = count + g.commits(@project.gpid,:page => page).count
-        end
+        count = count_commits(@project.gpid , 150 ,200) + 150 * 20
       end
+
       @changesets = g.commits(@project.gpid)
       # @changesets = @repository.latest_changesets(@path, @rev)
       # @changesets_count = @repository.latest_changesets(@path, @rev).count
@@ -349,33 +369,27 @@ update
 
   alias_method :browse, :show
 
-
-  #add by houxiang
-
-  def get_commits(id)
-    g = Gitlab.client
-    tmp_commit_count = g.commits(id,page:0).count
-    commit_count = 0
-    i=0
-    while tmp_commit_count!=0
-      commit_count = commit_count+tmp_commit_count
-      i=i+1
-      tmp_commit_count = g.commits(id,page:i).count
+  #add by hx
+  def count_commits(project_id , left , right)
+    count = 0
+    (left..right).each do |page|
+      if $g.commits(project_id,:page => page).count == 0
+        break
+      else
+        count = count + $g.commits(project_id,:page => page).count
       end
-
-    return  commit_count
-
     end
-
+    return count
+  end
 
   def changes
     @entry = @repository.entry(@path, @rev)
     (show_error_not_found; return) unless @entry
     g = Gitlab.client
     limit = 20
-
-
+    #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
     @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+    #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
     @commits_count = params[:commit_count].to_i
     @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]
 
@@ -387,6 +401,7 @@ update
     render :layout => 'base_projects'
   end
 
+
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new @changeset_count,

app/controllers/student_work_controller.rb

@@ -167,6 +167,18 @@ class StudentWorkController < ApplicationController
   end
 
   def create
+    # 提交作品前先判断是否已经提交
+    @has_commit = false;
+    if hsd_committed_work?(User.current.id, @homework.id)
+      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+      @has_commit = true;
+      #flash[:notice] = l(:notice_successful_create)
+      #redirect_to edit_student_work_url(params[:student_work])
+      respond_to do |format|
+        format.js
+      end
+      return
+    end
     if params[:student_work]
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
@@ -499,6 +511,12 @@ class StudentWorkController < ApplicationController
   end
 
   private
+  def hsd_committed_work?(user, homework)
+    sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
+    sw.nil? ? result = false : result = true
+    result
+  end
+
   #获取作业
   def find_homework
     @homework = HomeworkCommon.find params[:homework]

app/controllers/users_controller.rb

@@ -1918,6 +1918,20 @@ class UsersController < ApplicationController
     end
   end
 
+  def search_user_orgs
+    name=""
+    if !params[:search_orgs].nil?
+      name = params[:search_orgs].strip
+    end
+    name = "%"+name+"%"
+    @orgs = User.current.organizations.where("name like ?", name)
+    @user = User.current
+    respond_to do |format|
+      format.html {render :layout => 'static_base'}
+      format.js
+    end
+  end
+
   private
 
   def find_user

app/helpers/application_helper.rb

@@ -2374,8 +2374,10 @@ module ApplicationHelper
         link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
-        if work.nil?
+        if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
           link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+        elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
+          link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"

app/helpers/exercise_helper.rb

@@ -0,0 +1,139 @@
+# encoding: utf-8
+module ExerciseHelper
+
+  # 单选
+  def sigle_selection_standard_answer(params)
+    size = params.ord - 96
+    if size > 0 # 小写字母答案
+      answer = params.ord - 96
+    else
+      answer = params.ord - 64
+    end
+  end
+
+  # 多选
+  def multiselect_standard_answer(params)
+    size = params.ord - 96
+    answer = []
+    if size > 0 # 小写字母答案
+      for i in 0..(params.length-1)
+        answer << (params[i].ord - 96).to_s
+      end
+    else
+      for i in 0..(params.length-1)
+        answer << (params[i].ord - 64)
+      end
+    end
+    answer = answer.sort
+    answer.join("")
+  end
+
+  #
+  def fill_standart_answer(params, standart_answer)
+    params.each do |param|
+      standart_answer.answer_text = param.value
+      standart_answer.save
+    end
+  end
+
+  # 获取多选的得分
+  def get_mulscore(question, user)
+    ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id)
+    arr = []
+    ecs.each do |ec|
+      arr << ec.exercise_choice.choice_position
+    end
+    arr.sort
+    arr = arr.join("")
+  end
+
+  # 判断用户是否已经提交了问卷
+  # status 为0的时候是用户点击试卷。为1表示用户已经提交
+  def has_commit_exercise?(exercise_id, user_id)
+    pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, true)
+    if pu.empty?
+      false
+    else
+      true
+    end
+  end
+
+  # 判断学生是否点击过问卷，点击则为他保存一个记录，记录start_at
+  def has_click_exercise?(exercise_id, user_id)
+    pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, false)
+    if pu.empty?
+      false
+    else
+      true
+    end
+  end
+
+  def convert_to_char(str)
+    result = ""
+    length = str.length
+    unless str.nil?
+      if length === 1
+        result += (str.to_i + 64).chr
+        return result
+      elsif length > 1
+        for i in 0...length
+          result += (str[i].to_i + 64).chr
+        end
+        return result
+      end
+    end
+    return result
+  end
+
+  def get_current_score exercise
+    score = 0
+    unless exercise.nil?
+      exercise.exercise_questions.each do |exercise_question|
+        unless exercise_question.question_score.nil?
+          score += exercise_question.question_score
+        end
+      end
+      return score
+    end
+    return score
+  end
+
+  def answer_be_selected?(answer,user)
+    pv = answer.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id} ")
+    if !pv.nil? && pv.count > 0
+      true
+    else
+      false
+    end
+  end
+
+  #获取文本题答案
+  def get_anwser_vote_text(question_id,user_id)
+    pv = ExerciseAnswer.find_by_exercise_question_id_and_user_id(question_id,user_id)
+    if pv.nil?
+      ''
+    else
+      pv.answer_text
+    end
+  end
+
+  # 获取当前学生回答问题的答案
+  def get_user_answer(question,user)
+    user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}")
+    user_answer
+  end
+
+  # 获取问题的标准答案
+  def get_user_standard_answer(question,user)
+    if question.question_type == 3
+      standard_answer =[]
+      question.exercise_standard_answers.each do |answer|
+        standard_answer << answer.answer_text
+      end
+    else
+      standard_answer = question.exercise_standard_answers
+    end
+    standard_answer
+  end
+
+end

app/helpers/org_courses_helper.rb

@@ -0,0 +1,2 @@
+module OrgCoursesHelper
+end

app/models/course.rb

@@ -18,6 +18,8 @@ class Course < ActiveRecord::Base
            :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
+  has_many :org_courses
+  has_many :organizations, :through => :org_courses
   # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   # has_many :homework_for_courses, :dependent => :destroy
@@ -39,6 +41,7 @@ class Course < ActiveRecord::Base
   has_many :course_activities
   # 课程消息
   has_many :course_messages,  :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :exercises, :dependent => :destroy
 
   acts_as_taggable
   acts_as_nested_set :order => 'name', :dependent => :destroy

app/models/course_activity.rb

@@ -5,8 +5,8 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity
-  before_destroy :destroy_user_activity
+  after_save :add_user_activity, :add_course_activity
+  before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
   def add_user_activity
@@ -30,8 +30,34 @@ class CourseActivity < ActiveRecord::Base
     end
   end
 
+  def add_course_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'").first
+    if org_activity
+      org_activity.save
+    else
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.course_act.parent.id}").first
+        org_activity.created_at = self.created_at
+        org_activity.save
+      else
+        OrgActivity.create(:user_id => self.user_id,
+                       :org_act_id => self.course_act_id,
+                       :org_act_type => self.course_act_type,
+                       :container_id => self.course_id,
+                       :container_type => 'Course',
+                       :created_at => self.created_at,
+                       :updated_at => self.updated_at)
+        end
+      end
+  end
+
   def destroy_user_activity
     user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'")
     user_activity.destroy_all
   end
+
+  def destroy_org_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'")
+    org_activity.destroy_all
+  end
 end

app/models/exercise.rb

@@ -0,0 +1,8 @@
+class Exercise < ActiveRecord::Base
+  #exercise_status: 1,新建；2，发布；3，关闭
+  include Redmine::SafeAttributes
+  belongs_to :user
+  has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number"
+  has_many :exercise_users, :dependent => :destroy
+  has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过
+end

app/models/exercise_answer.rb

@@ -0,0 +1,8 @@
+class ExerciseAnswer < ActiveRecord::Base
+  #学生答题
+  include Redmine::SafeAttributes
+
+  belongs_to :user
+  belongs_to :exercise_question
+  belongs_to :exercise_choice
+end

app/models/exercise_choice.rb

@@ -0,0 +1,7 @@
+class ExerciseChoice < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
+  belongs_to :exercise_question
+  has_many :exercise_answers, :dependent => :destroy
+  has_many :exercise_standard_answers, :dependent => :destroy
+end

app/models/exercise_question.rb

@@ -0,0 +1,8 @@
+class ExerciseQuestion < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
+  belongs_to :exercise
+  has_many :exercise_choices, :order => "#{ExerciseChoice.table_name}.choice_position",:dependent => :destroy
+  has_many :exercise_answers, :dependent => :destroy
+  has_many :exercise_standard_answers, :dependent => :destroy
+end