Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Conflicts:
	public/stylesheets/css/project.css

app/api/mobile/entities/activity.rb

@@ -109,6 +109,28 @@ module Mobile
                         "项目"
                     end
                   end
+                when :homework_commit_count
+                  if ac.act_type == "HomeworkCommon"
+                    ac.act.student_works.has_committed.count
+                  end
+                when :last_commit_info
+                  if ac.act_type == "HomeworkCommon"
+                    if ac.act.student_works.has_committed.count > 0
+                      lc = ac.act.student_works.has_committed.reorder("commit_time desc").first
+                      {:lasttime=>time_from_now(lc.commit_time), :lastname=>lc.user.show_name}
+                    end
+                  end
+                when :last_score_info
+                  if ac.act_type == "HomeworkCommon"
+                    if ac.act.student_works.has_committed.count > 0
+                      sw_id = "("+ac.act.student_works.map{|sw| sw.id}.join(",")+")"
+                      student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc")
+                      unless student_work_scores.empty?
+                        last_score = student_work_scores.first
+                        {:lasttime=>time_from_now(last_score.created_at), :lastname=>last_score.user.show_name}
+                      end
+                    end
+                  end
               end
             end
           end
@@ -153,6 +175,10 @@ module Mobile
       act_expose :course_project_name    #课程/项目名字
       act_expose :syllabus_title    #课程名字
       act_expose :activity_type_name     #课程问答区/项目缺陷等
+      act_expose :homework_commit_count  #作品提交数
+      act_expose :last_commit_info  #最近提交信息
+      act_expose :last_score_info  #最近评阅信息
+
       expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
         if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue"
           has_praise = false

app/api/mobile/entities/whomework.rb

@@ -38,6 +38,22 @@ module Mobile
                   wh.id
                 when :title
                   wh.name
+                when :homework_commit_count
+                  wh.student_works.has_committed.count
+                when :last_commit_info
+                    if wh.student_works.has_committed.count > 0
+                      lc = wh.student_works.has_committed.reorder("commit_time desc").first
+                      {:lasttime=>time_from_now(lc.commit_time), :lastname=>lc.user.show_name}
+                    end
+                when :last_score_info
+                    if wh.student_works.has_committed.count > 0
+                      sw_id = "("+wh.student_works.map{|sw| sw.id}.join(",")+")"
+                      student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc")
+                      unless student_work_scores.empty?
+                        last_score = student_work_scores.first
+                        {:lasttime=>time_from_now(last_score.created_at), :lastname=>last_score.user.show_name}
+                      end
+                    end
               end
             end
           end
@@ -74,6 +90,9 @@ module Mobile
       whomework_expose :evaluation_end
       whomework_expose :praise_count
       whomework_expose :comment_count
+      whomework_expose :homework_commit_count  #作品提交数
+      whomework_expose :last_commit_info  #最近提交信息
+      whomework_expose :last_score_info  #最近评阅信息
       expose :all_children, using: Mobile::Entities::Jours  do |f, opt|
         #f[:journals_for_messages] if f.is_a?(Hash) && f.key?(:journals_for_messages)
         if f.is_a?(::HomeworkCommon)

app/assets/javascripts/syllabus_member.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/syllabus_member.css.scss

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

app/controllers/homework_common_controller.rb

@@ -58,10 +58,9 @@ class HomeworkCommonController < ApplicationController
 
   def edit
     @user = User.current
-    @is_in_course = params[:is_in_course]
+    @hw_status = params[:hw_status].to_i
     @is_manage = params[:is_manage]
-    @course_activity = params[:course_activity].to_i
-    if @is_in_course.to_i == 1 || @course_activity == 1
+    if @hw_status != 1
       @left_nav_type = 3
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
@@ -160,18 +159,19 @@ class HomeworkCommonController < ApplicationController
           create_works_list @homework
         end
 
+        @hw_status = params[:hw_status].to_i
         if params[:is_manage] == "1"
           redirect_to manage_or_receive_homeworks_user_path(User.current.id)
         elsif params[:is_manage] == "2"
           redirect_to my_homeworks_user_path(User.current.id)
-        elsif params[:is_in_course] == "1"
-          redirect_to homework_common_index_path(:course => @course.id)
-        elsif params[:is_in_course] == "0"
-          redirect_to user_homeworks_user_path(User.current.id)
-        elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+        elsif @hw_status == 1
           redirect_to user_path(User.current.id)
