修改代码风格

dev_course
daiao 6 years ago
parent 7172640f35
commit f8f3aefd0d

@ -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 # 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") # 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 = 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) # 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 (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 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 end
@courses_count = @courses.size @courses_count = @courses.size

@ -15,5 +15,4 @@ json.experience shixun.all_score
json.diffcult diff_to_s(shixun.trainee) json.diffcult diff_to_s(shixun.trainee)
json.score_info shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分,不用每次都去取每种星的分数了。 json.score_info shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分,不用每次都去取每种星的分数了。
# 用于是否显示导航栏中的'背景知识' # 用于是否显示导航栏中的'背景知识'
json.propaedeutics shixun.propaedeutics.present? ? true : false json.propaedeutics shixun.propaedeutics.present?

Loading…
Cancel
Save