@ -3187,9 +3187,6 @@ class UsersController < ApplicationController
sort_name = " updated_at "
sort_name = " updated_at "
sort_type = @c_sort == 1 ? " asc " : " desc "
sort_type = @c_sort == 1 ? " asc " : " desc "
# @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}")
#@courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}")
@courses = @user . courses . visible . where ( " is_delete =? " , 0 )
@courses = @user . courses . visible . where ( " is_delete =? " , 0 )
syllabus_ids = @courses . empty? ? '(-1)' : " ( " + @courses . map { | course | ! course . syllabus_id . nil? && course . syllabus_id } . join ( " , " ) + " ) "
syllabus_ids = @courses . empty? ? '(-1)' : " ( " + @courses . map { | course | ! course . syllabus_id . nil? && course . syllabus_id } . join ( " , " ) + " ) "
@syllabus = Syllabus . where ( " id in #{ syllabus_ids } or user_id = #{ User . current . id } " ) . order ( " #{ sort_name } #{ sort_type } " )
@syllabus = Syllabus . where ( " id in #{ syllabus_ids } or user_id = #{ User . current . id } " ) . order ( " #{ sort_name } #{ sort_type } " )
@ -3197,12 +3194,6 @@ class UsersController < ApplicationController
#根据 作业+资源数排序
#根据 作业+资源数排序
if @order . to_i == 2
if @order . to_i == 2
@type = 2
@type = 2
# @courses.each do |course|
# course[:infocount] = (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) ? (course.homework_commons.count + visable_attachemnts_incourse(course).count) : (course.homework_commons.where("publish_time <= '#{Date.today}'").count + visable_attachemnts_incourse(course).count)
# if course[:infocount] < 0
# course[:infocount] = 0
# end
# end
@syllabus . each do | syllabus |
@syllabus . each do | syllabus |
count = 0
count = 0
courses = @courses . where ( " syllabus_id = #{ syllabus . id } " )
courses = @courses . where ( " syllabus_id = #{ syllabus . id } " )