Merge branch 'szzh' into develop

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

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

app/controllers/admin_controller.rb

@@ -79,6 +79,11 @@ class AdminController < ApplicationController
     end
   end
 
+  # 系统消息
+  def messages
+    @admin_messages = SystemMessage.new
+  end
+
   def plugins
     @plugins = Redmine::Plugin.all
   end

app/controllers/courses_controller.rb

@@ -468,13 +468,17 @@ class CoursesController < ApplicationController
   end
 
   def new
-    @course_type = params[:course_type] ||= params[:course]
-    @issue_custom_fields = IssueCustomField.sorted.all
-    @trackers = Tracker.sorted.all
-    @course = Course.new
-    @course.safe_attributes = params[:course]
-    # month = Time.now.month
-    render :layout => 'new_base'
+    if User.current.login?
+      @course_type = params[:course_type] ||= params[:course]
+      @issue_custom_fields = IssueCustomField.sorted.all
+      @trackers = Tracker.sorted.all
+      @course = Course.new
+      @course.safe_attributes = params[:course]
+      # month = Time.now.month
+      render :layout => 'new_base'
+    else
+      redirect_to signin_url
+    end
   end
 
   def desc_sort_course_by_avtivity(activity_count, courses)

app/controllers/issues_controller.rb

@@ -114,8 +114,10 @@ class IssuesController < ApplicationController
   def show
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
     query = @issue.forge_messages
-    if User.current.id == @issue.assigned_to_id
-      query.update_all(:viewed => true)
+    query.each do |m|
+      if m.user_id == User.current.id
+        m.update_attribute(:viewed, true)
+      end
     end
     # 缺陷状态更新
     query_journals = @issue.journals

app/controllers/projects_controller.rb

@@ -322,6 +322,12 @@ class ProjectsController < ApplicationController
   end
 
   def settings
+    # 修改查看消息状态
+    applied_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =? and viewed =?", User.current.id, @project, "AppliedProject", 0)
+    applied_messages.each do |applied_message|
+      applied_message.update_attributes(:viewed => true)
+    end
+    # end
     @issue_custom_fields = IssueCustomField.sorted.all
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
@@ -342,7 +348,7 @@ class ProjectsController < ApplicationController
       if params[:repository] == "pswd_is_null"
         html  << l(:label_password_not_null)
       end
-      flash[:error] = html if !html.to_s.blank?
+      flash.now[:error] = html if !html.to_s.blank?
     end
       scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
       @repository = Repository.factory(scm)

app/controllers/student_work_controller.rb

@@ -47,13 +47,23 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 消息状态更新
+    # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id
-        homework_message.update_attributes(:viewed => true)
+      if User.current.id == homework_message.user_id && homework_message.viewed == 0
+        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
-
+    # 作品打分消息状态更新
+    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
+    studentworks_scores.each do |studentworks_score|
+      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
+    end
+    # 作品评论消息状态更新
+    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
+    journals_for_teacher.each do |journal_for_teacher|
+      journal_for_teacher.update_attributes(:viewed => true)
+    end
+    # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages

app/controllers/system_messages_controller.rb

@@ -0,0 +1,94 @@
+class SystemMessagesController < ApplicationController
+  # before_filter :message_author, :only => [:show]
+  #
+  # def message_author
+  #   if(!User.current.logged? && !token.nil?)
+  #
+  #     User.current =try_to_autologin1
+  #   end
+  #   if @system_messages
+  #     render_403 :message => :notice_not_authorized_message
+  #   else
+  #     deny_access
+  #   end
+  # end
+
+  def index
+    @system_messages = SystemMessage.all
+  end
+
+  # def show
+  #   @system_messages = SystemMessage.find(params[:id])
+  # end
+
+  # GET /products/new
+  # def new
+  #   @product = Product.new
+  # end
+
+  # GET /products/1/edit
+  # def edit
+  # end
+
+  # POST /products
+  # POST /products.json
+  def create
+    unless User.current.admin?
+      render_403
+      return
+    end
+    @system_messages = SystemMessage.new
+    @system_messages.content = params[:system_message][:content]
+    @system_messages.user_id = User.current.id
+    respond_to do |format|
+      if @system_messages.save
+        format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
+        flash[:notice] = l(:notice_successful_message)
+      else
+        if params[:system_message][:content].empty?
+          flash[:error] = l(:label_content_blank_fail)
+        else
+          flash[:error] = l(:label_admin_message_fail)
+        end
+        format.html {redirect_to admin_messages_path}
+      end
+    end
+  end
+
+  # PATCH/PUT /products/1
+  # PATCH/PUT /products/1.json
+  # def update
+  #   respond_to do |format|
+  #     if @product.update(product_params)
+  #       format.html { redirect_to @product, notice: 'Product was successfully updated.' }
+  #       format.json { render :show, status: :ok, location: @product }
+  #     else
+  #       format.html { render :edit }
+  #       format.json { render json: @product.errors, status: :unprocessable_entity }
+  #     end
+  #   end
+  # end
+
+  # DELETE /products/1
+  # DELETE /products/1.json
+  # def destroy
+  #   @system_messages.destroy
+  #   respond_to do |format|
+  #     format.html { redirect_to products_url, notice: 'Product was successfully destroyed.' }
+  #     format.json { head :no_content }
+  #   end
+  # end
+
+  # private
+  # # Use callbacks to share common setup or constraints between actions.
+  # def set_product
+  #   @product = Product.find(params[:id])
+  # end
+  #
+  # # Never trust parameters from the scary internet, only allow the white list through.
+  # def message_params
+  #   params.require(:admin_system_messages).permit(:content)
+  # end
+
+
+end

