From 050257e885a835323613f94e6aa3454e9e456769 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 3 Mar 2016 17:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B7=BB=E5=8A=A0=E6=8C=82?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb              |  2 +-
 app/views/users/_user_homework_detail.html.erb | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9d08be378..431c09d15 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2512,7 +2512,7 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
-    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+    if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 4c980d7fc..df2077719 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -15,8 +15,10 @@
           </span>
 
       <% if homework_common.homework_detail_manual%>
-          <% if homework_common.homework_detail_manual.comment_status == 0 %>
-              <span class="grey_homework_btn_cir ml5">未发布</span>
+          <% if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil? %>
+              <span class="grey_homework_btn_cir ml5">挂起</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 0 %>
+                <span class="grey_homework_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
               <% if homework_common.anonymous_comment == 0%>
                   <span class="grey_homework_btn_cir ml5">未开启匿评</span>
@@ -84,12 +86,12 @@
               分组人数：<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 %>
+        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 && !homework_common.publish_time.nil? %>
             <div class="homepagePostDeadline">提交截止时间：<%= homework_common.end_time.to_s %>&nbsp;23:59</div>
-        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 %>
+        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 && !homework_common.publish_time.nil? %>
             <div class="homepagePostDeadline">匿评截止时间：<%= homework_common.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
-        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+        <% if homework_common.homework_detail_manual.comment_status == 0  && !homework_common.publish_time.nil? %>
             <div class="homepagePostDeadline ml15">
               <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00
             </div>
@@ -107,7 +109,7 @@
         <div class="homepagePostDeadline">
           迟交扣分：<%= homework_common.late_penalty%>分
         </div>
-        <% if homework_common.anonymous_comment == 0%>
+        <% if homework_common.anonymous_comment == 0 && !homework_common.publish_time.nil?%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=homework_common.id %>">
               匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
             </div>
@@ -120,7 +122,7 @@
               缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
             </div>
         <% end %>
-        <% if homework_common.anonymous_comment == 0%>
+        <% if homework_common.anonymous_comment == 0 && !homework_common.publish_time.nil?%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
               匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
             </div>