diff --git a/app/controllers/admins/courses_controller.rb b/app/controllers/admins/courses_controller.rb index 518054e12..4f82d5d58 100644 --- a/app/controllers/admins/courses_controller.rb +++ b/app/controllers/admins/courses_controller.rb @@ -7,13 +7,13 @@ class Admins::CoursesController < Admins::BaseController courses = Admins::CourseQuery.call(params) @ended_courses = courses.where(is_end: 1).size @processed_courses = courses.where(is_end: 0).size - @courses = paginate courses.includes(:school, :students, :attachments, :homework_commons, teacher: :user_extension) + @courses = paginate courses.includes(:school, :students, :teacher_course_members, :informs, :course_videos, :attachments, :homework_commons, teacher: :user_extension) respond_to do |format| format.js format.html format.xlsx do - @courses = courses.includes(:school, :students, :attachments, :homework_commons, :course_acts, teacher: :user_extension) + @courses = courses.includes(:school, :students, :teacher_course_members, :informs, :course_videos, :attachments, :homework_commons, :course_activities, teacher: [user_extension: :department]) filename = "课堂列表_#{Time.current.strftime('%Y%m%d%H%M%S')}.xlsx" render xlsx: 'index', filename: filename end diff --git a/app/models/course.rb b/app/models/course.rb index a0daaea22..d4d5387d5 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -406,6 +406,15 @@ class Course < ApplicationRecord homework_commons.select{|homework| homework.homework_type == type}.size end + # 课堂作业数 + def published_course_homework_count type + homework_commons.select{|homework| homework.homework_type == type && homework.publish_time.present? && homework.publish_time <= Time.now}.size + end + + def student_works_count + StudentWork.joins(:homework_common).where(homework_commons: {course_id: id}).where("work_status > 0").size + end + private #创建课程后，给该用户发送消息 diff --git a/app/views/admins/courses/index.xlsx.axlsx b/app/views/admins/courses/index.xlsx.axlsx index 7cab54482..bc6581972 100644 --- a/app/views/admins/courses/index.xlsx.axlsx +++ b/app/views/admins/courses/index.xlsx.axlsx @@ -3,22 +3,28 @@ wb = xlsx_package.workbook wb.styles do |s| blue_cell = s.add_style :bg_color => "FAEBDC", :sz => 10,:height => 25,:b => true, :border => { :style => :thin, :color =>"000000" },:alignment => {wrap_text: true,:horizontal => :center,:vertical => :center} wb.add_worksheet(name: "课堂列表") do |sheet| - sheet.add_row %w(ID 课堂名称 成员 资源 普通作业 分组作业 实训作业 试卷 评测次数 私有 状态 单位 创建者 创建时间 动态时间), :height => 25,:style => blue_cell + sheet.add_row %w(ID 课堂名称 老师 学生 资源 公告 视频 普通作业 分组作业 实训作业 实训作业已发布数 作品数 试卷 评测次数 私有 状态 单位 部门 创建者 创建时间 动态时间), :height => 25,:style => blue_cell @courses.each do |course| data = [ course.id, course.name, - course.course_members_count, + course.teacher_course_members.size, + course.students.size, get_attachment_count(course, 0), - course.course_homework_count(1), - course.course_homework_count(3), - course.course_homework_count(4), + course.informs.size, + course.course_videos.size, + course.course_homework_count("normal"), + course.course_homework_count("group"), + course.course_homework_count("practice"), + course.published_course_homework_count("practice"), + course.student_works_count, course.exercises_count, course.evaluate_count, course.is_public == 1 ? "--" : "√", course.is_end ? "已结束" : "正在进行", course.school&.name, + course.teacher&.department_name, course.teacher&.real_name, course.created_at&.strftime('%Y-%m-%d %H:%M'), course.max_activity_time ? course.max_activity_time&.strftime('%Y-%m-%d %H:%M') : "--" diff --git a/app/views/admins/courses/shared/_list.html.erb b/app/views/admins/courses/shared/_list.html.erb index 4105c8153..47839c549 100644 --- a/app/views/admins/courses/shared/_list.html.erb +++ b/app/views/admins/courses/shared/_list.html.erb @@ -3,18 +3,22 @@ 序号 ID - 课堂名称 - 成员 + 课堂名称 + 老师 + 学生 资源 + 公告 + 视频 普通作业 分组作业 实训作业 + 作品数 试卷 评测次数 私有 - 状态 - 单位 - 创建者 + 状态 + 单位 + 创建者 <%= sort_tag('创建时间', name: 'created_at', path: admins_courses_path) %> 首页 邮件通知 diff --git a/app/views/admins/courses/shared/_td.html.erb b/app/views/admins/courses/shared/_td.html.erb index 7b72179da..397a69aae 100644 --- a/app/views/admins/courses/shared/_td.html.erb +++ b/app/views/admins/courses/shared/_td.html.erb @@ -3,11 +3,15 @@ <%= link_to(course.name, "/classrooms/#{course.id}", target: '_blank') %> -<%= course.course_members_count %> +<%= course.teacher_course_members.size %> +<%= course.students.size %> <%= get_attachment_count(course, 0) %> +<%= course.informs.size %> +<%= course.course_videos.size %> <%= course.course_homework_count("normal") %> <%= course.course_homework_count("group") %> <%= course.course_homework_count("practice") %> +<%= course.student_works_count %> <%= course.exercises_count %> <%= course.evaluate_count %> <%= course.is_public == 1 ? "--" : "√" %> diff --git a/app/views/courses/left_banner.json.jbuilder b/app/views/courses/left_banner.json.jbuilder index b53dbbb79..efc40f5ef 100644 --- a/app/views/courses/left_banner.json.jbuilder +++ b/app/views/courses/left_banner.json.jbuilder @@ -30,6 +30,7 @@ json.course_modules @course_modules.each do |mod| json.third_category category.children do |child| json.partial! "category_info", category: child + json.parent_id child.parent_id end end end diff --git a/public/react/public/css/demo_index.html b/public/react/public/css/demo_index.html index 7a6d6b5e8..8b88a36ec 100644 --- a/public/react/public/css/demo_index.html +++ b/public/react/public/css/demo_index.html @@ -30,6 +30,12 @@