Merge branch 'dev_hjq' into szzh

app/controllers/student_work_controller.rb

@@ -43,6 +43,14 @@ 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)
+      end
+    end
+
+    # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
     query_student_work.each do |query|

app/controllers/users_controller.rb

@@ -106,15 +106,17 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    course_querys = @user.course_messages
-    forge_querys = @user.forge_messages
-    user_querys = @user.user_feedback_messages
-    forum_querys = @user.memo_messages
-    if User.current.id == @user.id
-      course_querys.update_all(:viewed => true)
-      forge_querys.update_all(:viewed => true)
-      user_querys.update_all(:viewed => true)
-      forum_querys.update_all(:viewed => true)
+    if params[:viewed] == "all"
+      course_querys = @user.course_messages
+      forge_querys = @user.forge_messages
+      user_querys = @user.user_feedback_messages
+      forum_querys = @user.memo_messages
+      if User.current.id == @user.id
+        course_querys.update_all(:viewed => true)
+        forge_querys.update_all(:viewed => true)
+        user_querys.update_all(:viewed => true)
+        forum_querys.update_all(:viewed => true)
+      end
     end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]

app/views/users/user_messages.html.erb

@@ -29,6 +29,11 @@
   </div>
 <div class="resources mt10" id="users_setting">
 <div>
+<% if params[:type].nil? %>
+    <div class="newsReadSetting">
+        有&nbsp;<span class="c_red"><%= User.current.count_new_message %></span>&nbsp;封未读<a href="javascript:void(0);" class="ml15"><%= link_to "全部设为已读", user_message_path(User.current, :viewed => 'all') %></a>
+    </div>
+<% end %>
 <% if @message_alls.count >0 %>
     <%# 课程消息 %>
     <% unless @message_alls.nil? %>

db/migrate/20150829024549_course_messages.rb

@@ -3,6 +3,7 @@ class CourseMessages < ActiveRecord::Migration
   def up
     Course.all.each do |course|
       transaction do
+        put course.id
         course.course_messages << CourseMessage.new(:user_id => course.tea_id,:course_id => course.id)
         # 作业
         course.homework_commons.each do |homework_common|

db/migrate/20150829081822_update_message_time.rb

@@ -11,6 +11,7 @@ class UpdateMessageTime < ActiveRecord::Migration
             cmessage.created_at = cmessage.course_message.created_on
           end
           cmessage.save
+          puts cmessage.id
 
           course_all_message = MessageAll.where("message_type = '#{cmessage.class.to_s}' and message_id = '#{cmessage.id}'").first
           course_all_message.created_at = cmessage.created_at

db/migrate/20150829130302_update_forge_message_time.rb

@@ -11,6 +11,7 @@ class UpdateForgeMessageTime < ActiveRecord::Migration
             fmessage.created_at = fmessage.forge_message.created_on
           end
           fmessage.save
+          puts fmessage.id
 
           forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first
           forge_all_message.created_at = fmessage.created_at

db/migrate/20150901004812_update_memo_message_time.rb

@@ -11,6 +11,7 @@ class UpdateMemoMessageTime < ActiveRecord::Migration
             memo_message.created_at = memo_message.memo.created_on
           end
           memo_message.save
+          puts memo_message.id
 
           memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first
           memo_messages.created_at = memo_message.created_at

public/stylesheets/new_user.css

@@ -525,7 +525,7 @@ a.replyGrey1 {color:#888888;}
 a.replyGrey1:hover {color:#4b4b4b;}
 a.newsBlue {color:#269ac9;}
 a.newsBlue:hover {color:#297fb8;}
-a.newsBlack {color:#000000; font-size:13px; font-weight:bold}
+a.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.menuGrey {color:#808080;}
 a.menuGrey:hover {color:#fe7d68;}
 .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}