|
|
|
@ -279,8 +279,8 @@ class PollsController < ApplicationController
|
|
|
|
|
if poll.unified_setting
|
|
|
|
|
pl_status = poll.polls_status #则为试卷的状态
|
|
|
|
|
else
|
|
|
|
|
pl_status = @course.course_groups.where(id: params[:group_ids]).size !=
|
|
|
|
|
poll.poll_group_settings.where("course_group_id",params[:group_ids]).poll_group_published.size ? 1 : 0 #立即发布针对分组设置的全部未发布的班级才生效
|
|
|
|
|
pl_status = @course.course_groups.where(id: group_ids).size !=
|
|
|
|
|
poll.poll_group_settings.where("course_group_id", group_ids).poll_group_published.size ? 1 : 0 #立即发布针对分组设置的全部未发布的班级才生效
|
|
|
|
|
end
|
|
|
|
|
if pl_status == 1 #如果问卷存在已发布的,或者是已截止的,那么则直接跳过
|
|
|
|
|
g_course = group_ids #表示是否传入分班参数,如果传入分班的参数,那么poll的统一设置需修改
|
|
|
|
@ -296,8 +296,8 @@ class PollsController < ApplicationController
|
|
|
|
|
g_course.each_with_index do |i, index|
|
|
|
|
|
poll_group_setting = poll.poll_group_settings.find_in_poll_group("course_group_id",i).first #根据课堂分班的id,寻找问卷所在的班级
|
|
|
|
|
group_end_time = params[:detail] ? group_end_times[index] : ex_end_time
|
|
|
|
|
if poll_group_setting #如果该问卷分组存在,则更新,否则新建
|
|
|
|
|
poll_group_setting.update_attributes(publish_time: Time.now, end_time: group_end_time)
|
|
|
|
|
if poll_group_setting.present? #如果该问卷分组存在,则更新,否则新建
|
|
|
|
|
poll_group_setting.update_attributes!(publish_time: Time.now, end_time: group_end_time)
|
|
|
|
|
else
|
|
|
|
|
p_course_group = {
|
|
|
|
|
:poll_id => poll.id,
|
|
|
|
@ -307,7 +307,7 @@ class PollsController < ApplicationController
|
|
|
|
|
:end_time => group_end_time,
|
|
|
|
|
}
|
|
|
|
|
new_poll_group = poll.poll_group_settings.new p_course_group
|
|
|
|
|
new_poll_group.save
|
|
|
|
|
new_poll_group.save!
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
e_time = poll.poll_group_settings.end_time_present.map(&:end_time).max
|
|
|
|
|