diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index da05ac946..a0ce84795 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -86,7 +86,11 @@ 分组人数:<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人 <% end %> -
截止时间:<%= activity.end_time.to_s %> 23:59
+ <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %> +
提交截止时间:<%= activity.end_time.to_s %> 23:59
+ <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %> +
匿评截止时间:<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
+ <% end %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index fb6ae0455..0472613e4 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -84,9 +84,11 @@ 分组人数:<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
<% end %> -
- <%= l(:label_end_time)%>:<%= homework_common.end_time%> 23:59 -
+ <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 %> +
提交截止时间:<%= homework_common.end_time.to_s %> 23:59
+ <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 %> +
匿评截止时间:<%= homework_common.homework_detail_manual.evaluation_end.to_s %> 23:59
+ <% end %> <% if homework_common.homework_detail_manual.comment_status == 0 %>
<%= l(:label_publish_time)%>:<%= homework_common.publish_time%> 00:00