|
|
|
@ -26,6 +26,12 @@ class CourseVideosController < ApplicationController
|
|
|
|
|
|
|
|
|
|
@watch_course_videos = course_video.watch_course_videos.includes(:user, :watch_video_histories).where("end_at IS NOT NULL")
|
|
|
|
|
@count = @watch_course_videos.count
|
|
|
|
|
|
|
|
|
|
if params[:group_id].present?
|
|
|
|
|
@watch_course_videos = @watch_course_videos.joins("
|
|
|
|
|
JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id}
|
|
|
|
|
").where("course_members.course_group_id = ?", params[:group_id])
|
|
|
|
|
end
|
|
|
|
|
@watch_course_videos = paginate @watch_course_videos
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|