|
|
|
@ -52,7 +52,9 @@ class CoursesController < ApplicationController
|
|
|
|
|
# u.login), s.name from courses c, users u, user_extensions ue, schools s where c.is_delete=0 and
|
|
|
|
|
# c.tea_id=u.id and u.id=ue.user_id and ue.school_id=s.id")
|
|
|
|
|
|
|
|
|
|
@courses = Course.where(is_delete: 0, is_hidden: 0).includes(:course_modules, :course_members, teacher: [user_extension: :school]).order("courses.id = 1309 desc, courses.created_at desc")
|
|
|
|
|
@courses = Course.where(is_delete: 0, is_hidden: 0)
|
|
|
|
|
.includes(:course_modules, :course_members, teacher: [user_extension: :school])
|
|
|
|
|
.order("courses.id = 1309 desc, courses.created_at desc")
|
|
|
|
|
|
|
|
|
|
# @courses = Course.where(is_delete: 0, is_hidden: 0).select("courses.id, courses.tea_id, courses.name, courses.exercises_count, courses.polls_count,
|
|
|
|
|
# courses.is_public, courses.is_end, courses.visits, courses.course_members_count,courses.homework_commons_count,(SELECT MAX(created_at)
|
|
|
|
@ -87,7 +89,8 @@ class CoursesController < ApplicationController
|
|
|
|
|
(course_members.role in(1,2,3) and CONCAT(users.lastname, users.firstname) like :keyword) or courses.name like :keyword
|
|
|
|
|
or schools.name like :keyword
|
|
|
|
|
}
|
|
|
|
|
@courses = @courses.joins(course_members: [user: [user_extension: :school]]).where("#{sql}", keyword: "%#{params[:search]}%").distinct
|
|
|
|
|
@courses = @courses.joins(course_members: [user: [user_extension: :school]])
|
|
|
|
|
.where("#{sql}", keyword: "%#{params[:search]}%").distinct
|
|
|
|
|
end
|
|
|
|
|
@courses_count = @courses.size
|
|
|
|
|
|
|
|
|
|