jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

若测验已截止且学生已提交则在测验列表后面显示“已答”

This commit is contained in:
cxt 2015-12-15 15:37:57 +08:00
parent 0deffdba33
commit 0215e5e38c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/exercise_controller.rb
View File

@ -27,7 +27,7 @@ class ExerciseController < ApplicationController
if @is_teacher || User.current.admin? if @is_teacher || User.current.admin?
exercises = @course.exercises.order("created_at asc") exercises = @course.exercises.order("created_at asc")
else else
exercises = @course.exercises.where("exercise_status <> 1 ").order("created_at asc") exercises = @course.exercises.where("exercise_status <> 1").order("created_at asc")
end end
@exercises = paginateHelper exercises,20 #分页 @exercises = paginateHelper exercises,20 #分页
respond_to do |format| respond_to do |format|

3
app/views/exercise/_exercise.html.erb
View File

@ -57,6 +57,9 @@
<li class="pollsbtn_tip fl ml5">已答</li--> <li class="pollsbtn_tip fl ml5">已答</li-->
<%#else%> <%#else%>
<%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
<% if exercise.end_time <= Time.now && has_commit_exercise?(exercise.id, User.current.id) %>
<li class="pollsbtn_tip fl ml5">已答</li>
<% end %>
<%#end%> <%#end%>
<% end%> <% end%>
<li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li> <li class="polls_date fr mr10">截止时间：<%= format_time(exercise.end_time.to_s)%></li>