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

dev_local
daiao 6 years ago
commit 3b28c33162

@ -188,9 +188,11 @@ module ZipService
# file_name = "#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" # file_name = "#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf"
# file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{exercise.course_id}-#{exercise.id}-#{exercise_user.user.user_extensions.student_id}" + ".pdf" # file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{exercise.course_id}-#{exercise.id}-#{exercise_user.user.user_extensions.student_id}" + ".pdf"
file_name.gsub!(" ", "-") file_name.gsub!(" ", "-")
Rails.logger.info("###################file_name: #{file_name}")
kit.to_file("#{OUTPUT_FOLDER}/#{file_name}") kit.to_file("#{OUTPUT_FOLDER}/#{file_name}")
out_file = "#{OUTPUT_FOLDER}/#{file_name}" out_file = "#{OUTPUT_FOLDER}/#{file_name}"
out_file out_file
Rails.logger.info("#################out_file_file_name: #{out_file}")
end end
def export_user_shixun_work homework, student_work, file_name def export_user_shixun_work homework, student_work, file_name

Loading…
Cancel
Save