Merge remote-tracking branch 'origin/szzh' into guange_dev

app/controllers/admin_controller.rb

@@ -397,19 +397,10 @@ class AdminController < ApplicationController
 
   #留言列表
   def leave_messages
-    @jour = JournalsForMessage.where("jour_type = 'Principal' or jour_type = 'Course'").reorder('created_on desc')
-    case params[:format]
-      when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 30})
-      else
-        @limit = 30#per_page_option
-    end
-
-    @jour_count = @jour.count
-    @jour_pages = Paginator.new @jour_count, @limit, params['page']
-    @offset ||= @jour_pages.offset
-    @jour = @jour.limit(@limit).offset(@offset).all
-
+    @jour = JournalsForMessage.find_by_sql("SELECT * FROM journals_for_messages AS j1
+    WHERE j1.jour_type IN ('Course','Principal') AND (j1.m_parent_id IS NULL OR (j1.m_parent_id IN (SELECT id FROM journals_for_messages WHERE jour_type IN ('Course','Principal')))) order by created_on desc")
+    @jour = paginateHelper @jour,30
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
@@ -418,21 +409,8 @@ class AdminController < ApplicationController
   #帖子
   def messages_list
     @memo = Memo.reorder("created_at desc")
-
-=begin
-    case params[:format]
-      when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 30})
-      else
-        @limit = 30#per_page_option
-    end
-
-    @memo_count = @memo.count
-    @memo_pages = Paginator.new @memo_count, @limit, params['page']
-    @offset ||= @memo_pages.offset
-    @memo = @memo.limit(@limit).offset(@offset).all
-=end
-
+    @memo = paginateHelper @memo,30
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
@@ -440,29 +418,55 @@ class AdminController < ApplicationController
 
   #课程讨论区的帖子
   def course_messages
-    #@boards=Board.where('course_id is NULL')
-    #@course_ms = Message.reorder('created_on desc')
     @course_ms=Message.joins("join boards on messages.board_id=boards.id where boards.course_id is not NULL").reorder('created_on desc')
+    @course_ms = paginateHelper @course_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #项目讨论区的帖子
   def project_messages
     @project_ms=Message.joins("join boards on messages.board_id=boards.id where boards.project_id != -1").reorder('created_on desc')
+    @project_ms = paginateHelper @project_ms,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #通知
   def notices
     @news = News.where('course_id is not NULL').order('created_on desc')
+    @news = paginateHelper @news,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #最近登录用户列表
   def latest_login_users
-    @user = User.order('last_login_on desc')
+    scope = User.order('last_login_on desc')
+    scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
+    scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
+    @user = scope
+    @user = paginateHelper @user,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
   #作业
   def homework
     @homework = HomeworkCommon.order('end_time desc')
+    @homework = paginateHelper @homework,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
   end
 
 end

app/controllers/words_controller.rb

@@ -70,20 +70,22 @@ class WordsController < ApplicationController
   end
   
   def destroy
-    @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
-    if @journal_destroyed.jour_type == "Bid"
-      @bid = Bid.find(@journal_destroyed.jour_id)
-      @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
-    elsif @journal_destroyed.jour_type == "Course"
-      @course = Course.find @journal_destroyed.jour_id
-      @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
-    elsif @journal_destroyed.jour_type == "Principal"
-      @user = User.find(@journal_destroyed.jour_id)
-      @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
-      @is_user = true
-    end
-    respond_to do |format|
-      format.js
+    @journal_destroyed = JournalsForMessage.find params[:object_id]
+    if @journal_destroyed.destroy
+      if @journal_destroyed.jour_type == "Bid"
+        @bid = Bid.find(@journal_destroyed.jour_id)
+        @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
+      elsif @journal_destroyed.jour_type == "Course"
+        @course = Course.find @journal_destroyed.jour_id
+        @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+      elsif @journal_destroyed.jour_type == "Principal"
+        @user = User.find(@journal_destroyed.jour_id)
+        @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
+        @is_user = true
+      end
+      respond_to do |format|
+        format.js
+      end
     end
   end
 

app/helpers/application_helper.rb

@@ -1852,7 +1852,8 @@ module ApplicationHelper
         candown = true
       elsif attachment.container.class.to_s=="StudentWork"
         candown = true