app/controllers/users_controller.rb

@@ -99,6 +99,19 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
+    # 记录当前点击按钮的时间
+    # 考虑到用户未退出刷新消息页面
+    if OnclickTime.where("user_id =?", User.current).first.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = Time.now
+      message_new_time.save
+    else
+      message_new_time = OnclickTime.where("user_id =?", User.current).first
+      message_last_time = message_new_time.onclick_time
+      message_new_time.update_attributes(:onclick_time => Time.now)
+    end
+    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
     if params[:viewed] == "all"
       course_querys = @user.course_messages
@@ -116,10 +129,23 @@ class UsersController < ApplicationController
     case params[:type]
       when nil
         @message_alls = []
-        messages = MessageAll.where("user_id =?",@user).order("created_at desc")
+        messages = MessageAll.where("user_id =?" ,@user).order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
+      when 'unviewed'
+        @message_alls = []
+        messages = MessageAll.where("user_id =?", @user).order("created_at desc")
+        messages.each do |message_all|
+          # 在点击或者刷新消息列表后未读的消息存放在数组
+          if message_all.message.viewed == 0
+            @message_alls << message_all.message
+          end
+        end
+      when 'system_messages'
+        @message_alls = SystemMessage.order("created_at desc").all
+      when 'apply'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
       when 'course_message'
@@ -323,11 +349,13 @@ class UsersController < ApplicationController
   #导入作业，确定按钮
   def user_select_homework
     homework = HomeworkCommon.find_by_id params[:checkMenu]
+    homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
     if homework
       @homework.name = homework.name
       @homework.description = homework.description
       @homework.end_time = homework.end_time
+      @homework.homework_type = homework.homework_type
       @homework.course_id = homework.course_id
       homework.attachments.each do |attachment|
         att = attachment.copy
@@ -337,6 +365,19 @@ class UsersController < ApplicationController
         att.save
         @homework.attachments << att
       end
+
+      if homework_detail_programing
+        @homework.homework_detail_programing = HomeworkDetailPrograming.new
+        @homework_detail_programing = @homework.homework_detail_programing
+        @homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+        @homework_detail_programing.language = homework_detail_programing.language
+        homework.homework_tests.each_with_index do |homework_test|
+          @homework.homework_tests << HomeworkTest.new(
+              input: homework_test.input,
+              output: homework_test.output
+          )
+        end
+      end
     end
     respond_to do |format|
       format.js
@@ -361,6 +402,19 @@ class UsersController < ApplicationController
     end
   end
 
+  #修改编程作业
+  def edit_user_commit_homework
+    if User.current.logged?
+
+      respond_to do |format|
+        format.js
+        format.html {render :layout => 'new_base_user'}
+      end
+    else
+      render_403
+    end
+  end
+
   def user_commit_homework
     homework = HomeworkCommon.find(params[:homework])
     student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
@@ -389,17 +443,17 @@ class UsersController < ApplicationController
         homework.save_attachments(params[:attachments])
         render_attachment_warning_if_needed(homework)
 
-        #匿评作业相关属性
-        if homework.homework_type == 1
-          homework_detail_manual = HomeworkDetailManual.new
-          homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-          homework_detail_manual.comment_status = 1
-          homework_detail_manual.evaluation_start = Time.now
-          homework_detail_manual.evaluation_end = Time.now
-          homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-          homework_detail_manual.absence_penalty = 2
-          homework.homework_detail_manual = homework_detail_manual
-        else
+        homework_detail_manual = HomeworkDetailManual.new
+        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.comment_status = 1
+        homework_detail_manual.evaluation_start = Time.now
+        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
+        homework_detail_manual.absence_penalty = 2
+        homework.homework_detail_manual = homework_detail_manual
+
+        #编程作业相关属性
+        if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
           homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
