From fb6c8c24b4b8253e2da7817172410c10f5788de6 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 26 Jul 2019 23:43:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a1f37687d..5b7929d1e 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1221,7 +1221,7 @@ class CoursesController < ApplicationController @user_activity_level = [] course_user_level = [] course_activity_title = "课堂活跃度统计" - user_cell_head = %w(排名 真实姓名 登录名 邮箱 学号 分班 作业完成数(*10) 试卷完成数(*10) 问卷完成数(*7) 资源发布数(*5) 帖子发布数(*2) 帖子回复数(*1) 作业回复数(*1) 活跃度) + user_cell_head = %w(排名 真实姓名 登录名 邮箱 学号 学校 分班 作业完成数(*10) 试卷完成数(*10) 问卷完成数(*7) 资源发布数(*5) 帖子发布数(*2) 帖子回复数(*1) 作业回复数(*1) 活跃度) all_members.each do |u| #用户的基本信息 user = u.user @@ -1229,8 +1229,9 @@ class CoursesController < ApplicationController user_name = user.real_name user_mail = user.mail user_stu_id = u.student_id.present? ? (u.student_id.to_s + "\t") : "--" + user_school = u.school_name user_course_group = u.course_group_name - user_info_array = [user_login,user_name,user_mail,user_stu_id,user_course_group] #用户的信息集合 + user_info_array = [user_login,user_name,user_mail,user_stu_id,user_school,user_course_group] #用户的信息集合 user_work_scores = [] #课堂活跃度统计 @@ -1372,7 +1373,7 @@ class CoursesController < ApplicationController course_user_score_title = "学生总成绩" score_title_cells = shixun_titles + common_titles + group_titles + task_titles + exercise_titles score_title_counts = [shixun_titles.count,common_titles.count,group_titles.count,task_titles.count,exercise_titles.count] - score_cell_head = %w(序号 真实姓名 登录名 邮箱 学号 分班) + score_title_cells + ["个人总成绩"] + score_cell_head = %w(序号 真实姓名 登录名 邮箱 学号 学校 分班) + score_title_cells + ["个人总成绩"] @course_user_scores = [course_user_score_title,score_cell_head,score_title_counts,total_user_score_array] #作业的全部集合 From 1447be54d24c604b2b7c2df4923045e015d57070 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 26 Jul 2019 23:45:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 5b7929d1e..897fb34b9 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1229,7 +1229,7 @@ class CoursesController < ApplicationController user_name = user.real_name user_mail = user.mail user_stu_id = u.student_id.present? ? (u.student_id.to_s + "\t") : "--" - user_school = u.school_name + user_school = user.school_name user_course_group = u.course_group_name user_info_array = [user_login,user_name,user_mail,user_stu_id,user_school,user_course_group] #用户的信息集合 user_work_scores = [] From 5b629fb285c08be6d9e9f3251989e1c2419a3d19 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 26 Jul 2019 23:55:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 19 ++++++++++--------- .../export_member_scores_excel.xlsx.axlsx | 1 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 897fb34b9..bdb367111 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1255,15 +1255,16 @@ class CoursesController < ApplicationController u_2: user_login, u_2_1: user_mail, u_3: user_stu_id, - u_4: user_course_group, - u_5: c_works_num, - u_6: c_exercise_num, - u_7: c_poll_num, - u_8: c_file_num, - u_9: c_message_num, - u_10: c_reply_num, - u_11: user_work_reply_num, - u_12: user_activity_levels + u_4: user_school, + u_5: user_course_group, + u_6: c_works_num, + u_7: c_exercise_num, + u_8: c_poll_num, + u_9: c_file_num, + u_10: c_message_num, + u_11: c_reply_num, + u_12: user_work_reply_num, + u_13: user_activity_levels } course_user_level.push(user_ac_level) diff --git a/app/views/courses/export_member_scores_excel.xlsx.axlsx b/app/views/courses/export_member_scores_excel.xlsx.axlsx index 5b226a09c..4750304e4 100644 --- a/app/views/courses/export_member_scores_excel.xlsx.axlsx +++ b/app/views/courses/export_member_scores_excel.xlsx.axlsx @@ -59,6 +59,7 @@ wb.styles do |s| sheet.merge_cells("D1:D2") sheet.merge_cells("E1:E2") sheet.merge_cells("F1:F2") + sheet.merge_cells("G1:G2") sheet.merge_cells (Axlsx::cell_r(sheet_length-1,0) + ':' + Axlsx::cell_r(sheet_length-1,1)) #最后一行的合并 sheet_first = sheet.rows.first #第一行 sheet_second = sheet.rows.second #第二行 From d0ede523cdbacc64b1c2f67472aedfdf7e7b34fd Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 27 Jul 2019 00:00:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/export_member_scores_excel.xlsx.axlsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/courses/export_member_scores_excel.xlsx.axlsx b/app/views/courses/export_member_scores_excel.xlsx.axlsx index 4750304e4..db4f06ab1 100644 --- a/app/views/courses/export_member_scores_excel.xlsx.axlsx +++ b/app/views/courses/export_member_scores_excel.xlsx.axlsx @@ -65,13 +65,13 @@ wb.styles do |s| sheet_second = sheet.rows.second #第二行 work_head_title = %w(实训作业 普通作业 分组作业 毕设任务 试卷) (0..(sheet_length-1)).each do |i| - if i <= 5 || i == sheet_length-1 + if i <= 6 || i == sheet_length-1 sheet_first.cells[i].value = sheet_title[i] else sheet_second.cells[i].value = sheet_title[i] end end - st_col = 6 + st_col = 7 sheet_title_counts.each_with_index do |c,index| end_col = (st_col + c - 1) sheet.merge_cells sheet_first.cells[(st_col..end_col)]