-
+      elsif attachment.container.class.to_s == "User"
+        candown = (attachment.is_public == 1 || attachment.is_public == true || attachment.author_id == User.current.id)
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
         course = attachment.container.courses.first
         candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)

app/helpers/users_helper.rb

@@ -29,6 +29,29 @@ module UsersHelper
                         ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s)
   end
 
+  def get_resource_type type
+    case type
+      when 'Course'
+        '课程资源'
+      when 'Project'
+        '项目资源'
+      when 'Issue'
+        '缺陷附件'
+      when 'Message'
+        '讨论区附件'
+      when 'Document'
+        '文档附件'
+      when 'News'
+        '通知附件'
+      when 'HomewCommon'
+        '作业附件'
+      when 'StudentWorkScore'
+        '批改附件'
+      when 'Principal'
+        '用户资源'
+    end
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end
@@ -402,6 +425,14 @@ module UsersHelper
     return str.html_safe
   end
 
+  def get_issue_des_update(journal)
+    arr = details_to_strings(journal.details,true)
+    arr << journal.notes
+    str = ''
+    arr.each { |item| str = str+item }
+    return str
+  end
+
   def get_activity_act_showname(activity)
     case activity.act_type
       when "HomeworkCommon"

app/models/comment.rb

@@ -21,6 +21,10 @@ class Comment < ActiveRecord::Base
   has_many_kindeditor_assets :assets, :dependent => :destroy
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
+  # 课程/项目 消息
+  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
   acts_as_event :datetime => :updated_on,
                 :description => :comments,
                 :type => 'news',
@@ -31,7 +35,19 @@ class Comment < ActiveRecord::Base
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :commented, :author, :comments
   safe_attributes 'comments'
-  after_create :send_mail
+  after_create :send_mail, :act_as_system_message
+
+  def act_as_system_message
+    if self.commented.course
+      if self.author_id != self.commented.author_id
+        self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
+      end
+    else  # 项目相关
+      if self.author_id != self.commented.author_id
+        self.forge_messages << ForgeMessage.new(:user_id => self.commented.author_id, :project_id => self.commented.project.id, :viewed => false)
+      end
+    end
+  end
 
   def send_mail
     if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')

app/models/forum.rb

@@ -39,6 +39,7 @@ class Forum < ActiveRecord::Base
     logger.debug "send mail for forum add."
       Mailer.run.forum_add(self) if Setting.notified_events.include?('forum_add')
   end
+
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i

app/models/issue.rb

@@ -83,7 +83,7 @@ class Issue < ActiveRecord::Base
   
   # fq
   after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
-  after_update :be_user_score
+  after_update :be_user_score, :act_as_forge_message_update
   after_destroy :down_user_score
   # after_create :be_user_score
   # end
@@ -150,6 +150,15 @@ class Issue < ActiveRecord::Base
                                               :viewed => false)
     end
   end
+
+  # 更新缺陷
+  def act_as_forge_message_update
+    unless self.author_id == self.assigned_to_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
+                                                 :project_id => self.project_id,
+                                                 :viewed => false)
+    end
+  end
   
   
   # Returns a SQL conditions string used to find all issues visible by the specified user

app/models/journal.rb

@@ -171,9 +171,11 @@ class Journal < ActiveRecord::Base
 
   # 缺陷状态更改，消息提醒
   def act_as_forge_message
-    self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id,
-                                               :project_id => self.issue.project_id,
-                                               :viewed => false)
+    if self.user_id != self.issue.author_id
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id,
+                                              :project_id => self.issue.project_id,
+                                              :viewed => false)
+    end
   end
 
   # 更新用户分数     -by zjc

app/models/journals_for_message.rb

@@ -58,9 +58,12 @@ class JournalsForMessage < ActiveRecord::Base
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
+  # 消息关联
+  has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
+  has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
 
   validates :notes, presence: true, if: :is_homework_jour?
-  after_create :act_as_activity, :act_as_course_activity
+  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message
   after_create :reset_counters!
   after_destroy :reset_counters!
   after_save :be_user_score
@@ -186,4 +189,54 @@ class JournalsForMessage < ActiveRecord::Base
       self.course_acts << CourseActivity.new(:user_id => self.user_id,:course_id => self.jour_id)
     end
   end