@@ -803,7 +857,7 @@ class UsersController < ApplicationController
         when "project_message"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{User.current.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
       end

app/controllers/wiki_controller.rb

@@ -264,7 +264,7 @@ class WikiController < ApplicationController
     end
     @page.destroy
     respond_to do |format|
-      format.html { redirect_to project_wiki_index_url(@project) }
+      format.html {redirect_to edit_project_wiki_page_url @project, @page.title}
       format.api { render_api_ok }
     end
   end

app/helpers/application_helper.rb

@@ -2297,25 +2297,27 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-        link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
-      elsif homework.student_works.count >= 2 #作业份数大于2
-        case homework.homework_detail_manual.comment_status
-          when 1
-            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 2
-            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 3
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+    # if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+    #
+    # elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
+    #   link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
+    # else
+    #   link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    # end
+
+    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+      link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+    elsif homework.student_works.count >= 2 #作业份数大于2
+      case homework.homework_detail_manual.comment_status
+        when 1
+          link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+        when 2
+          link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+        when 3
+          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
       end
-    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-      link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
     else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+      link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
     end
     link
   end

app/helpers/homework_common_helper.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+include UsersHelper
 module HomeworkCommonHelper
   #迟交扣分下拉框
   def late_penalty_option

app/helpers/system_messages_helper.rb

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

app/helpers/users_helper.rb

@@ -52,6 +52,40 @@ module UsersHelper
     end
   end
 
+  def title_for_message type
+    case type
+      when nil
+        '消息'
+      when 'unviewed'
+        '未读消息'
+      when 'apply'
+        '用户申请'
+      when 'system_messages'
+        '系统消息'
+      when 'homework'
+        '作业消息'
+      when 'course_message'
+        '课程讨论'
+      when 'course_news'
+        '课程通知'
+      when 'issue'
+        '项目任务'
+      when 'forum'
+        '贴吧帖子'
+      when 'user_feedback'
+        '用户留言'
+    end
+  end
+
+  # 统计未读消息数
+  def unviewed_message(user)
+    course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+  end
+
   def user_mail_notification_options(user)
     user.valid_notification_options.collect {|o| [l(o.last), o.first]}
   end

app/models/applied_project.rb

@@ -1,8 +1,21 @@
 class AppliedProject < ActiveRecord::Base
   attr_accessible :project_id, :user_id
 
-   belongs_to :user
-   belongs_to :project
+  belongs_to :user
+  belongs_to :project
+  has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
+
+  after_create :send_appliled_message
+
+  def send_appliled_message
+    # if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+    self.project.members.each do |m|
+      if m.roles.first.to_s.include?("Manager")
+        self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+      end
+    end
+    # end
+  end
 
   #删除用户申请
   def self.deleteappiled(userid, projectid)
@@ -11,5 +24,4 @@ class AppliedProject < ActiveRecord::Base
       applied.destroy
     end
   end
-
 end

app/models/course_activity.rb

@@ -14,13 +14,19 @@ class CourseActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
-      user_activity.act_id = self.course_act_id
-      user_activity.act_type = self.course_act_type
-      user_activity.container_type = "Course"
-      user_activity.container_id = self.course_id
-      user_activity.user_id = self.user_id
-      user_activity.save
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.course_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
+      else
+        user_activity = UserActivity.new
+        user_activity.act_id = self.course_act_id
+        user_activity.act_type = self.course_act_type
+        user_activity.container_type = "Course"
+        user_activity.container_id = self.course_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 

app/models/forge_activity.rb

@@ -29,12 +29,19 @@ class ForgeActivity < ActiveRecord::Base
     if user_activity
       user_activity.save
     else
-      user_activity = UserActivity.new
-      user_activity.act_id = self.forge_act_id
-      user_activity.act_type = self.forge_act_type
-      user_activity.container_type = "Project"
-      user_activity.container_id = self.project_id
-      user_activity.save
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+        user_activity = UserActivity.where("act_type = 'Message' and act_id = #{self.forge_act.parent.id}").first
+        user_activity.created_at = self.created_at
+        user_activity.save
+      else
+        user_activity = UserActivity.new
+        user_activity.act_id = self.forge_act_id
+        user_activity.act_type = self.forge_act_type
+        user_activity.container_type = "Project"
+        user_activity.container_id = self.project_id
+        user_activity.user_id = self.user_id
+        user_activity.save
+      end
     end
   end
 

app/models/homework_common.rb

@@ -60,6 +60,6 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
-  delegate :language_name, :to => :homework_detail_programing
+  delegate :language_name, :language, :to => :homework_detail_programing
 
 end

app/models/issue.rb

@@ -147,6 +147,13 @@ class Issue < ActiveRecord::Base
     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
+    if self.tracker_id == 5
+      self.project.members.each do |m|
+        if m.roles.first.to_s.include?("Manager") && m.user_id != self.author_id && m.user_id != self.assigned_to_id
+          self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.project_id, :viewed => false)
+        end
+      end
+    end
   end
 
   # 更新缺陷