-        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+        elsif @hw_status == 2
           redirect_to course_path(@course.id)
+        elsif @hw_status == 5
+          redirect_to student_work_index_url(:homework => @homework.id)
+        else
+          redirect_to homework_common_index_path(:course => @course.id)
         end
       end
     end
@@ -181,14 +181,13 @@ class HomeworkCommonController < ApplicationController
     if @homework.destroy
       respond_to do |format|
         format.html {
-          if params[:is_in_course] == "1"
-            redirect_to homework_common_index_path(:course => @course.id)
-          elsif params[:is_in_course] == "0"
-            redirect_to user_homeworks_user_path(User.current.id)
-          elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
-            redirect_to user_path(User.current.id)
-          elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
-            redirect_to course_path(@course.id)
+          @hw_status = params[:hw_status].to_i
+          if @hw_status == 1
+          redirect_to user_path(User.current.id)
+          elsif @hw_status == 2
+          redirect_to course_path(@course.id)
+          else
+          redirect_to homework_common_index_path(:course => @course.id)
           end
         }
       end
@@ -246,8 +245,8 @@ class HomeworkCommonController < ApplicationController
       @statue = 3
     end
     @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
+    @is_teacher = User.current.admin? || User.current.allowed_to?(:as_teacher, @course)
   end
 
   #关闭匿评
@@ -265,8 +264,8 @@ class HomeworkCommonController < ApplicationController
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
     @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
+    @is_teacher = User.current.admin? || User.current.allowed_to?(:as_teacher, @course)
     respond_to do |format|
       format.js
     end
@@ -294,8 +293,7 @@ class HomeworkCommonController < ApplicationController
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -307,8 +305,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -321,8 +318,8 @@ class HomeworkCommonController < ApplicationController
       @homework.update_column('is_open', 0)
     end
     @user_activity_id = params[:user_activity_id]
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
+    @hw_status = params[:hw_status].to_i
+    @is_teacher = User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
   end
 
   def alert_open_student_works
@@ -331,8 +328,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -363,8 +359,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
   end
 
   #设置匿评参数
@@ -381,8 +376,8 @@ class HomeworkCommonController < ApplicationController
       @homework_detail_manual.evaluation_num = params[:evaluation_num]
       @homework_detail_manual.save
       @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course].to_i
-      @course_activity = params[:course_activity].to_i
+      @hw_status = params[:hw_status].to_i
+      @is_teacher = User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
     end
   end
 
@@ -393,8 +388,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
   end
 
   private

app/controllers/messages_controller.rb

@@ -38,47 +38,45 @@ class MessagesController < ApplicationController
   # Show a topic and its replies
   def show
     @isReply = true
-    page = params[:page]
-    # Find the page of the requested reply
-    if params[:r] && page.nil?
-      offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
-      page = 1 + offset / REPLIES_PER_PAGE
-    end
+    # page = params[:page]
+    # # Find the page of the requested reply
+    # if params[:r] && page.nil?
+    #   offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
+    #   page = 1 + offset / REPLIES_PER_PAGE
+    # end
     all_comments = []
-    @reply_count = get_all_children(all_comments, @topic).count
+    @replies = get_all_children(all_comments, @topic)
+    @reply_count = @replies.count
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
-      messages_replies =  @topic.children.
-          includes(:author, :attachments, {:board => :project}).
-          reorder("#{Message.table_name}.created_on DESC").
+      #@replies =  @topic.children.
+          #includes(:author, :attachments, :praise_tread_cache, {:board => :project}).
+          #reorder("#{Message.table_name}.created_on DESC").
           #limit(@reply_pages.per_page).
           #offset(@reply_pages.offset).
-          all
-      @replies = paginateHelper messages_replies,10
-      @reply = Message.new(:subject => "RE: #{@message.subject}")
+          #all
+      #@replies = paginateHelper messages_replies,10
       @left_nav_type = 2
       render :action => "show", :layout => "base_courses"#by young
     elsif @project
-      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
-      @replies =  @topic.children.
-          includes(:author, :attachments, {:board => :project}).
-          reorder("#{Message.table_name}.created_on DESC").
-          limit(@reply_pages.per_page).
-          offset(@reply_pages.offset).
-          all
+      #@reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      # @replies =  @topic.children.
+      #     includes(:author, :attachments, {:board => :project}).
+      #     reorder("#{Message.table_name}.created_on DESC").
+      #     limit(@reply_pages.per_page).
+      #     offset(@reply_pages.offset).
+      #     all
 
