diff --git a/app/views/student_work/_relate_project.html.erb b/app/views/student_work/_relate_project.html.erb index 43f59c9c9..9a1fcead5 100644 --- a/app/views/student_work/_relate_project.html.erb +++ b/app/views/student_work/_relate_project.html.erb @@ -4,7 +4,7 @@ <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
- +

确定
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index fe02d9882..8112bc521 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -13,7 +13,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%> - <% end %> -
截止时间:<%= activity.end_time.to_s %> 23:59
@@ -93,17 +92,26 @@
+
+
+ 匿评开启时间:<%= activity.homework_detail_manual.evaluation_start%> 00:00 +
+
+ 匿评关闭时间:<%= activity.homework_detail_manual.evaluation_end%> 23:59 +
+
+
<%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
- <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %> + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
+ <% projects = activity.student_work_projects.where("is_leader = 1") %>
- - 已关联项目: + 已关联项目:<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
- <% activity.student_work_projects.where("is_leader = 1").each do |pro| %> + <% projects.each do |pro| %> <% project = Project.find pro.project_id %>