|
|
@ -208,13 +208,13 @@ class ExercisesController < ApplicationController
|
|
|
|
@ex_status = @exercise.get_exercise_status(current_user)
|
|
|
|
@ex_status = @exercise.get_exercise_status(current_user)
|
|
|
|
|
|
|
|
|
|
|
|
exercise_id_array = [@exercise.id]
|
|
|
|
exercise_id_array = [@exercise.id]
|
|
|
|
@exercise_publish_count = get_user_permission_course(exercise_id_array,2).size #是否存在已发布的
|
|
|
|
@exercise_publish_count = get_user_permission_course(exercise_id_array,Exercise::PUBLISHED).size #是否存在已发布的
|
|
|
|
@exercise_unpublish_count = get_user_permission_course(exercise_id_array,1).size #是否存在未发布的
|
|
|
|
@exercise_unpublish_count = get_user_permission_course(exercise_id_array,Exercise::UNPUBLISHED).size #是否存在未发布的
|
|
|
|
|
|
|
|
|
|
|
|
if (@exercise_publish_count == 0) && (@exercise_unpublish_count == 0) #即表示没有分班
|
|
|
|
if (@exercise_publish_count == 0) && (@exercise_unpublish_count == 0) #即表示没有分班
|
|
|
|
if @ex_status == 1
|
|
|
|
if @ex_status == Exercise::UNPUBLISHED
|
|
|
|
@exercise_unpublish_count = 1 #试卷未发布,且课堂没有分班的时候
|
|
|
|
@exercise_unpublish_count = 1 #试卷未发布,且课堂没有分班的时候
|
|
|
|
elsif @ex_status == 2
|
|
|
|
elsif @ex_status == Exercise::PUBLISHED
|
|
|
|
@exercise_publish_count = 1 #试卷未发布,且课堂没有分班的时候
|
|
|
|
@exercise_publish_count = 1 #试卷未发布,且课堂没有分班的时候
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -368,7 +368,7 @@ class ExercisesController < ApplicationController
|
|
|
|
exercise_bank_question = current_ex_bank.exercise_bank_questions.new option
|
|
|
|
exercise_bank_question = current_ex_bank.exercise_bank_questions.new option
|
|
|
|
exercise_bank_question.save
|
|
|
|
exercise_bank_question.save
|
|
|
|
## 试卷选项的输入
|
|
|
|
## 试卷选项的输入
|
|
|
|
if q.question_type != 5 #不为实训题时,试卷选项加入试题答案库
|
|
|
|
if q.question_type != Exercise::PRACTICAL #不为实训题时,试卷选项加入试题答案库
|
|
|
|
ex_choices = q.exercise_choices
|
|
|
|
ex_choices = q.exercise_choices
|
|
|
|
ex_standard = q.exercise_standard_answers
|
|
|
|
ex_standard = q.exercise_standard_answers
|
|
|
|
ex_choices.each do |c|
|
|
|
|
ex_choices.each do |c|
|
|
|
@ -422,8 +422,8 @@ class ExercisesController < ApplicationController
|
|
|
|
@user_published_setting = @exercise.exercise_group_settings
|
|
|
|
@user_published_setting = @exercise.exercise_group_settings
|
|
|
|
.find_in_exercise_group("course_group_id",@being_setting_course_ids) #当前用户已发布班级的试卷设置
|
|
|
|
.find_in_exercise_group("course_group_id",@being_setting_course_ids) #当前用户已发布班级的试卷设置
|
|
|
|
exercise_ids = [@exercise.id]
|
|
|
|
exercise_ids = [@exercise.id]
|
|
|
|
@exercise_publish_count = get_user_permission_course(exercise_ids,2).count #判断当前用户是否有试卷已发布的分班,用于显示立即截止/撤销发布
|
|
|
|
@exercise_publish_count = get_user_permission_course(exercise_ids,Exercise::PUBLISHED).count #判断当前用户是否有试卷已发布的分班,用于显示立即截止/撤销发布
|
|
|
|
@exercise_unpublish_count = get_user_permission_course(exercise_ids,1).count #判断当前用户是否有试卷未发布的分班,用户显示立即发布
|
|
|
|
@exercise_unpublish_count = get_user_permission_course(exercise_ids,Exercise::UNPUBLISHED).count #判断当前用户是否有试卷未发布的分班,用户显示立即发布
|
|
|
|
@exercise_users_count = @exercise.exercise_users.commit_exercise_by_status(1).count #判断当前试卷是否有已提交的
|
|
|
|
@exercise_users_count = @exercise.exercise_users.commit_exercise_by_status(1).count #判断当前试卷是否有已提交的
|
|
|
|
# ## 需添加发送消息的接口,稍后添加
|
|
|
|
# ## 需添加发送消息的接口,稍后添加
|
|
|
|
rescue Exception => e
|
|
|
|
rescue Exception => e
|
|
|
@ -444,7 +444,7 @@ class ExercisesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
exercise_status = @exercise.get_exercise_status(current_user)
|
|
|
|
exercise_status = @exercise.get_exercise_status(current_user)
|
|
|
|
|
|
|
|
|
|
|
|
if exercise_status == 1 && course_group_ids.size > 0 # 试卷未发布,且老师的分班大于1 ,才可以修改统一设置,否则按试卷默认的来处理
|
|
|
|
if exercise_status == Exercise::UNPUBLISHED && course_group_ids.size > 0 # 试卷未发布,且老师的分班大于1 ,才可以修改统一设置,否则按试卷默认的来处理
|
|
|
|
unified_setting = params[:unified_setting]
|
|
|
|
unified_setting = params[:unified_setting]
|
|
|
|
else
|
|
|
|
else
|
|
|
|
unified_setting = @exercise.unified_setting
|
|
|
|
unified_setting = @exercise.unified_setting
|
|
|
@ -469,7 +469,7 @@ class ExercisesController < ApplicationController
|
|
|
|
params_end_time = params[:end_time].to_time
|
|
|
|
params_end_time = params[:end_time].to_time
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if (exercise_status != 1) && (@exercise.publish_time != params_publish_time)
|
|
|
|
if (exercise_status != Exercise::UNPUBLISHED) && (@exercise.publish_time != params_publish_time)
|
|
|
|
normal_status(-1,"已发布/已截止,不允许修改发布时间")
|
|
|
|
normal_status(-1,"已发布/已截止,不允许修改发布时间")
|
|
|
|
elsif params_publish_time.present? && params_end_time.present? && params_end_time < params_publish_time
|
|
|
|
elsif params_publish_time.present? && params_end_time.present? && params_end_time < params_publish_time
|
|
|
|
normal_status(-1,"截止时间不能小于发布时间")
|
|
|
|
normal_status(-1,"截止时间不能小于发布时间")
|
|
|
@ -590,7 +590,7 @@ class ExercisesController < ApplicationController
|
|
|
|
:end_time => e_time
|
|
|
|
:end_time => e_time
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@exercise.update_attributes(exercise_params)
|
|
|
|
@exercise.update_attributes(exercise_params)
|
|
|
|
if @exercise.exercise_status == 2
|
|
|
|
if @exercise.exercise_status == Exercise::PUBLISHED
|
|
|
|
if @exercise.course_acts.size == 0
|
|
|
|
if @exercise.course_acts.size == 0
|
|
|
|
@exercise.course_acts << CourseActivity.new(:user_id => @exercise.user_id,:course_id => @exercise.course_id)
|
|
|
|
@exercise.course_acts << CourseActivity.new(:user_id => @exercise.user_id,:course_id => @exercise.course_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -784,15 +784,9 @@ class ExercisesController < ApplicationController
|
|
|
|
course_students = @course.students #课堂的全部学生数
|
|
|
|
course_students = @course.students #课堂的全部学生数
|
|
|
|
check_ids.each do |exercise|
|
|
|
|
check_ids.each do |exercise|
|
|
|
|
exercise_status= exercise.get_exercise_status(current_user)
|
|
|
|
exercise_status= exercise.get_exercise_status(current_user)
|
|
|
|
if exercise_status == 2 #跳过已截止的或未发布的
|
|
|
|
if exercise_status == Exercise::PUBLISHED #跳过已截止的或未发布的
|
|
|
|
g_course = params[:group_ids]
|
|
|
|
g_course = params[:group_ids]
|
|
|
|
if g_course.present?
|
|
|
|
if g_course.present?
|
|
|
|
# user_course_groups= @course.teacher_course_groups.get_user_groups(current_user.id)
|
|
|
|
|
|
|
|
# if user_course_groups.present?
|
|
|
|
|
|
|
|
# teacher_course_group_ids = user_course_groups.pluck(:course_group_id)
|
|
|
|
|
|
|
|
# else
|
|
|
|
|
|
|
|
# teacher_course_group_ids = @course.course_groups.pluck(:id)
|
|
|
|
|
|
|
|
# end
|
|
|
|
|
|
|
|
teacher_course_group_ids = @course.charge_group_ids(current_user)
|
|
|
|
teacher_course_group_ids = @course.charge_group_ids(current_user)
|
|
|
|
if g_course.map(&:to_i).sort == teacher_course_group_ids.sort #开始为统一设置
|
|
|
|
if g_course.map(&:to_i).sort == teacher_course_group_ids.sort #开始为统一设置
|
|
|
|
exercise.exercise_group_settings.destroy_all
|
|
|
|
exercise.exercise_group_settings.destroy_all
|
|
|
@ -878,7 +872,7 @@ class ExercisesController < ApplicationController
|
|
|
|
ex_question_ids = @exercise.exercise_questions.pluck(:id)
|
|
|
|
ex_question_ids = @exercise.exercise_questions.pluck(:id)
|
|
|
|
exercise_user = @exercise.exercise_users.exercise_commit_users(current_user.id).first
|
|
|
|
exercise_user = @exercise.exercise_users.exercise_commit_users(current_user.id).first
|
|
|
|
if exercise_user.present?
|
|
|
|
if exercise_user.present?
|
|
|
|
if exercise_user.commit_status == 1 && @exercise.get_exercise_status(current_user) == 2 #用户已提交且试卷提交中
|
|
|
|
if exercise_user.commit_status == 1 && @exercise.get_exercise_status(current_user) == Exercise::PUBLISHED #用户已提交且试卷提交中
|
|
|
|
if @exercise.time == -1 || ((Time.now.to_i - exercise_user.start_at.to_i) < @exercise.time.to_i * 60)
|
|
|
|
if @exercise.time == -1 || ((Time.now.to_i - exercise_user.start_at.to_i) < @exercise.time.to_i * 60)
|
|
|
|
exercise_user.update_attributes(:score => nil, :end_at => nil, :status => nil, :commit_status => 0,
|
|
|
|
exercise_user.update_attributes(:score => nil, :end_at => nil, :status => nil, :commit_status => 0,
|
|
|
|
:objective_score => 0.0, :subjective_score => -1.0)
|
|
|
|
:objective_score => 0.0, :subjective_score => -1.0)
|
|
|
@ -976,12 +970,9 @@ class ExercisesController < ApplicationController
|
|
|
|
def start_answer
|
|
|
|
def start_answer
|
|
|
|
ActiveRecord::Base.transaction do
|
|
|
|
ActiveRecord::Base.transaction do
|
|
|
|
begin
|
|
|
|
begin
|
|
|
|
ex_users_current = @exercise.exercise_users.exercise_commit_users(@exercise_current_user_id)
|
|
|
|
ex_users_current = ExerciseUser.where(user_id:@exercise_current_user_id,exercise_id:@exercise_id) #不能用@exercise.exercise_users,因为exercise_users删除时,只是状态改变,未删除
|
|
|
|
@exercise_user_current = ex_users_current&.first
|
|
|
|
@exercise_user_current = ex_users_current&.first
|
|
|
|
logger.info("############______________ex_users_current________#######{ex_users_current.pluck(:user_id,:exercise_id)}")
|
|
|
|
|
|
|
|
if ex_users_current.exists?
|
|
|
|
if ex_users_current.exists?
|
|
|
|
logger.info("############______________ex_users_current_exists?________#########################")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if @exercise_user_current.start_at.blank?
|
|
|
|
if @exercise_user_current.start_at.blank?
|
|
|
|
@exercise_user_current.update_attribute("start_at",Time.now)
|
|
|
|
@exercise_user_current.update_attribute("start_at",Time.now)
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -1020,7 +1011,7 @@ class ExercisesController < ApplicationController
|
|
|
|
:exercise_answers,
|
|
|
|
:exercise_answers,
|
|
|
|
:exercise_standard_answers)
|
|
|
|
:exercise_standard_answers)
|
|
|
|
|
|
|
|
|
|
|
|
if @t_user_exercise_status == 3
|
|
|
|
if @t_user_exercise_status == Exercise::DEADLINE
|
|
|
|
get_each_student_exercise(@exercise.id,@exercise_questions,@exercise_current_user_id)
|
|
|
|
get_each_student_exercise(@exercise.id,@exercise_questions,@exercise_current_user_id)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
get_user_answer_status(@exercise_questions,@exercise_current_user_id,@exercise,@t_user_exercise_status)
|
|
|
|
get_user_answer_status(@exercise_questions,@exercise_current_user_id,@exercise,@t_user_exercise_status)
|
|
|
@ -1051,9 +1042,9 @@ class ExercisesController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
@exercise_questions.each do |q|
|
|
|
|
@exercise_questions.each do |q|
|
|
|
|
if q.question_type == 5 #当为实训题时
|
|
|
|
if q.question_type == Exercise::PRACTICAL #当为实训题时
|
|
|
|
user_myshixun = q.shixun.myshixuns.search_myshixun_user(current_user.id)
|
|
|
|
user_myshixun = q.shixun.myshixuns.search_myshixun_user(current_user.id)
|
|
|
|
if user_myshixun.blank? || user_myshixun.first.status != 1 #当前用户的实训是否做完
|
|
|
|
if user_myshixun.blank? || user_myshixun.first.status != Exercise::UNPUBLISHED #当前用户的实训是否做完
|
|
|
|
@shixun_undo += 1
|
|
|
|
@shixun_undo += 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -1163,7 +1154,7 @@ class ExercisesController < ApplicationController
|
|
|
|
#试卷的答题列表页的显示用户
|
|
|
|
#试卷的答题列表页的显示用户
|
|
|
|
if @user_course_identity < Course::STUDENT #当前为老师,而且老师只能查看自己班级的/课堂的试卷
|
|
|
|
if @user_course_identity < Course::STUDENT #当前为老师,而且老师只能查看自己班级的/课堂的试卷
|
|
|
|
@exercise_current_user_status = 0
|
|
|
|
@exercise_current_user_status = 0
|
|
|
|
unless @exercise_status == 1
|
|
|
|
unless @exercise_status == Exercise::UNPUBLISHED
|
|
|
|
ex_common_ids = @exercise.common_published_ids(current_user.id)
|
|
|
|
ex_common_ids = @exercise.common_published_ids(current_user.id)
|
|
|
|
@exercise_course_groups = @course.get_ex_published_course(ex_common_ids)
|
|
|
|
@exercise_course_groups = @course.get_ex_published_course(ex_common_ids)
|
|
|
|
@exercise_users_list = @exercise.all_exercise_users(current_user.id) #当前老师所在班级的全部学生
|
|
|
|
@exercise_users_list = @exercise.all_exercise_users(current_user.id) #当前老师所在班级的全部学生
|
|
|
@ -1176,7 +1167,7 @@ class ExercisesController < ApplicationController
|
|
|
|
exercise_current_user = @exercise_all_users.exercise_commit_users(current_user.id)
|
|
|
|
exercise_current_user = @exercise_all_users.exercise_commit_users(current_user.id)
|
|
|
|
if exercise_current_user.exists? #表示为课堂学生或已回答的
|
|
|
|
if exercise_current_user.exists? #表示为课堂学生或已回答的
|
|
|
|
@exercise_current_user_status = 1
|
|
|
|
@exercise_current_user_status = 1
|
|
|
|
if @exercise.score_open && @exercise_status == 3 #勾选了成绩公开且试卷已截止的
|
|
|
|
if @exercise.score_open && @exercise_status == Exercise::DEADLINE #勾选了成绩公开且试卷已截止的
|
|
|
|
all_user_ids = @exercise_all_users.pluck(:user_id)
|
|
|
|
all_user_ids = @exercise_all_users.pluck(:user_id)
|
|
|
|
all_user_ids.delete(current_user.id) #删除了当前用户的ID
|
|
|
|
all_user_ids.delete(current_user.id) #删除了当前用户的ID
|
|
|
|
@exercise_users_list = @exercise_all_users.exercise_commit_users(all_user_ids).distinct
|
|
|
|
@exercise_users_list = @exercise_all_users.exercise_commit_users(all_user_ids).distinct
|
|
|
@ -1468,32 +1459,32 @@ class ExercisesController < ApplicationController
|
|
|
|
@exercise_ques_scores = exercise_questions.pluck(:question_score).sum
|
|
|
|
@exercise_ques_scores = exercise_questions.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
#单选题的数量及分数
|
|
|
|
#单选题的数量及分数
|
|
|
|
exercise_single_ques = exercise_questions.find_by_custom("question_type",0)
|
|
|
|
exercise_single_ques = exercise_questions.find_by_custom("question_type",Exercise::SINGLE)
|
|
|
|
@exercise_single_ques_count = exercise_single_ques.size
|
|
|
|
@exercise_single_ques_count = exercise_single_ques.size
|
|
|
|
@exercise_single_ques_scores = exercise_single_ques.pluck(:question_score).sum
|
|
|
|
@exercise_single_ques_scores = exercise_single_ques.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
#多选题的数量及分数
|
|
|
|
#多选题的数量及分数
|
|
|
|
exercise_double_ques = exercise_questions.find_by_custom("question_type",1)
|
|
|
|
exercise_double_ques = exercise_questions.find_by_custom("question_type",Exercise::MULTIPLE)
|
|
|
|
@exercise_double_ques_count = exercise_double_ques.size
|
|
|
|
@exercise_double_ques_count = exercise_double_ques.size
|
|
|
|
@exercise_double_ques_scores = exercise_double_ques.pluck(:question_score).sum
|
|
|
|
@exercise_double_ques_scores = exercise_double_ques.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
# 判断题数量及分数
|
|
|
|
# 判断题数量及分数
|
|
|
|
exercise_ques_judge = exercise_questions.find_by_custom("question_type",2)
|
|
|
|
exercise_ques_judge = exercise_questions.find_by_custom("question_type",Exercise::JUDGMENT)
|
|
|
|
@exercise_ques_judge_count = exercise_ques_judge.size
|
|
|
|
@exercise_ques_judge_count = exercise_ques_judge.size
|
|
|
|
@exercise_ques_judge_scores = exercise_ques_judge.pluck(:question_score).sum
|
|
|
|
@exercise_ques_judge_scores = exercise_ques_judge.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
#填空题数量及分数
|
|
|
|
#填空题数量及分数
|
|
|
|
exercise_ques_null = exercise_questions.find_by_custom("question_type",3)
|
|
|
|
exercise_ques_null = exercise_questions.find_by_custom("question_type",Exercise::COMPLETION)
|
|
|
|
@exercise_ques_null_count = exercise_ques_null.size
|
|
|
|
@exercise_ques_null_count = exercise_ques_null.size
|
|
|
|
@exercise_ques_null_scores = exercise_ques_null.pluck(:question_score).sum
|
|
|
|
@exercise_ques_null_scores = exercise_ques_null.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
#简答题数量及分数
|
|
|
|
#简答题数量及分数
|
|
|
|
exercise_ques_main = exercise_questions.find_by_custom("question_type",4)
|
|
|
|
exercise_ques_main = exercise_questions.find_by_custom("question_type",Exercise::SUBJECTIVE)
|
|
|
|
@exercise_ques_main_count = exercise_ques_main.size
|
|
|
|
@exercise_ques_main_count = exercise_ques_main.size
|
|
|
|
@exercise_ques_main_scores = exercise_ques_main.pluck(:question_score).sum
|
|
|
|
@exercise_ques_main_scores = exercise_ques_main.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
|
#实训题数量及分数
|
|
|
|
#实训题数量及分数
|
|
|
|
exercise_ques_shixun = exercise_questions.find_by_custom("question_type",5)
|
|
|
|
exercise_ques_shixun = exercise_questions.find_by_custom("question_type",Exercise::PRACTICAL)
|
|
|
|
@exercise_ques_shixun_count = exercise_ques_shixun.size
|
|
|
|
@exercise_ques_shixun_count = exercise_ques_shixun.size
|
|
|
|
@exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
|
|
|
|
@exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
|
|
|
|
|
|
|
|
|
|
|
@ -1576,7 +1567,7 @@ class ExercisesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
## 判断开始答题页面的用户权限
|
|
|
|
## 判断开始答题页面的用户权限
|
|
|
|
def check_user_on_answer
|
|
|
|
def check_user_on_answer
|
|
|
|
if @user_course_identity == Course::STUDENT && @exercise.get_exercise_status(current_user) == 1 #试卷未发布,且当前用户不为老师/管理员
|
|
|
|
if @user_course_identity == Course::STUDENT && @exercise.get_exercise_status(current_user) == Exercise::UNPUBLISHED #试卷未发布,且当前用户不为老师/管理员
|
|
|
|
normal_status(-1, "未发布试卷!")
|
|
|
|
normal_status(-1, "未发布试卷!")
|
|
|
|
elsif @user_course_identity > Course::STUDENT && (!@exercise.is_public || (@exercise.is_public && !@exercise.unified_setting)) ##不为课堂成员,且试卷不为公开的,或试卷公开,但不是统一设置的
|
|
|
|
elsif @user_course_identity > Course::STUDENT && (!@exercise.is_public || (@exercise.is_public && !@exercise.unified_setting)) ##不为课堂成员,且试卷不为公开的,或试卷公开,但不是统一设置的
|
|
|
|
normal_status(-1, "试卷暂未公开!")
|
|
|
|
normal_status(-1, "试卷暂未公开!")
|
|
|
@ -1593,7 +1584,7 @@ class ExercisesController < ApplicationController
|
|
|
|
#打回重做时的初步判断
|
|
|
|
#打回重做时的初步判断
|
|
|
|
def check_exercise_status
|
|
|
|
def check_exercise_status
|
|
|
|
@exercise_users = @exercise.all_exercise_users(current_user.id).commit_exercise_by_status(1) #当前教师所在分班的全部已提交的学生数
|
|
|
|
@exercise_users = @exercise.all_exercise_users(current_user.id).commit_exercise_by_status(1) #当前教师所在分班的全部已提交的学生数
|
|
|
|
if @exercise.get_exercise_status(current_user) != 2
|
|
|
|
if @exercise.get_exercise_status(current_user) != Exercise::PUBLISHED
|
|
|
|
normal_status(-1,"非提交中的试卷不允许打回重做!")
|
|
|
|
normal_status(-1,"非提交中的试卷不允许打回重做!")
|
|
|
|
elsif @exercise_users.count < 1
|
|
|
|
elsif @exercise_users.count < 1
|
|
|
|
normal_status(-1,"暂无人提交试卷!")
|
|
|
|
normal_status(-1,"暂无人提交试卷!")
|
|
|
|