-      @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_projects"#by young
     else
-      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
-      @replies =  @topic.children.
-          includes(:author, :attachments, {:board => :project}).
-          reorder("#{Message.table_name}.created_on DESC").
-          limit(@reply_pages.per_page).
-          offset(@reply_pages.offset).
-          all
+      # @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      # @replies =  @topic.children.
+      #     includes(:author, :attachments, {:board => :project}).
+      #     reorder("#{Message.table_name}.created_on DESC").
+      #     limit(@reply_pages.per_page).
+      #     offset(@reply_pages.offset).
+      #     all
 
-      @reply = Message.new(:subject => "RE: #{@message.subject}")
       @organization = @org_subfield.organization
       render :action => "show", :layout => "base_org"#by young
     end

app/controllers/student_work_controller.rb

@@ -521,6 +521,7 @@ class StudentWorkController < ApplicationController
     # 消息传过来的ID
     @message_student_work_id = params[:student_work_id]
     @left_nav_type = 3
+    @tab = params[:tab].to_i
     respond_to do |format|
       format.js
       format.html
@@ -1012,8 +1013,7 @@ class StudentWorkController < ApplicationController
       redirect_to student_work_index_url(:homework => @homework.id)
     else
       @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course].to_i
-      @course_activity = params[:course_activity].to_i
+      @hw_status = params[:hw_status].to_i
       respond_to do |format|
         format.js
       end
@@ -1035,8 +1035,7 @@ class StudentWorkController < ApplicationController
       student_work.save
     end
     @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
   end
 
   def revise_attachment
@@ -1058,8 +1057,7 @@ class StudentWorkController < ApplicationController
 
   def new_student_work_project
     @user_activity_id = params[:user_activity_id].to_i
-    @is_in_course = params[:is_in_course].to_i
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -1078,8 +1076,8 @@ class StudentWorkController < ApplicationController
     @project.is_leader = 1
     if @project.save
       @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course].to_i
-      @course_activity = params[:course_activity].to_i
+      @hw_status = params[:hw_status].to_i
+      @is_teacher = User.current.allowed_to?(:as_teacher,@homework.course) || User.current.admin?
       respond_to do |format|
         format.js
       end
@@ -1129,8 +1127,8 @@ class StudentWorkController < ApplicationController
     relate_pro = StudentWorkProject.where("user_id = #{User.current.id} and homework_common_id = #{@homework.id}").first
     if relate_pro.destroy
       @user_activity_id = params[:user_activity_id].to_i
-      @is_in_course = params[:is_in_course].to_i
-      @course_activity = params[:course_activity].to_i
+      @hw_status = params[:hw_status].to_i
+      @is_teacher = User.current.allowed_to?(:as_teacher,@homework.course) || User.current.admin?
       respond_to do |format|
         format.js
       end

app/controllers/syllabus_member_controller.rb

@@ -0,0 +1,64 @@
+class SyllabusMemberController < ApplicationController
+
+  def syl_member_autocomplete
+    @syllabus = Syllabus.find(params[:syllabus])
+    @flag = params[:flag] || false
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def create
+    @syllabus = Syllabus.find(params[:syllabus])
+    if params[:membership].nil?
+      @fail_hint = l(:label_blank_user_lists_for_org)
+    else
+      member_ids = params[:membership][:user_ids]
+      last_rank = @syllabus.syllabus_members.order("rank asc").last.rank
+      user_ids = @syllabus.syllabus_members.map{|sy| sy.user_id}
+      member_ids.each_with_index do |user_id, i|
+        unless user_ids.include?(user_id.to_i)
+          member =  SyllabusMember.create(:user_id => user_id, :rank => last_rank + 1 + i)
+          @syllabus.syllabus_members << member
+        end
+      end
+      @members = @syllabus.syllabus_members.order("rank asc")
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    member = SyllabusMember.find(params[:id])
+    @syllabus = member.syllabus
+    after_syl_members = @syllabus.syllabus_members.where("rank > #{member.rank}")
+    after_syl_members.update_all("rank = rank - 1")
+    member.destroy
+    @members = @syllabus.syllabus_members.order("rank asc")
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def update_rank
+    member = SyllabusMember.find(params[:id])
+    @syllabus = member.syllabus
+    members = @syllabus.syllabus_members
+    if params[:opr] == 'up' && member.rank > 2
+      before_mem = members.where("rank = #{member.rank - 1}").first
+      if before_mem && member.update_attribute('rank', member.rank - 1)
+        before_mem.update_attribute('rank', before_mem.rank + 1)
+      end
+    elsif params[:opr] == 'down' && member.rank > 1 && member.rank < members.count
+      after_mem = members.where("rank = #{member.rank + 1}").first
+      if after_mem && member.update_attribute('rank', member.rank + 1)
+        after_mem.update_attribute('rank', after_mem.rank - 1)
+      end
+    end
+    @members = @syllabus.syllabus_members.order("rank asc")
+    respond_to do |format|
+      format.js
+    end
+  end
+end

