From 5ca80d9a4cb44e20a2437fcc405194fe56d7e34e Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Sep 2015 16:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=85=E6=8B=AC=E6=89=A3=E5=88=86=E3=80=81=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=AD=89=202.=E5=AF=B9=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E5=92=8C=E5=AD=A6=E7=94=9F=EF=BC=8C=E7=BB=99=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?tips=E8=A6=81=E6=9C=89=E5=8C=BA=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 37 ++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 97a67a717..ee9c95ccf 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -127,11 +127,38 @@
                                     :onmouseover =>"message_titile_show($(this),event)",
                                     :onmouseout => "message_titile_hide($(this))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
-                        <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                        <p><strong>标题：</strong><%= ma.course_message.name %></p>
-                        <% unless ma.course_message.description.blank? %>
-                            <div class="fl"><strong>内容：</strong></div>
-                            <div class="ml36"><%= ma.course_message.description.html_safe %></div>
+                        <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
+                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
+                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                              (<%= ma.course_message.course.term %>)</p>
+                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+                            <% unless ma.course_message.description.blank? %>
+                                <div class="fl"><strong>作业内容：</strong></div>
+                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+                            <% end %>
+                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
+                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
+                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+                            <p>
+                              请同学们抓紧时间提交自己的作品，谢谢！
+                            </p>
+                        <% else %>
+                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
+                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                              (<%= ma.course_message.course.term %>)</p>
+                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+                            <% unless ma.course_message.description.blank? %>
+                                <div class="fl"><strong>作业内容：</strong></div>
+                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+                            <% end %>
+                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
+                            <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
+                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
+                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
+                            <p>
+                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                            </p>
                         <% end %>
                       </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>