@@ -1009,7 +1016,7 @@ class Issue < ActiveRecord::Base
         if leaf.start_date
           # Only move subtask if it starts at the same date as the parent
           # or if it starts before the given date
-          if start_date == leaf.start_date || date > leaf.start_date 
+          if start_date == leaf.start_date || date > leaf.start_date
             leaf.reschedule_on!(date)
           end
         else

app/models/mailer.rb

@@ -34,8 +34,10 @@ class Mailer < ActionMailer::Base
     end
     def method_missing(name, *args, &block)
       if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+        # with delayed_job
         @target.delay.send(name, *args, &block)
       else
+        # without delayed_job
         @target.send(name, *args, &block).deliver
       end
     end

app/models/onclick_time.rb

@@ -0,0 +1,5 @@
+class OnclickTime < ActiveRecord::Base
+  attr_accessible :onclick_time, :user_id
+
+  belongs_to :user
+end

app/models/system_message.rb

@@ -0,0 +1,7 @@
+class SystemMessage < ActiveRecord::Base
+  attr_accessible :content, :id, :user_id
+  belongs_to :user
+
+  validates :content, presence: true
+  validates_length_of :content, maximum: 255
+end

app/models/user.rb

@@ -132,6 +132,8 @@ class User < Principal
   has_many :course_messages
   has_many :memo_messages
   has_many :user_feedback_messages
+  has_one :onclick_time
+  has_many :system_messages
 
 # 虚拟转换
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
@@ -209,7 +211,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy
   # added by fq
-  after_create :act_as_activity
+  after_create :act_as_activity, :add_onclick_time
   # end
 
   scope :in_group, lambda {|group|
@@ -257,11 +259,18 @@ class User < Principal
 
   # 新消息统计
   def count_new_message
-    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
+    if OnclickTime.where("user_id =?", User.current).first.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on
+      message_new_time.save
+    end
+    course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count
   end
 
   # 查询指派给我的缺陷记录
@@ -994,6 +1003,13 @@ class User < Principal
     self.acts << Activity.new(:user_id => self.id)
   end
 
+  # 注册用户的时候消息默认点击时间为用户创建时间
+  def add_onclick_time
+    if OnclickTime.where("user_id =?" , self.id).first.nil?
+      OnclickTime.create(:user_id => self.id, :onclick_time => self.created_on)
+    end
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy

app/views/admin/messages.html.erb

@@ -0,0 +1,47 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<h3 style="float: left">
+  <%=l(:label_system_message)%>
+</h3><br/>
+<div style="padding-top: 20px; padding-left: 5px;">
+  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
+      <div class="field">
+        <%= f.kindeditor :content,:width=>'87%',:editor_id=>'system_message_editor' %>
+        <p id="content_notice_span" class="ml55"></p>
+      </div>
+      <div>
+        <p id="content_notice_span" class="ml55"></p>
+      </div>
+      <div class="actions">
+        <%= link_to l(:label_submit), "javascript:void(0)",:class => "small", :onclick => "system_message_editor.sync();submit_message();" %>
+      </div>
+  <% end %>
+</div>
+<script>
+    function system_message_length() {
+        var obj = system_message_editor.html();
+        if (obj.length == 0) {
+            $("#content_notice_span").text("内容不能为空");
+            $("#content_notice_span").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else if (obj.length > 255) {
+            $("#content_notice_span").text("内容过长，超过255个字符");
+            $("#content_notice_span").css('color', '#ff0000');
+            $("#content_notice_span").focus();
+            return false;
+        }
+        else {
+            $("#content_notice_span").text("填写正确");
+            $("#content_notice_span").css('color', '#008000');
+            return true;
+        }
+    }
+    function submit_message() {
+
+        if (system_message_length()) {
+            $("#system_message-form").submit();
+        }
+    }
+</script>
+