app/controllers/syllabuses_controller.rb

@@ -6,7 +6,7 @@ class SyllabusesController < ApplicationController
   include CoursesHelper
 
   before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy, :delete_syllabus]
-  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :edit_syllabus_title, :update_base_info, :delete_syllabus, :delete_des]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :edit_syllabus_title, :update_base_info, :delete_syllabus, :delete_des, :members]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -170,6 +170,15 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  def members
+    @members = @syllabus.syllabus_members.includes(:user => {:user_extensions => [], :courses => []}).order("rank asc")
+    @show = params[:show] ? params[:show].to_i : 0
+    respond_to do |format|
+      format.js
+      format.html{render :layout => 'base_syllabus'}
+    end
+  end
+
   private
   def find_syllabus
     @syllabus = Syllabus.find params[:id]

app/controllers/users_controller.rb

@@ -115,8 +115,7 @@ class UsersController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course].to_i
-        @course_activity = params[:course_activity].to_i
+        @hw_status = params[:hw_status].to_i
       when 'JournalsForMessage'
         @reply = JournalsForMessage.find params[:reply_id]
         @user_activity_id = params[:user_activity_id]
@@ -1123,11 +1122,8 @@ class UsersController < ApplicationController
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
             quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
           end
-          if params[:is_in_course] == "1"
-            redirect_to homework_common_index_path(:course => homework.course_id)
-          else
-            redirect_to user_homeworks_user_path(User.current.id)
-          end
+
+          redirect_to homework_common_index_path(:course => homework.course_id)
         end
       end
     else
@@ -3573,8 +3569,7 @@ class UsersController < ApplicationController
           obj = HomeworkCommon.where('id = ?', params[:id].to_i).first
           @type = 'HomeworkCommon'
           @journals = obj.journals_for_messages.reorder("created_on desc")
-          @is_in_course = params[:is_in_course].to_i if params[:is_in_course]
-          @course_activity = params[:course_activity].to_i if params[:course_activity]
+          @hw_status = params[:hw_status].to_i if params[:hw_status]
           @is_teacher = User.current.allowed_to?(:as_teacher,obj.course)
           @user_activity_id = params[:user_activity_id].to_i if params[:user_activity_id]
       end

app/controllers/words_controller.rb

@@ -110,8 +110,8 @@ class WordsController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course].to_i
-        @course_activity = params[:course_activity].to_i
+        @hw_status = params[:hw_status].to_i
+        @is_teacher = User.current.allowed_to?(:as_teacher, @homework.course) || User.current.admin?
       elsif @journal_destroyed.jour_type == 'Syllabus'
         @syllabus = Syllabus.find @journal_destroyed.jour_id
         @count = @syllabus.journals_for_messages.count
@@ -308,10 +308,9 @@ class WordsController < ApplicationController
           update_org_activity(@homework_common.class,@homework_common.id)
           respond_to do |format|
             format.js{
-              @user_activity_id = params[:user_activity_id]
-              @is_in_course = params[:is_in_course]
-              @course_activity = params[:course_activity]
-              @homework_common_id = params[:homework_common_id]
+              @user_activity_id = params[:user_activity_id].to_i
+              @hw_status = params[:hw_status].to_i
+              @is_teacher = User.current.allowed_to?(:as_teacher, @homework_common.course) || User.current.admin?
             }
           end
         else
@@ -344,8 +343,8 @@ class WordsController < ApplicationController
           respond_to do |format|
             format.js{
               @user_activity_id = params[:user_activity_id].to_i
-              @is_in_course = params[:is_in_course].to_i
-              @course_activity = params[:course_activity].to_i
+              @hw_status = params[:hw_status].to_i
+              @is_teacher = User.current.allowed_to?(:as_teacher, @homework_common.course) || User.current.admin?
             }
           end
         else

app/helpers/application_helper.rb

