m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_forum
daiao 5 years ago
parent 09a2eca618 14dc08892c
commit 3920568fc7
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File

46
app/controllers/exercises_controller.rb
Unescape View File

@ -1293,19 +1293,38 @@ class ExercisesController < ApplicationController
@exercise_users_list = @exercise_users_list.page(@page).per(@limit)
respond_to do |format|
format.json
if @user_course_identity > Course::ASSISTANT_PROFESSOR
tip_exception(403,"无权限操作")
elsif (@exercise_users_size == 0) || ( @export_ex_users&.exercise_user_committed.size == 0)
logger.info("#######___________@exercise_users_size_________##################{@exercise_users_size}")
logger.info("#######__________@export_ex_users&.exercise_user_committed.size_________##################{@export_ex_users&.exercise_user_committed.size}")
normal_status(-1,"暂无用户提交")
else
format.xlsx{
get_export_users(@exercise,@course,@export_ex_users)
exercise_export_name =
"#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
render xlsx: "#{exercise_export_name.strip.first(30)}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
}
end
format.xlsx{
if @user_course_identity > Course::ASSISTANT_PROFESSOR
tip_exception(403,"无权限操作")
else
if @export_ex_users.exercise_user_committed.size == 0
normal_status(-1,"暂无用户提交")
else
get_export_users(@exercise,@course,@export_ex_users)
exercise_export_name =
"#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
render xlsx: "#{exercise_export_name.strip.first(30)}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
end
end
# if @user_course_identity > Course::ASSISTANT_PROFESSOR
# tip_exception(403,"无权限操作")
# else
# if (@exercise_users_size == 0) || ( @export_ex_users&.exercise_user_committed.size == 0)
# logger.info("#######__________@export_ex_users&.exercise_user_committed.size_________##################{@export_ex_users&.exercise_user_committed.size}")
# logger.info("#######___________@exercise_users_size_________##################{@exercise_users_size}")
#
# normal_status(-1,"暂无用户提交")
# else
# get_export_users(@exercise,@course,@export_ex_users)
# exercise_export_name =
# "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
# render xlsx: "#{exercise_export_name.strip.first(30)}",template: "exercises/exercise_lists.xlsx.axlsx",locals: {table_columns:@table_columns,exercise_users:@user_columns}
# end
# end
}
end
else
@ -1316,9 +1335,6 @@ class ExercisesController < ApplicationController
format.xlsx{
normal_status(-1,"暂无用户提交")
}
format.zip{
normal_status(-1,"暂无用户提交")
}
end
end

Write Preview
Loading…
Cancel
Save