From 9b98bdcf5ce69031c12c6a8e0768007091934448 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 15 Aug 2015 15:44:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B6=88=E6=81=AF=E7=9C=8B=E8=BF=87?= =?UTF-8?q?=E5=88=99=E4=B8=8D=E6=8F=90=E7=A4=BA=EF=BC=88=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=89=202=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=96=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 13 ++- app/models/user.rb | 24 +---- app/views/layouts/_base_header_new.html.erb | 108 +++++++++----------- app/views/users/user_messages.html.erb | 8 +- public/images/nav_icon.png | Bin 0 -> 3204 bytes public/images/news_icon_small.png | Bin 0 -> 1482 bytes public/stylesheets/public_new.css | 9 +- 7 files changed, 72 insertions(+), 90 deletions(-) create mode 100644 public/images/nav_icon.png create mode 100644 public/images/news_icon_small.png diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c6dfb9b54..13d23d0dc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -98,6 +98,11 @@ class UsersController < ApplicationController # 用户消息 def user_messages + # 当前用户查看消息，则设置消息为已读 + querys = @user.course_messages + if User.current.id == @user.id + querys.update_all(:viewed => true) + end if @user.course_messages if params[:type].nil? @user_course_messages = @user.course_messages @@ -105,14 +110,14 @@ class UsersController < ApplicationController else case params[:type] when 'homework' - @user_course_messages = @user.course_messages + @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "HomeworkCommon"} #@user_course_messages = ForgeMessage.find_by_sql("select * from course_messages where user_id='#{@user.id}' and course_message_type = 'HomeworkCommon' order by created_at desc;") when 'message' - @user_course_messages = @user.course_message_message + @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Message"} when 'news' - @user_course_messages = @user.course_message_new + @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "News"} when 'poll' - @user_course_messages = @user.course_message_poll + @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Poll"} end end respond_to do |format| diff --git a/app/models/user.rb b/app/models/user.rb index 4bc249673..9f88ff53a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -134,10 +134,6 @@ class User < Principal # 虚拟转换 has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1" - has_many :course_messages_homeworks, :class_name => 'ForgeMessage', :conditions => 'forge_message_type="HomeworkCommon"' - has_many :course_messages_polls, :class_name => 'ForgeMessage', :conditions => 'forge_message_type="Poll"' - has_many :course_messages_messages, :class_name => 'ForgeMessage', :conditions => 'forge_message_type="Message"' - has_many :course_messages_news, :class_name => 'ForgeMessage', :conditions => 'forge_message_type="News"' has_many :issue_assigns, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Issue"' has_many :status_updates, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Journal"' # 邮件邀请状态 @@ -252,27 +248,15 @@ class User < Principal # count = self.journals_for_messages(:conditions => ["status=? and is_readed = ? " ,1, 0]).count end - def course_message_homework user - user.course_messages_homeworks - end - - def course_message_poll - self.course_messages_polls - end - - def course_message_new - self.course_messages_news - end - - def course_message_message - self.course_messages_messages - end - # 查询指派给我的缺陷记录 def count_new_issue_assign_to self.issue_assigns end + # 新消息统计 + def count_new_message + count = CourseMessage.where("user_id =? and viewed =?", User.current.id, 0).count + end # 查询指派给我的缺陷记录 def issue_status_update self.status_updates diff --git a/app/views/layouts/_base_header_new.html.erb b/app/views/layouts/_base_header_new.html.erb index a3b5702c1..d066a3e9f 100644 --- a/app/views/layouts/_base_header_new.html.erb +++ b/app/views/layouts/_base_header_new.html.erb @@ -9,74 +9,60 @@ + + <% end %> <%= render_menu :account_menu -%> diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 687a694bb..7e365a769 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -23,7 +23,7 @@ <% @user_course_messages.each do |ucm| %> <% if ucm.course_message_type == "News" %>