@@ -2750,15 +2750,15 @@ module ApplicationHelper
   end
 
   #获取匿评相关连接代码
-  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
+  def homework_anonymous_comment (homework, hw_status, user_activity_id = -1)
     if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.has_committed.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
-        link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+        link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?hw_status=" + hw_status.to_s + "&user_activity_id=" + user_activity_id.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?hw_status=" + hw_status.to_s + "&user_activity_id=" + user_activity_id.to_s, id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
@@ -2806,7 +2806,7 @@ module ApplicationHelper
     count = homework.student_works.has_committed.count
     if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
-        link_to "作品(#{count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
+        link_to "作品(#{count})", student_work_index_url_in_org(homework.id, 2), :class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         project = cur_user_projects_for_homework homework
@@ -2824,20 +2824,20 @@ module ApplicationHelper
           end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 && StudentWorksEvaluationDistribution.where("student_work_id = #{work.id}").count > 0 #匿评作业，且作业状态不是在开启匿评之前
-            link_to "作品匿评", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+            link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
             link_to "修改作品(#{count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
             link_to "修改作品(#{count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
           else
-            link_to "查看作品(#{count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
+            link_to "查看作品(#{count})", student_work_index_url_in_org(homework.id, 2), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
     else
-      link_to "作品(#{count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
+      link_to "作品(#{count})",student_work_index_url_in_org(homework.id, 2),:class => "c_blue"
     end
   end
 
@@ -2860,15 +2860,15 @@ module ApplicationHelper
         end
       else
         if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品匿评", student_work_index_url_in_org(homework.id), :class => 'hw_btn_green2 fr mt5', :title => "开启匿评后不可修改作品", :target => '_blank'
+          link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "开启匿评后不可修改作品", :target => '_blank'
         elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-          link_to "查看作品",student_work_index_url_in_org(homework.id), :class => 'hw_btn_green2 fr mt5', :title => "匿评已结束", :target => '_blank'
+          link_to "查看作品",student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "匿评已结束", :target => '_blank'
         elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
           link_to "修改作品", new_student_work_url_without_domain(homework.id),:class => 'hw_btn_green2 fr mt5', :target => '_blank'
         elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
           link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'hw_btn_green2 fr mt5', :target => '_blank'
         else
-          link_to "查看作品", student_work_index_url_in_org(homework.id), :class => 'hw_btn_green2 fr mt5', :title => "作业截止后不可修改作品", :target => '_blank'
+          link_to "查看作品", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "作业截止后不可修改作品", :target => '_blank'
         end
       end
     end
@@ -3197,13 +3197,13 @@ def homework_common_index_url_in_org(course_id)
   Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s
 end
 
-def student_work_index_url_in_org(homework_id, is_focus = '', show_work_id = '')
+def student_work_index_url_in_org(homework_id, tab = 1, is_focus = '', show_work_id = '')
   if is_focus != ''
-    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&tab=" + tab.to_s + "&is_focus=" + is_focus.to_s
   elsif show_work_id != ''
-    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&show_work_id=" + show_work_id.to_s
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&tab=" + tab.to_s + "&show_work_id=" + show_work_id.to_s
   else
-    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&tab=" + tab.to_s
   end
 end
 
@@ -3307,7 +3307,12 @@ end
 
 #获取所有子节点
 def get_all_children result, jour
-  if (jour.kind_of? JournalsForMessage) || (jour.kind_of? Message) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment)
+  if jour.kind_of? Message
+    jour.children.includes(:author, :praise_tread_cache).each do |jour_child|
+      result << jour_child
+      get_all_children result, jour_child
+    end
+  elsif (jour.kind_of? JournalsForMessage) || (jour.kind_of? BlogComment) || (jour.kind_of? OrgDocumentComment)
     jour.children.each do |jour_child|
       result << jour_child
       get_all_children result, jour_child

app/helpers/homework_common_helper.rb

@@ -57,12 +57,12 @@ module HomeworkCommonHelper
   end
 
   #根据传入作业确定跳转到开启匿评还是关闭匿评功能
-  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity
+  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,hw_status
     link = ""
     if homework_detail_manual.comment_status == 1
-      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
+      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status
     elsif homework_detail_manual.comment_status == 2
-      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
+      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status
     end
     link
   end

app/helpers/syllabus_member_helper.rb

