From efbae1f003270b31ca5c9d724a4af0b8743235de Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 19 Oct 2015 16:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=86=85=E5=AE=B9=EF=BC=9A=E6=8A=8A=E2=80=9C?= =?UTF-8?q?=E4=BD=A0=E2=80=9D=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90=E2=80=9C?= =?UTF-8?q?=E6=82=A8=E2=80=9D=EF=BC=9B=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=98=AF=E6=9C=AC=E4=BA=BA=E7=9A=84=E8=AF=9D=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E6=88=90=E2=80=9C=E6=82=A8=E5=8F=91=E5=B8=83=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E2=80=9D=EF=BC=8C=E8=80=8C=E9=9D=9E=E2=80=9C=E6=9F=90?= =?UTF-8?q?=E6=9F=90=E8=80=81=E5=B8=88=E5=8F=91=E5=B8=83=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E2=80=9D=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- app/views/users/_user_message_course.html.erb | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 10b55d1cd..797ad1bd4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -128,12 +128,12 @@ class UsersController < ApplicationController #课程相关消息 when 'homework' - @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?", @user).order("created_at desc") + @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','NoEvaluation') and user_id =?", @user).order("created_at desc") when 'course_message' @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc") when 'course_news' # 课程通知包含发布的通知和回复的通知 - @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc") + @message_alls = CourseMessage.where("course_message_type in (?, ? ,?)", "News", "Comment", "Course").where("user_id =?", @user).order("created_at desc") when 'poll' @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc") diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index f57d22bc5..7f535f2ec 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -52,7 +52,7 @@ <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>

<%= User.current.lastname + User.current.firstname %>老师您好！ - <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业： + <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：

课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.term %>)

@@ -66,7 +66,7 @@ 您可以修改作业内容、评分规则、匿评过程等，谢谢！

<% else %> -

<%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：

+

<%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：

课程名称：<%= ma.course_message.course.name %> (<%= ma.course_message.course.term %>)

作业标题：<%= ma.course_message.name %>

@@ -302,7 +302,7 @@ 本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。

- 期待你取得更大的进步！ + 期待您取得更大的进步！

<% end %> @@ -348,6 +348,8 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -394,7 +396,7 @@ ">您成功创建了课程：
  • - <%= link_to ma.course_message.name, course_path(ma.course_message), + <%= link_to "课程名称：" + ma.course_message.name, course_path(ma.course_message), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
    • @@ -403,7 +405,7 @@ <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个课程，详情如下：

    课程名称：<%= ma.course_message.name %>

    -

    开课学期：<%= ma.course_message.term %>

    +

    开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %>

    课程描述：
    <%= ma.course_message.description.html_safe %>

    学时总数：<%= ma.course_message.class_period%>