diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3c125a185..c1d6950fa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -3420,6 +3420,43 @@ def get_hw_index(hw,is_teacher)
return index
end
+def get_hw_status homework_common
+ str = ""
+ if homework_common.homework_detail_manual
+ if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil?
+ str += '挂起'
+ elsif homework_common.homework_detail_manual.comment_status == 0
+ str += '未发布'
+ elsif homework_common.homework_detail_manual.comment_status == 1
+ if homework_common.anonymous_comment == 0
+ str += '未开启匿评'
+ else
+ str += '匿评已禁用'
+ end
+ if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+ str += '作品提交中'
+ elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
+ str += '作品补交中'
+ end
+ elsif homework_common.homework_detail_manual.comment_status == 2
+ if homework_common.anonymous_comment == 0
+ str += '匿评中'
+ else
+ str += '匿评已禁用'
+ end
+ str += '教师评阅中'
+ elsif homework_common.homework_detail_manual.comment_status == 3
+ if homework_common.anonymous_comment == 0
+ str += '匿评已结束'
+ else
+ str += '匿评已禁用'
+ end
+ str += '教师评阅中'
+ end
+ end
+ str
+end
+
def get_group_member_names work
result = ""
unless work.nil?
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 41251a3a5..cf5f5881b 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -16,34 +16,8 @@
<%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
- <% if activity.homework_detail_manual%>
- <% if activity.homework_detail_manual.comment_status == 1%>
- <% if activity.anonymous_comment == 0%>
- 未开启匿评
- <% else %>
- 匿评已禁用
- <% end %>
- <% if Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%>
- 作品提交中
- <% elsif Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %>
- 作品补交中
- <% end %>
- <% elsif activity.homework_detail_manual.comment_status == 2%>
- <% if activity.anonymous_comment == 0%>
- 匿评中
- <% else %>
- 匿评已禁用
- <% end %>
- 教师评阅中
- <% elsif activity.homework_detail_manual.comment_status == 3%>
- <% if activity.anonymous_comment == 0%>
- 匿评已结束
- <% else %>
- 匿评已禁用
- <% end %>
- 教师评阅中
- <% end%>
- <% end%>
+
+ <%=get_hw_status(activity).html_safe %>
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 50de18fb9..6f1fb7843 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -21,38 +21,8 @@
<% end %>
- <% if homework_common.homework_detail_manual%>
- <% if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil? %>
- 挂起
- <% elsif homework_common.homework_detail_manual.comment_status == 0 %>
- 未发布
- <% elsif homework_common.homework_detail_manual.comment_status == 1%>
- <% if homework_common.anonymous_comment == 0%>
- 未开启匿评
- <% else %>
- 匿评已禁用
- <% end %>
- <% if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%>
- 作品提交中
- <% elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %>
- 作品补交中
- <% end %>
- <% elsif homework_common.homework_detail_manual.comment_status == 2%>
- <% if homework_common.anonymous_comment == 0%>
- 匿评中
- <% else %>
- 匿评已禁用
- <% end %>
- 教师评阅中
- <% elsif homework_common.homework_detail_manual.comment_status == 3%>
- <% if homework_common.anonymous_comment == 0%>
- 匿评已结束
- <% else %>
- 匿评已禁用
- <% end %>
- 教师评阅中
- <% end%>
- <% end%>
+ <%=get_hw_status(homework_common).html_safe %>
+
<% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%>
系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 7d0e6c866..77f7fdfe2 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -539,4 +539,12 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
.hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;}
/*20160901作品信息确认*/
-#worksDescription p {word-wrap:break-word;}
\ No newline at end of file
+#worksDescription p {word-wrap:break-word;}
+
+/*20160907作业详情更改*/
+.homework-type-option {border:1px solid #d9d9d9; width:98px; height:28px; color:#888; font-size:14px;}
+.homework-detail-tab {font-size:14px; color:#484848; overflow:hidden;}
+.homework-detail-tab li {float:left; width:100px; text-align:center; padding:3px 0; border-bottom:2px solid #ddd;}
+.homework-detail-tab li.selected {border-bottom:2px solid #f00;}
+.test-set-table, .test-set-table tr, .test-set-table th, .test-set-table td {border-collapse:collapse; text-align:left; border:1px solid #ddd; color:#484848;}
+.test-set-table th, .test-set-table td {padding:2px 5px;}
\ No newline at end of file