diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index b1e5456c5..e4f637b6d 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -49,6 +49,11 @@ class ExerciseController < ApplicationController
return
end
@exercise = Exercise.find params[:id]
+ @exercise.course_messages.each do |message|
+ if User.current.id == message.user_id && message.viewed == 0
+ message.update_attributes(:viewed => true) if message.viewed == 0
+ end
+ end
@is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
exercise_end = @exercise.end_time > Time.now
if @exercise.time == -1
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index a87e83238..7ba0a23be 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -84,9 +84,9 @@
<%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target =>"_Blank" %>
<% end %>
<%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
-
+
+ <%=render :partial => 'layouts/message_loading' %>
+
@@ -98,15 +98,15 @@
$("#navHomepageSearchType").hide();
});
- /*$("#user_messages").mouseenter(function(){
+ $("#user_messages").mouseenter(function(){
$("#user_messages_list").show();
- $.get('<%#=user_messages_unviewed_users_path %>');
+ $.get('<%=user_messages_unviewed_users_path %>');
$("#ajax-indicator").hide();
}).mouseleave(function(){
$("#user_messages_list").hide();
- $("#user_messages_list").html("<%#=escape_javascript(render :partial => 'layouts/message_loading') %>");
+ $("#user_messages_list").html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
- });*/
+ });
$("#navHomepageProfile").mouseenter(function(){
$("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 27e1d8896..addd04815 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,7 +1,6 @@
未读消息
- <%# user_messages = User.current.user_messages_unviewed %>
<% messages.each do |ma| %>
<% if ma.class == SystemMessage %>
- Trustie平台 发布新消息：<%= ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject%>
@@ -60,15 +59,77 @@
<% else %>
- <%=ma.course_message.user.show_name %><%=ma.course_message.user.allowed_to?(:as_teacher, ma.course) ? '老师' : '同学' %> 回复了作品评论：<%= ma.course_message.notes%>
<% end %>
+ <% elsif ma.course_message_type == "StudentWork" && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) %>
+ - <%=ma.course_message.homework_common.user.show_name %>老师 发布的作业：<%=ma.course_message.homework_common.name %>,由于迟交作业，您及您的作品都不能参与该作业的匿评
+ <% elsif ma.course_message_type == "StudentWork" && ma.status == 1 %>
+ - <%=ma.course_message.user.show_name %>同学 重新提交了作品：<%=ma.course_message.name %>
+ <% elsif ma.course_message_type == "StudentWork" && ma.status == 2 %>
+ - <%=ma.course_message.user.show_name %>同学 追加新附件了：作业标题：<%=ma.course_message.homework_common.name %>
+ <% elsif ma.course_message_type == "Course" %>
+ - 系统提示 您成功创建了课程：课程名称：<%=ma.course_message.name %>
+ <% elsif ma.course_message_type == "JoinCourseRequest" %>
+ <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9' ? "教师" : "教辅"}" %>
+ - 系统提示 您有了新的课程成员申请：<%=content %>
+ <% elsif ma.course_message_type == "CourseRequestDealResult" %>
+ <% content = ma.status == 1 ? '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'申请已通过' : '您申请成为课程"'+Course.find(ma.course_id).name+'"的'+(ma.content == '9' ? '老师' : '教辅')+'的申请被拒绝' %>
+ - 系统提示 课程申请进度反馈：<%=content %>
+ <% elsif ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+ - <%=User.find(ma.course_message_id).show_name %> 将您加入了课程：<%=ma.course.name %>
+ <% elsif ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+ - ">系统提示 您增加了新的课程成员：<%=User.find(ma.course_message_id).login+"("+User.find(ma.course_message_id).show_name+")" %>
+ <% elsif ma.course_message_type == "RemoveFromCourse" %>
+ - <%=User.find(ma.course_message_id).show_name %> 将您移出了课程：<%=ma.course.name %>
+ <% elsif ma.course_message_type == "Exercise" && ma.status == 2 %>
+ - <%=ma.course_message.user.show_name %>老师 发布了课程测验：测验题目:<%=ma.course_message.exercise_name %>
+ <% elsif ma.course_message_type == "Exercise" && ma.status == 3 %>
+ - <%=ma.course_message.user.show_name %>老师 发布的测验：<%=ma.course_message.exercise_name %> 截止时间快到了
<% end %>
- <% end %>
+ <% elsif ma.class == ForgeMessage %>
+ <% if ma.forge_message_type == "AppliedProject" %>
+ - " target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>
+ <% elsif ma.forge_message_type == "JoinProject" %>
+ - <%=User.find(ma.forge_message_id).show_name %> 将您加入了项目：<%= ma.project.name%>
+ <% elsif ma.forge_message_type == "RemoveFromProject" %>
+ - <%=User.find(ma.forge_message_id).show_name %> 将您移出了项目：<%= ma.project.name%>
+ <% elsif ma.forge_message_type == "RemoveFromProject" %>
+ - <%=User.find(ma.forge_message_id).show_name %> 邀请你加入项目：<%= ma.project.name%>
+ <% elsif ma.forge_message_type == "Issue" && ma.status == 1 %>
+ - <%= ma.forge_message.subject%> 截止时间快到了！"><%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%><%= ma.forge_message.subject%> 截止时间快到了！
+ <% elsif ma.forge_message_type == "Issue" && ma.status != 1 %>
+ - <%= ma.forge_message.subject%>"><%=ma.forge_message.author.show_name %> <%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%><%= ma.forge_message.subject%>
+ <% elsif ma.forge_message_type == "Journal" %>
+ - <%=ma.forge_message.user.show_name %> 更新了问题状态：<%= ma.forge_message.journalized.subject%>
+ <% elsif ma.forge_message_type == "Message" %>
+ - <%= ma.forge_message.subject%>"><%=ma.forge_message.author.show_name %> <%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %><%= ma.forge_message.subject%>
+ <% elsif ma.forge_message_type == "News" %>
+ - <%=ma.forge_message.author.show_name %> 发布了新闻：<%= ma.forge_message.title.html_safe%>
+ <% elsif ma.forge_message_type == "Comment" %>
+ - <%=ma.forge_message.author.show_name %> 评论了新闻：<%= ma.forge_message.commented.title%>
+ <% end %>
+ <% elsif ma.class == MemoMessage %>
+ <% if ma.memo_type == "Memo" %>
+ - <%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>"><%=ma.memo.author.show_name %> <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %><%= ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content.html_safe%>
+ <% end %>
+ <% elsif ma.class == UserFeedbackMessage %>
+ <% if ma.journals_for_message_type == "JournalsForMessage" %>
+ - <%= ma.journals_for_message.notes.gsub("
","").gsub("
","").gsub("
","").html_safe%>"><%=ma.journals_for_message.user.show_name %> <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %><%= ma.journals_for_message.notes.gsub("","").gsub("
","").gsub("
","").html_safe%>
+ <% end %>
+ <% elsif ma.class == OrgMessage %>
+ <% if ma.message_type == 'ApplySubdomain' %>
+ - 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>"><%=ma.organization.name %> 申请子域名：<%= (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准"%>
+ <% elsif ma.message_type == 'AgreeApplySubdomain' %>
+ - 系统提示 管理员同意了您的子域名申请：<%= ma.content%>
+ <% end %>
+ <% elsif AtMessage === ma && ma.at_valid? %>
+ <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+ <% href = course_boards_path(ma.at_message.course,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+ <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+ <% href = project_boards_path(ma.at_message.project,:parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id) %>
+ <% else %>
+ <% href = ma.url %>
+ <% end %>
+ - <%=ma.author.show_name %> 提到了你：<%= ma.subject.html_safe%>
+ <% end %>
<% end %>
-
<%= link_to '查看全部', user_message_path(User.current), :class => "shadowbox_news_all", :target =>"_Blank" %>
\ No newline at end of file