+
+  # 课程作品留言消息通知
+  def act_as_course_message
+    if self.jour_type == 'StudentWorksScore'
+      if self.user_id != self.jour.user_id
+        self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false)
+      end
+    end
+  end
+
+  # 用户留言消息通知
+  def act_as_user_feedback_message
+    # 主留言
+    receivers = []
+    if self.reply_id == 0
+      if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
+        receivers << self.jour
+      end
+    else # 留言回复
+      reply_to = User.find(self.reply_id)
+      if self.user_id != self.parent.user_id
+        receivers << reply_to
+        if self.reply_id != self.parent.user_id
+          receivers << self.parent.user
+        end
+      else
+        receivers << reply_to
+      end
+
+      # 添加留言回复人
+      #reply_to = User.find(self.reply_id)
+      #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
+      #  receivers << self.parent.user
+      #  if self.reply_id != self.parent.user_id
+      #    receivers << reply_to
+      #  end
+      #else # 用户自己回复别人的，别人收到消息通知
+      #  if self.user_id != self.reply_id # 过滤掉自己回复自己的
+      #    receivers << reply_to
+      #  end
+      #end
+    end
+    if self.jour_type == 'Principal'
+
+        receivers.each do |r|
+          self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
+        end
+
+    end
+  end
 end

app/models/memo.rb

@@ -16,6 +16,9 @@ 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_many :memo_messages, :class_name =>'MemoMessage', :dependent => :destroy
+  # end
 	belongs_to :last_reply, :class_name => 'Memo', :foreign_key => 'last_reply_id'
 	# acts_as_searchable :column => ['subject', 'content'],
 	# 					#:include => { :forum => :p}
@@ -44,7 +47,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!, :send_mail
+	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!,:delete_kindeditor_assets#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -59,6 +62,32 @@ class Memo < ActiveRecord::Base
       Mailer.run.forum_message_added(self) if Setting.notified_events.include?('forum_message_added')
   end
 
+  # 公共贴吧消息记录
+  # 原则：贴吧创始人；发帖人，wanglingchun（特殊用户）
+  def send_message
+    receivers = []
+    u = User.find(6)
+    receivers << u
+    # 主贴
+    if self.parent_id.nil?
+      if self.author_id != self.forum.creator_id # 发帖人不是吧主
+        receivers << self.forum.creator
+      end
+    else # 回帖
+      # 添加吧主
+      if self.author_id != self.forum.creator_id
+        receivers << self.forum.creator
+      end
+      # 添加发帖人
+      if  self.forum.creator_id != self.parent.author_id
+        receivers << self.parent.author
+      end
+    end
+    receivers.each do |r|
+      self.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => self.forum_id, :memo_id => self.id, :memo_type => "Memo", :viewed => false)
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end

app/models/memo_message.rb

@@ -0,0 +1,11 @@
+class MemoMessage < ActiveRecord::Base
+  attr_accessible :forum_id, :memo_id, :memo_type, :user_id, :viewed
+
+  belongs_to :memo
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :forum_id,presence: true
+  validates :memo_id,presence: true
+  validates :memo_type, presence: true
+end

app/models/message.rb

@@ -35,8 +35,9 @@ class Message < ActiveRecord::Base
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
-  # 课程消息
+  # 课程/项目 消息
   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 :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -73,7 +74,7 @@ class Message < ActiveRecord::Base
   after_update :update_messages_board
   after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
   
-  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_course_message, :send_mail
+  after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -198,58 +199,48 @@ class Message < ActiveRecord::Base
     end
   end
 
-  # 课程讨论区添加消息
+  # 课程讨论区添加消息:
   # 老师发帖所有人都能收到消息
   # 学生发帖，有人回复则给该学生消息，没回复则不给其它人发送消息
   # 帖子被回复的可以收到消息通知
-  def act_as_course_message
+  # 项目讨论区添加消息：
+  # 主贴项目成员都能收到
+  # 回帖：帖子的发布人收到
+  def act_as_system_message
     if self.course
-      if self.parent_id.nil?   #主贴
+      if self.parent_id.nil?   # 主贴
         self.course.members.each do |m|
-          if self.author.allowed_to?(:as_teacher, self.course)   # 老师
-            if m.user_id != self.author_id      # 自己的帖子不给自己发送消息
-              self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-            end
+          if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
         end
       else    # 回帖
