From 6cdf0a541e8d54b3932891598e193c2a531e3fbf Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Mar 2020 21:47:09 +0800 Subject: [PATCH 1/3] =?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/attendances_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/attendances_controller.rb b/app/controllers/attendances_controller.rb index 936bef188..d6b656800 100644 --- a/app/controllers/attendances_controller.rb +++ b/app/controllers/attendances_controller.rb @@ -106,7 +106,7 @@ class AttendancesController < ApplicationController attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at] - same_attrs = {course_attendance_id: attendance.id, course_id: course.id} + same_attrs = {course_attendance_id: @attendance.id, course_id: course.id} CourseMemberAttendance.bulk_insert(*attrs) do |worker| From 115342cc04791c2c426c2baaa7f7b82c05ad7cbb Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Mar 2020 21:50:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attendances_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/attendances_controller.rb b/app/controllers/attendances_controller.rb index d6b656800..000c90428 100644 --- a/app/controllers/attendances_controller.rb +++ b/app/controllers/attendances_controller.rb @@ -106,7 +106,7 @@ class AttendancesController < ApplicationController attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at] - same_attrs = {course_attendance_id: @attendance.id, course_id: course.id} + same_attrs = {course_attendance_id: @attendance.id, course_id: @course.id} CourseMemberAttendance.bulk_insert(*attrs) do |worker| From 886d8b38ffc3f67a47e6149280334835a01a68b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Mar 2020 21:53:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/videostatistics/component/Studentstatistics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js index aea47a1cb..44cdf6536 100644 --- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js +++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js @@ -205,7 +205,7 @@ class Studentstatistics extends Component { let mysorder=""; if (sorter.order === "ascend") { if(sorter.columnKey === "feq"){ - mysorder="feq-asc"; + mysorder="freq-asc"; }else{ mysorder="total_duration-asc"; @@ -221,7 +221,7 @@ class Studentstatistics extends Component { }) } else if (sorter.order === "descend") { if(sorter.columnKey === "feq"){ - mysorder="feq-desc"; + mysorder="freq-desc"; }else{ mysorder="total_duration-desc";