实训作业的过滤

app/controllers/homework_commons_controller.rb

@@ -64,21 +64,25 @@ class HomeworkCommonsController < ApplicationController
     end
 
     unless order.blank?
-      case order
-      when '1'
-        sql_str = %Q(homework_detail_manuals.comment_status = #{order} and homework_commons.end_time > '#{Time.now}')
-      when '2'
-        sql_str = %Q(allow_late = 1 and homework_commons.end_time < '#{Time.now}' and (late_time is null or late_time > '#{Time.now}'))
-      when '3'
-        sql_str = %Q(homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.evaluation_end > '#{Time.now}')
-      when '4'
-        sql_str = %Q((homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.appeal_time > '#{Time.now}'))
-      when '5'
-        sql_str = %Q((homework_detail_manuals.comment_status = #{order} or (anonymous_comment = 0 and homework_commons.end_time <= '#{Time.now}')))
+      if @course.is_end
+        @homework_commons = @homework_commons.none
       else
-        sql_str = %Q(homework_detail_manuals.comment_status = #{order})
+        case order
+        when '1'
+          sql_str = %Q(homework_detail_manuals.comment_status = #{order} and homework_commons.end_time > '#{Time.now}')
+        when '2'
+          sql_str = %Q(allow_late = 1 and homework_commons.end_time < '#{Time.now}' and (late_time is null or late_time > '#{Time.now}'))
+        when '3'
+          sql_str = %Q(homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.evaluation_end > '#{Time.now}')
+        when '4'
+          sql_str = %Q((homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.appeal_time > '#{Time.now}'))
+        when '5'
+          sql_str = %Q((homework_detail_manuals.comment_status = #{order} or (anonymous_comment = 0 and homework_commons.end_time <= '#{Time.now}')))
+        else
+          sql_str = %Q(homework_detail_manuals.comment_status = #{order})
+        end
+        @homework_commons = @homework_commons.joins(:homework_detail_manual).where(sql_str)
       end
-      @homework_commons = @homework_commons.joins(:homework_detail_manual).where(sql_str)
     end
     @task_count = @homework_commons.size