diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index afaf02881..698344063 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -371,7 +371,7 @@ class CoursesController < ApplicationController respond_to do |format| format.xls { send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present", - :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s + @course.name + @course.time.to_s + @course.term}#{l(:excel_member_list)}.xls") + :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}.xls") } end end @@ -996,7 +996,7 @@ GROUP BY members.user_id ORDER BY score #{score_sort_by}" sheet1[count_row,2] = member.user.login sheet1[count_row,3] = member.user.user_extensions.student_id sheet1[count_row,4] = member.user.mail - sheet1[count_row,5] = format("%0.2f",member.score.to_s) + sheet1[count_row,5] = format("%0.2f",member.score.nil? ? 0:member.score.to_s) count_row += 1 end end diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 83c26b713..d20e9ee86 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -31,7 +31,7 @@ class HomeworkAttachController < ApplicationController format.js format.xls { send_data(homework_to_xls(@all_homework_list), :type => "text/excel;charset=utf-8; header=present", - :filename => "not_rated_homework_#{Time.now.strftime("%Y%m%d")}.xls") + :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls") } end end @@ -61,7 +61,7 @@ class HomeworkAttachController < ApplicationController format.js format.xls { send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present", - :filename => "been_rated_homework_#{Time.now.strftime("%Y%m%d")}.xls") + :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_been_rated)}).xls") } end end @@ -92,7 +92,7 @@ class HomeworkAttachController < ApplicationController format.js format.xls { send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present", - :filename => "all_homework_#{Time.now.strftime("%Y%m%d")}.xls") + :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}.xls") } end end diff --git a/config/locales/zh.yml b/config/locales/zh.yml index dee8246f2..62f0e0bc4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2103,6 +2103,9 @@ zh: excel_class: "班级:" excel_member_with_out_class: "未加入班级的学生" excel_member_list: 成员列表 + excel_homework_list: 作品列表 + excel_been_rated: 已评 + excel_not_rated: 未评 label_export_excel: 导出Excel label_softapplication: 应用软件