-        #if self.author.allowed_to?(:as_teacher, self.course)   # 老师
-          self.course.members.each do |m|
-            if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-              self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-            end
+        self.course.members.each do |m|
+          if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
           end
-        #end
+        end
+      end
+    else  # 项目相关
+      if self.parent_id.nil?   # 主贴
+        self.project.members.each do |m|
+          if  m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
+      else    # 回帖
+        self.project.members.each do |m|
+          if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+          end
+        end
       end
     end
-    #  if self.author.allowed_to?(:as_teacher, self.course)    # 如果发帖人是老师
-    #    self.course.members.each do |m|
-    #      if self.parent_id.nil?     # 主贴
-    #        if m.user_id != self.author_id      # 自己的帖子不给自己发送消息
-    #          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      else   # 回帖只针对主贴发送消息
-    #        if m.user_id ==  Message.find(self.parent_id).author_id
-    #          self.course_messages << CourseMessage.new(:user_id => self.parent_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      end
-    #    end
-    #  else       # 学生只针对主贴回复
-    #    unless self.parent_id.nil?
-    #      self.course.members.each do |m|
-    #        if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
-    #          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-    #        end
-    #      end
-    #    end
-    #  end
-    #end
   end
   
   #更新用户分数     -by zjc
   def be_user_score
     #新建message且无parent的为发帖
-
     if self.parent_id.nil? && !self.board.project.nil?
       UserScore.joint(:post_message, self.author,nil,self, { message_id: self.id })
       update_memo_number(self.author,1)

app/models/news.rb

@@ -23,7 +23,7 @@ class News < ActiveRecord::Base
   #added by nwb
   belongs_to :course
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
+  has_many :comments, :as => :commented, :dependent => :destroy, :order => "created_on"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   # 被ForgeActivity虚拟关联
@@ -31,8 +31,9 @@ class News < ActiveRecord::Base
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
-  # 课程消息
+  # 课程/项目消息关联
   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 :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -54,7 +55,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_course_messge, :add_author_as_watcher, :send_mail
+  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail
 
   after_destroy :delete_kindeditor_assets
 
@@ -133,15 +134,23 @@ class News < ActiveRecord::Base
     end
   end
 
-  #课程通知 消息发送
+  #课程/项目通知 消息发送
   #消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
-  def act_as_course_messge
+  def act_as_system_message
     if self.course
       self.course.members.each do |m|
         if m.user_id != self.author_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
         end
       end
+    else
+      if !self.project.nil?
+        self.project.members.each do |m|
+          if m.user_id != self.author_id
+            self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+          end
+        end
+      end
     end
   end
 

app/models/poll.rb

@@ -13,7 +13,7 @@ class Poll < ActiveRecord::Base
   after_create :act_as_activity, :act_as_course_activity
   # 课程消息
   has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
-  after_create :act_as_activity, :act_as_course_activity, :act_as_course_message
+  after_save :act_as_course_message, :act_as_activity, :act_as_course_activity
 
   acts_as_event :title => Proc.new {|o| "#{l(:label_course_poll)}: #{o.polls_name}" },
                :description => :polls_description,
@@ -46,10 +46,14 @@ class Poll < ActiveRecord::Base
   # 发布问卷，出了发布者外，其他人都能收到消息通知
   def act_as_course_message
     if self.polls_type == "Course"
-      Course.find(self.polls_group_id).members.each do |m|
-        if m.user_id != self.user_id
-          self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.polls_group_id, :viewed => false)
+      if self.polls_status == 2 #问卷是发布状态
+        Course.find(self.polls_group_id).members.each do |m|
+          if m.user_id != self.user_id
+            self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.polls_group_id, :viewed => false)
+          end
         end
+      elsif self.polls_status == 1 #问卷是新建状态
+        self.course_messages.destroy_all
       end
     end
   end

app/models/student_works_score.rb

@@ -5,6 +5,17 @@ class StudentWorksScore < ActiveRecord::Base
   belongs_to :user
   belongs_to :student_work
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
 
   acts_as_attachable
+
+  after_create :act_as_course_message
+
+  # 评阅作品消息提示
+  def act_as_course_message
+    if self.student_work
+      receiver = self.student_work.user
+        self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false)
+    end
+  end
 end

app/models/user.rb

@@ -127,10 +127,11 @@ class User < Principal
   has_many :messages, :foreign_key => 'author_id'
   has_one :user_score, :dependent => :destroy
   has_many :documents # 项目中关联的文档再次与人关联
