Merge branch 'dev_course' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_course

dev_course
jingquan huang 6 years ago
commit fe08437d76

@ -44,8 +44,8 @@ class StudentWorksController < ApplicationController
# 统一设置的作业取所有学生,否则取已发布的分班学生 # 统一设置的作业取所有学生,否则取已发布的分班学生
students = @homework.unified_setting? ? @course.students : @course.students.where(course_group_id: @homework.published_settings.pluck(:course_group_id)) students = @homework.unified_setting? ? @course.students : @course.students.where(course_group_id: @homework.published_settings.pluck(:course_group_id))
unless params[:search].blank? unless params[:search].blank?
@members = students.joins(:user).where("user_id != #{current_user.id} and @members = students.joins(user: :user_extensions).where("user_id != #{current_user.id} and (concat(users.lastname, users.firstname)
concat(users.lastname, users.firstname) like ?", "%#{params[:search]}%") like ? or user_extensions.student_id like ?)", "%#{params[:search]}%", "%#{params[:search]}%")
else else
# 没有搜索条件时搜索课堂所有未提交的学生 # 没有搜索条件时搜索课堂所有未提交的学生

@ -9,10 +9,6 @@ class UsersController < ApplicationController
@user = User.find params[:id] @user = User.find params[:id]
@user.update!(user_params) @user.update!(user_params)
render_ok render_ok
rescue Exception => e
uid_logger_error(e.message)
tip_exception(e.message)
raise ActiveRecord::Rollback
end end
# 贴吧获取用户信接口 # 贴吧获取用户信接口
@ -69,21 +65,24 @@ class UsersController < ApplicationController
# 用户回复功能 # 用户回复功能
def reply_message def reply_message
@message = JournalsForMessage.new(reply_message_params) message = JournalsForMessage.new(reply_message_params)
@message.user_id = current_user.id message.user_id = current_user.id
@message.save! message.save!
#normal_status("回复成功")
render_ok(id: message.id)
end end
# 搜索用户具有管理员角色的项目 # 搜索用户具有管理员角色的项目
def search_user_projects def search_user_projects
condition = '%%' projects = Project.where.not(status: 9)
condition = "%#{params[:search].strip}%".gsub(" ","") if !params[:search].blank?
projects = projects.joins(members: :member_roles).where(member_roles: { role_id: 3 })
projects = projects.where(members: { user_id: current_user.id })
search = params[:search].to_s.strip
projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
project_ids = Project.find_by_sql("SELECT p.id FROM projects p, members m, member_roles mr WHERE m.project_id = p.id @projects = projects.select(:id, :name)
AND m.id=mr.member_id AND mr.role_id = 3 AND m.user_id=#{current_user.id} AND p.status != 9 and
p.name like '#{condition}'")
@projects = Project.where(id: project_ids.pluck(:id))
end end
# 个人主页信息 # 个人主页信息

@ -67,41 +67,75 @@ class ExercisePublishTask
end end
def end def end
exercises = Exercise.where("end_time <=? and exercise_status = 2",Time.now) exercises = Exercise.where("end_time <= ? and exercise_status = ?",Time.now,2)
exercises.each do |exercise| exercises.each do |exercise|
course = exercise.course course = exercise.course
exercise.update_column('exercise_status', 3) ex_type = exercise.exercise_questions.pluck(:question_type).uniq
exercise.update_attribute('exercise_status', 3)
exercise.exercise_users.each do |exercise_user| exercise.exercise_users.each do |exercise_user|
if exercise_user.commit_status == 0 && !exercise_user.start_at.nil? if exercise_user.commit_status == 0 && !exercise_user.start_at.nil?
exercise_user.update_attributes(:commit_status => 1, :end_at => Time.now, :status => true) # exercise_user.update_attributes(:commit_status => 1, :end_at => Time.now, :status => true)
s_score = calculate_student_score(exercise, exercise_user.user)[:total_score] s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
exercise_user.update_attributes(:objective_score => s_score, :score => (s_score + (exercise_user.subjective_score && exercise_user.subjective_score > 0 ? exercise_user.subjective_score : 0))) if ex_type.include?(4) #是否包含主观题
if exercise_user.user.exercise_answers.where(:exercise_question_id => exercise.exercise_questions.where(:question_type => 4).map(&:id)).empty? subjective_score = exercise_user.subjective_score
exercise_user.update_attributes(:subjective_score => 0) else
subjective_score = -1.0
end end
# subjective_score = exercise_user.subjective_score
total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
total_score = s_score + total_score_subjective_score
commit_option = {
:status => 1,
:commit_status => 1,
:end_at => Time.now,
:objective_score => s_score,
:score => total_score,
:subjective_score => subjective_score
}
exercise_user.update_attributes(commit_option)
# if exercise_user.user.exercise_answers.where(:exercise_question_id => exercise.exercise_questions.where(:question_type => 4).map(&:id)).empty?
# exercise_user.update_attributes(:subjective_score => 0)
# end
end end
end end
end end
all_exercises = Exercise.where("end_time > ? and exercise_status = 2",Time.now) all_exercises = Exercise.where("end_time > ? and exercise_status = ?",Time.now,2)
exercise_ids = all_exercises.blank? ? "(-1)" : "(" + all_exercises.map(&:id).join(",") + ")" exercise_ids = all_exercises.blank? ? "(-1)" : "(" + all_exercises.map(&:id).join(",") + ")"
ExerciseGroupSetting.where("end_time <= '#{Time.now}' and exercise_id in #{exercise_ids}").each do |exercise_setting| ex_group_settings = ExerciseGroupSetting.where("end_time <= '#{Time.now}' and exercise_id in #{exercise_ids}")
ex_group_settings.each do |exercise_setting|
exercise = exercise_setting.exercise exercise = exercise_setting.exercise
ex_types = exercise.exercise_questions.pluck(:question_type).uniq
users = exercise.course.students.where(:course_group_id => exercise_setting.course_group_id) users = exercise.course.students.where(:course_group_id => exercise_setting.course_group_id)
exercise_users = exercise.exercise_users.where(:user_id => users.map(&:user_id)) exercise_users = exercise.exercise_users.where(:user_id => users.map(&:user_id))
exercise_users.each do |exercise_user| exercise_users.each do |exercise_user|
if exercise_user.commit_status == 0 && !exercise_user.start_at.nil? if exercise_user.commit_status == 0 && !exercise_user.start_at.nil?
exercise_user.update_attributes(:commit_status => 1, :end_at => Time.now, :status => true) if ex_types.include?(4) #是否包含主观题
subjective_score = exercise_user.subjective_score
s_score = calculate_student_score(exercise, exercise_user.user)[:total_score] else
exercise_user.update_attributes(:objective_score => s_score, :score => (s_score + (exercise_user.subjective_score && exercise_user.subjective_score > 0 ? exercise_user.subjective_score : 0))) subjective_score = -1.0
if exercise_user.user.exercise_answers.where(:exercise_question_id => exercise.exercise_questions.where(:question_type => 4).map(&:id)).empty?
exercise_user.update_attributes(:subjective_score => 0)
end end
s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
# subjective_score = exercise_user.subjective_score
total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
total_score = s_score + total_score_subjective_score
commit_option = {
:status => 1,
:commit_status => 1,
:end_at => Time.now,
:objective_score => s_score,
:score => total_score,
:subjective_score => subjective_score
}
exercise_user.update_attributes(commit_option)
# exercise_user.update_attributes(:commit_status => 1, :end_at => Time.now, :status => true)
# s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
# exercise_user.update_attributes(:objective_score => s_score, :score => (s_score + (exercise_user.subjective_score && exercise_user.subjective_score > 0 ? exercise_user.subjective_score : 0)))
# if exercise_user.user.exercise_answers.where(:exercise_question_id => exercise.exercise_questions.where(:question_type => 4).map(&:id)).empty?
# exercise_user.update_attributes(:subjective_score => 0.0)
# end
end end
end end
end end

Loading…
Cancel
Save