|
|
|
@ -64,6 +64,9 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
unless order.blank?
|
|
|
|
|
if @course.is_end
|
|
|
|
|
@homework_commons = @homework_commons.none
|
|
|
|
|
else
|
|
|
|
|
case order
|
|
|
|
|
when '1'
|
|
|
|
|
sql_str = %Q(homework_detail_manuals.comment_status = #{order} and homework_commons.end_time > '#{Time.now}')
|
|
|
|
@ -80,6 +83,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
@homework_commons = @homework_commons.joins(:homework_detail_manual).where(sql_str)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
@task_count = @homework_commons.size
|
|
|
|
|
|
|
|
|
|
order_str = @homework_type == 4 ? "position DESC" : "IF(ISNULL(homework_commons.publish_time),0,1), homework_commons.publish_time DESC,
|
|
|
|
|