-# 关联虚拟表
+# 关联消息表
   has_many :forge_messages
   has_many :course_messages
-# end
+  has_many :memo_messages
+  has_many :user_feedback_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@@ -156,7 +157,8 @@ class User < Principal
     nil
   }
   
-
+  acts_as_attachable :view_permission => :view_files,
+                     :delete_permission => :manage_files
   acts_as_customizable
   ############################added by william
   acts_as_taggable 
@@ -255,7 +257,11 @@ class User < Principal
 
   # 新消息统计
   def count_new_message
-     count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    course_count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
   end
   # 查询指派给我的缺陷记录
   def issue_status_update
@@ -267,6 +273,12 @@ class User < Principal
     self.user_extensions ||= UserExtensions.new
   end
 
+  # User现在可以作为一个Container_type,而Attachment的Container方法会有一个Container.try(:project),
+  # 所以这里定义一个空方法，保证不报错
+  def project
+
+  end
+
   def user_score_attr
     self.user_score ||= UserScore.new
   end

app/models/user_feedback_message.rb

@@ -0,0 +1,10 @@
+class UserFeedbackMessage < ActiveRecord::Base
+  attr_accessible :journals_for_message_id, :journals_for_message_type, :user_id, :viewed
+
+  belongs_to :journals_for_message
+  belongs_to :user
+
+  validates :user_id,presence: true
+  validates :journals_for_message_id,presence: true
+  validates :journals_for_message_type, presence: true
+end

app/views/admin/course_messages.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程ID)">
+        来源(课程ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page*30%>
     <% for course in @course_ms -%>
 
         <% @count=@count + 1 %>
@@ -51,10 +51,10 @@
             <%= format_date(course.created_on) %>
           </td>
           <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=course.subject %>'>
-            <%= course.subject %>
+            <%= link_to(course.subject, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
           </td>
           <td class="center">
-            <%=course.replies_count  %>
+            <%= link_to(course.replies_count, course_boards_path(Board.where('id=?',course.board_id).first.course_id)) %>
           </td>
         </tr>
 
@@ -62,5 +62,8 @@
     </tbody>
   </table>
 </div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
 
 <% html_title(l(:label_message_plural)) -%>

app/views/admin/homework.html.erb

@@ -27,7 +27,7 @@
     </tr>
     </thead>
     <tbody>
-      <%@count=0 %>
+      <%@count=@page*30 %>
       <% for homework in @homework do %>
           <% @count+=1 %>
           <tr>
@@ -48,7 +48,7 @@
               <% end %>
             </td>
             <td align="center">
-              <%=StudentWork.where('homework_common_id=?',homework.id).count %>
+              <%=link_to(StudentWork.where('homework_common_id=?',homework.id).count, student_work_index_path(:homework => homework.id))%>
             </td>
             <td align="center">
               <%=format_date(homework.end_time) %>
@@ -59,4 +59,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_user_homework)) -%>

app/views/admin/latest_login_users.html.erb

@@ -1,7 +1,26 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
 <h3>
   <%=l(:label_latest_login_user_list)%>
 </h3>
 
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <legend>
+        <%= l(:label_filter_plural) %>
+      </legend>
+      <label style="float:left">开始日期：</label>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
+      <label style="float:left">结束日期：</label>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('enddate')%> &nbsp;
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_users'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+
 <div class="autoscroll">
   <table class="list" style="width: 100%;table-layout: fixed">
     <thead>
@@ -27,7 +46,7 @@
     </tr>
     </thead>
     <tbody>
-        <% @count=0 %>
+        <% @count=@page * 30 %>
         <% for user in @user do %>
             <tr>
               <% @count +=1 %>
@@ -70,4 +89,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_latest_login_user_list)) -%>

app/views/admin/leave_messages.html.erb

@@ -13,8 +13,8 @@
       <th style="width: 50px;">
         类型
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程或用户ID)">
+        来源(课程或用户ID)
       </th>
       <th style="width: 50px;">
         留言人
@@ -31,7 +31,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count = @page * 30 %>
     <% for journal in @jour -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -49,20 +49,39 @@
           <td align="center">
             <%= journal.jour_id %>
           </td>
