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

app/controllers/courses_controller.rb

@@ -1503,11 +1503,10 @@ class CoursesController < ApplicationController
     @videos = CourseVideo.joins("
       JOIN videos ON course_videos.course_id = #{@course.id} AND videos.id = course_videos.video_id
       LEFT JOIN (
-        SELECT watch_course_videos.course_video_id, SUM(watch_course_videos.total_duration) AS time, COUNT(watch_video_histories.watch_course_video_id) AS num
+        SELECT watch_course_videos.course_video_id, SUM(watch_course_videos.total_duration) AS time, COUNT(watch_course_videos.course_video_id) AS num
         FROM watch_course_videos
         JOIN course_videos ON course_videos.id = watch_course_videos.course_video_id AND watch_course_videos.end_at IS NOT NULL
         JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
-        JOIN watch_video_histories ON watch_course_videos.id = watch_video_histories.watch_course_video_id AND watch_video_histories.end_at IS NOT NULL
         WHERE course_videos.course_id = #{@course.id}
         GROUP BY watch_course_videos.course_video_id
       ) AS hisotries ON hisotries.course_video_id = course_videos.id").select("course_videos.id")

app/views/files/index.json.jbuilder

@@ -19,6 +19,7 @@ json.data do
       json.category_id attachment.course_second_category_id
       if (@course_second_category_id.to_i == 0 && attachment.course_second_category.present?) || (@parent_category_id == 0 && attachment.course_second_category&.parent_id.to_i != 0)
         json.category_name attachment.course_second_category&.name
+        json.parent_category_name attachment.course_second_category&.parent&.name
       end
     end
   end

public/react/src/modules/courses/videostatistics/component/Studentstatistics.js

@@ -155,7 +155,7 @@ class Studentstatistics extends Component {
 								user_name: response.data.data[i].user_name,
 								is_finished: response.data.data[i].is_finished,
 								total_duration:response.data.data[i].total_duration?formatSeconds(response.data.data[i].total_duration):0,
-								feq:response.data.data[i].feq,
+								feq:response.data.data[i].freq,
 								start_at:response.data.data[i].start_at,
 								end_at:response.data.data[i].end_at,
 							})
@@ -263,7 +263,7 @@ class Studentstatistics extends Component {
 							{
 								`
 								 .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
-									 padding: 10px 10px;
+									 padding: 10px 5px;
 									}
 								`
 							}