|
|
@ -109,11 +109,11 @@ class ZipsController < ApplicationController
|
|
|
|
work_status = params[:work_status]
|
|
|
|
work_status = params[:work_status]
|
|
|
|
group_id = params[:course_group]
|
|
|
|
group_id = params[:course_group]
|
|
|
|
|
|
|
|
|
|
|
|
if work_status.present?
|
|
|
|
unless work_status.blank?
|
|
|
|
@all_student_works = @all_student_works.where(work_status:work_status)
|
|
|
|
@all_student_works = @all_student_works.where(work_status:work_status)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if group_id.present?
|
|
|
|
unless group_id.blank?
|
|
|
|
group_user_ids = @course.students.where(course_group_id: params[:course_group]).pluck(:user_id)
|
|
|
|
group_user_ids = @course.students.where(course_group_id: params[:course_group]).pluck(:user_id)
|
|
|
|
@all_student_works = @all_student_works.where(user_id: group_user_ids)
|
|
|
|
@all_student_works = @all_student_works.where(user_id: group_user_ids)
|
|
|
|
end
|
|
|
|
end
|
|
|
|