-          <td align="center" title='<%= journal.try(:user).try(:realname)%>'>
-            <%= link_to(journal.try(:user).try(:realname).truncate(6, omission: '...'), user_path(journal.user)) %>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<% if journal.try(:user).try(:realname) == ' '%><%= journal.try(:user)%><% else %><%=journal.try(:user).try(:realname) %><% end %>'>
+            <% if journal.try(:user).try(:realname) == ' '%>
+                <%= link_to(journal.try(:user), user_path(journal.user)) %>
+            <% else %>
+                <%= link_to(journal.try(:user).try(:realname), user_path(journal.user)) %>
+            <% end %>
           </td>
           <td class="center">
             <%= format_date(journal.created_on) %>
           </td>
-          <td title='<%=journal.notes %>'>
-            <%= journal.notes.truncate(15, omission: '...') %>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=journal.notes %>'>
+            <%case journal.jour_type %>
+            <% when 'Principal' %>
+                <%= link_to(journal.notes.html_safe, feedback_path(journal.jour_id)) %>
+            <% when 'Course' %>
+                <%= link_to(journal.notes.html_safe, course_feedback_path(journal.jour_id)) %>
+            <% end %>
           </td>
           <td class="center">
             <% if(journal.m_reply_count) %>
-            <%=journal.m_reply_count%>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(journal.m_reply_count, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(journal.m_reply_count, course_feedback_path(journal.jour_id)) %>
+                <% end %>
             <% else %>
-            <%=0 %>
+                <%case journal.jour_type %>
+                <% when 'Principal' %>
+                    <%= link_to(0, feedback_path(journal.jour_id)) %>
+                <% when 'Course' %>
+                    <%= link_to(0, course_feedback_path(journal.jour_id)) %>
+                <% end %>
             <% end %>
           </td>
         </tr>
@@ -71,9 +90,7 @@
   </table>
 </div>
 <div class="pagination">
-  <ul>
-    <%= pagination_links_full @jour_pages, @jour_count %>
-  </ul>
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 </div>
 
 <% html_title(l(:label_leave_message_list)) -%>

app/views/admin/messages_list.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(贴吧ID)">
+        来源(贴吧ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30%>
     <% for memo in @memo -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -50,20 +50,22 @@
             <%= format_date(memo.created_at) %>
           </td>
           <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=memo.subject %>'>
-            <%= memo.subject %>
+            <% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
+                <%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% else %>
+                <%= link_to("RE:"+memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% end %>
           </td>
           <td class="center">
-            <%=memo.replies_count  %>
+            <%= link_to(memo.replies_count, forum_memo_path(memo.forum, memo)) %>
           </td>
         </tr>
     <% end %>
     </tbody>
   </table>
 </div>
-<!--<div class="pagination">
-  <ul>
-    <#%= pagination_links_full @memo_pages, @memo_count %>
-  </ul>
-</div>-->
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
 
 <% html_title(l(:label_message_plural)) -%>

app/views/admin/notices.html.erb

@@ -33,7 +33,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30%>
     <% for news in @news -%>
         <% @count=@count + 1 %>
         <tr class="<%= cycle("odd", "even") %>">
@@ -63,7 +63,7 @@
             <%= link_to(news.title, news_path(news)) %>
           </td>
           <td class="center">
-            <%=news.comments_count %>
+            <%= link_to(news.comments_count, news_path(news)) %>
           </td>
         </tr>
     <% end %>
@@ -71,4 +71,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_notification_list)) -%>

app/views/admin/project_messages.html.erb

@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(项目ID)">
+        来源(项目ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -29,7 +29,7 @@
     </tr>
     </thead>
     <tbody>
-    <% @count=0%>
+    <% @count=@page * 30 %>
     <% for project in @project_ms -%>
 
         <% @count=@count + 1 %>
@@ -51,10 +51,10 @@
             <%= format_date(project.created_on) %>
           </td>
           <td title='<%=project.subject %>' style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name">
-            <%= project.subject %>
+            <%= link_to(project.subject, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
           </td>
           <td class="center">
-            <%=project.replies_count  %>
+            <%= link_to(project.replies_count, project_boards_path(Board.where('id=?',project.board_id).first.project_id)) %>
           </td>
         </tr>
 
@@ -63,4 +63,8 @@
   </table>
 </div>
 
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
 <% html_title(l(:label_message_plural)) -%>