|
|
|
@ -497,7 +497,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
# tip_exception("challenge_id参数的长度与challenge_score参数的长度不匹配") if
|
|
|
|
|
# params[:challenge_settings][:challenge_score].length != params[:challenge_settings][:challenge_id].length
|
|
|
|
|
|
|
|
|
|
sum_challenge_score = params[:challenge_settings].pluck(:challenge_score).reject(&:blank?).map{|score| score.to_f}.sum
|
|
|
|
|
sum_challenge_score = params[:challenge_settings].pluck(:challenge_score).reject(&:blank?)&.map{|score| score.to_f}.sum
|
|
|
|
|
total_score = params[:work_efficiency] ? (params[:eff_score].to_f + sum_challenge_score) : sum_challenge_score
|
|
|
|
|
tip_exception("分值之和必须等于总分值:#{params[:total_score]}分") if params[:total_score].to_f.round(2) != total_score.to_f.round(2)
|
|
|
|
|
|
|
|
|
@ -910,7 +910,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
|
|
|
|
|
def publish_homework
|
|
|
|
|
tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
|
|
|
|
|
group_ids = params[:group_ids]&.reject(&:blank?).map(&:to_i)
|
|
|
|
|
group_ids = params[:group_ids]&.reject(&:blank?)&.map(&:to_i)
|
|
|
|
|
if params[:detail].blank?
|
|
|
|
|
tip_exception("缺少截止时间参数") if params[:end_time].blank?
|
|
|
|
|
tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
|
|
|
|
@ -918,7 +918,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
@course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
|
|
|
|
|
else
|
|
|
|
|
tip_exception("缺少分班截止时间参数") if params[:group_end_times].blank?
|
|
|
|
|
group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
|
|
|
|
|
group_end_times = params[:group_end_times].reject(&:blank?)&.map{|time| time.to_time}
|
|
|
|
|
tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
|
|
|
|
|
group_end_times.each do |time|
|
|
|
|
|
tip_exception("分班截止时间不能早于当前时间") if time <= Time.now
|
|
|
|
@ -1049,7 +1049,7 @@ class HomeworkCommonsController < ApplicationController
|
|
|
|
|
homeworks = homeworks.published_no_end.includes(:homework_group_settings, :homework_detail_manual, :homework_challenge_settings)
|
|
|
|
|
course_students = @course.students
|
|
|
|
|
charge_group_ids = @course.charge_group_ids(current_user)
|
|
|
|
|
group_ids = params[:group_ids]&.reject(&:blank?).map(&:to_i)
|
|
|
|
|
group_ids = params[:group_ids]&.reject(&:blank?)&.map(&:to_i)
|
|
|
|
|
end_groups = charge_group_ids & group_ids if group_ids
|
|
|
|
|
|
|
|
|
|
begin
|
|
|
|
|