@@ -0,0 +1,17 @@
+module SyllabusMemberHelper
+  include ApplicationHelper
+
+  def find_user_not_in_current_syllabus_by_name syllabus
+    if params[:q] && params[:q].lstrip.rstrip != ""
+      scope = Principal.active.sorted.not_member_of_syllabus(syllabus).like(params[:q])
+    else
+      scope = []
+    end
+    principals = paginateHelper scope,10
+    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals', :class => 'sy_new_tchlist')
+    links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
+      link_to text,  host_with_protocol + "/syllabus_member/syl_member_autocomplete?" + parameters.merge(:q => params[:q],:flag => true,:syllabus=> syllabus, :format => 'js').to_query, :remote => true
+    }
+    s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "syllabus_member_pagination_links" )
+  end
+end

app/helpers/syllabuses_helper.rb

@@ -4,6 +4,20 @@ module SyllabusesHelper
     Syllabus.tagged_with(tag_name).order('updated_at desc')
   end
 
+  def find_user_not_in_current_syllabus_by_name syllabus
+    if params[:q] && params[:q].lstrip.rstrip != ""
+      scope = Principal.active.sorted.not_member_of_syllabus(syllabus).like(params[:q])
+    else
+      scope = []
+    end
+    principals = paginateHelper scope,10
+    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals', :class => 'sy_new_tchlist')
+    links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
+      link_to text,  host_with_protocol + "/syllabus_member/syl_member_autocomplete?" + parameters.merge(:q => params[:q],:flag => true,:syllabus=> syllabus, :format => 'js').to_query, :remote => true
+    }
+    s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "syllabus_member_pagination_links" )
+  end
+
   def teacher_count syllabus
     count = 0
     courses = syllabus.courses

app/models/blog_comment.rb

@@ -12,6 +12,8 @@ class BlogComment < ActiveRecord::Base
   belongs_to :last_reply, :class_name => 'BlogComment', :foreign_key => 'last_comment_id'
   # 虚拟关联
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   acts_as_watchable
 
   validates_presence_of  :title, :content

app/models/comment.rb

@@ -27,6 +27,8 @@ class Comment < ActiveRecord::Base
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
   has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
   #end
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   acts_as_event :datetime => :updated_on,
                 :description => :comments,
                 :type => 'news',

app/models/contest.rb

@@ -13,6 +13,7 @@ class Contest < ActiveRecord::Base
   has_many :join_in_competitions, foreign_key: 'competition_id', :dependent => :destroy
   has_many :join_in_contests, class_name: 'JoinInCompetition', foreign_key: 'competition_id', :dependent => :destroy
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   has_many :contestnotifications, :dependent => :destroy, :include => :author
 
 

app/models/homework_common.rb

@@ -19,6 +19,8 @@ class HomeworkCommon < ActiveRecord::Base
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   has_many :apply_homeworks, :dependent => :destroy
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy

app/models/issue.rb

@@ -53,6 +53,7 @@ class Issue < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # end
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   # ForgeMessage虚拟关联(多态)
   has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
 

app/models/journal.rb

@@ -35,6 +35,8 @@ class Journal < ActiveRecord::Base
   # 被ForgeMessage虚拟关联
   has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
   has_many :at_messages, as: :at_message, dependent: :destroy
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   acts_as_attachable
   attr_accessor :indice
   acts_as_tree :counter_cache => :comments_count, :order => "#{Journal.table_name}.created_on ASC"

app/models/journals_for_message.rb

@@ -68,6 +68,8 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   has_many :at_messages, as: :at_message, dependent: :destroy
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
   after_create :act_as_activity, :act_as_course_activity, :act_as_course_message,

app/models/memo.rb

@@ -48,6 +48,8 @@ class Memo < ActiveRecord::Base
 	acts_as_attachable
   has_many :user_score_details,  :class_name => 'UserScoreDetails',:as => :score_changeable_obj
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
+
   # 消息
   has_many :memo_messages, :class_name =>'MemoMessage', :dependent => :destroy
   # end

app/models/message.rb

@@ -26,6 +26,7 @@ class Message < ActiveRecord::Base
   belongs_to :board,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
   # has_many :org_subfield_messages, :dependent => :destroy
   # has_many :org_subfields, :through => :org_subfield_messages
 

app/models/news.rb

@@ -40,6 +40,9 @@ class News < ActiveRecord::Base
   has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
   #end
 
+  has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_one :praise_tread_cache, as: :object, dependent: :destroy
+
   #转发表
   has_many :forwards, :as => :from, :dependent => :destroy