导出问卷加入分班信息

dev_sync_trustie
daiao 5 years ago
parent 625c7fd7b5
commit 94d83f82d7

@ -1363,7 +1363,7 @@ class PollsController < ApplicationController
poll_ques_titles = poll_questions.pluck(:question_title).map {|k| ActionController::Base.helpers.strip_tags(k) if k.present?} poll_ques_titles = poll_questions.pluck(:question_title).map {|k| ActionController::Base.helpers.strip_tags(k) if k.present?}
poll_un_anony = poll.un_anonymous poll_un_anony = poll.un_anonymous
if poll_un_anony #是否匿名默认为false if poll_un_anony #是否匿名默认为false
user_info = %w(登陆名 真实姓名 邮箱 学号 学员单位) user_info = %w(登陆名 真实姓名 分班 邮箱 学号 学员单位)
else else
user_info = [] user_info = []
end end
@ -1436,9 +1436,10 @@ class PollsController < ApplicationController
if poll_un_anony if poll_un_anony
user_login = u_user.login user_login = u_user.login
user_name = u_user.real_name.present? ? u_user.real_name : "--" user_name = u_user.real_name.present? ? u_user.real_name : "--"
user_class = poll.course.user_group_name
user_student_id = u_user.student_id.present? ? u_user.student_id : "--" user_student_id = u_user.student_id.present? ? u_user.student_id : "--"
user_school_name = u_user.school_name.present? ? u_user.school_name : "--" user_school_name = u_user.school_name.present? ? u_user.school_name : "--"
user_cell += [user_login,user_name, u_user.mail, user_student_id, user_school_name] user_cell += [user_login,user_name, user_class, u_user.mail, user_student_id, user_school_name]
end end
all_user_cell = user_cell + user_answer_array all_user_cell = user_cell + user_answer_array
user_commit.push(all_user_cell) user_commit.push(all_user_cell)

@ -300,8 +300,7 @@ module ExportHelper
export_ex_users.includes(user: :user_extension).each_with_index do |e_user,index| export_ex_users.includes(user: :user_extension).each_with_index do |e_user,index|
user_info = e_user.user user_info = e_user.user
member = course.students.find_by_user_id(e_user.user_id) user_course = course.user_group_name(e_user.user_id)
user_course = member.try(:course_group_name)
user_obj_score = e_user.objective_score < 0.0 ? 0.0 : e_user.objective_score.round(1).to_s user_obj_score = e_user.objective_score < 0.0 ? 0.0 : e_user.objective_score.round(1).to_s
user_suj_score = e_user.subjective_score < 0.0 ? 0.0 : e_user.subjective_score.round(1).to_s user_suj_score = e_user.subjective_score < 0.0 ? 0.0 : e_user.subjective_score.round(1).to_s
user_score = e_user.score.present? ? e_user.score.round(1).to_s : 0.0 user_score = e_user.score.present? ? e_user.score.round(1).to_s : 0.0

@ -130,6 +130,10 @@ class Course < ApplicationRecord
course_members.find_by(user_id: user_id, role: %i(STUDENT)) course_members.find_by(user_id: user_id, role: %i(STUDENT))
end end
def user_group_name(user_id)
students.find_by(user_id: user_id)&.course_group_name
end
def teacher_group(user_id) def teacher_group(user_id)
data = data =

Loading…
Cancel
Save