diff --git a/app/models/course.rb b/app/models/course.rb index d4d5387d5..e4c771765 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -161,7 +161,7 @@ class Course < ApplicationRecord end def videos_count - course_videos.where(video_id: videos.where("transcoded = 1 or videos.user_id = #{User.current.id}").pluck(:id)) + course_videos.where(video_id: videos.where("transcoded = 1")) .or(course_videos.where(course_videos: {is_link: true})).size end diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index 50fcceef4..a5e067ca6 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/public/react/src/modules/courses/signin/css/signincdi.css @@ -472,7 +472,14 @@ white-space:nowrap; cursor: default; } - +.maxnamewidth90s{ + width: 90px; + max-width: 90px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + cursor: default; +} .font-14{ font-size: 14px !important; } diff --git a/public/react/src/modules/courses/videostatistics/component/Studenticscom.js b/public/react/src/modules/courses/videostatistics/component/Studenticscom.js index 5d1c81692..191e078b2 100644 --- a/public/react/src/modules/courses/videostatistics/component/Studenticscom.js +++ b/public/react/src/modules/courses/videostatistics/component/Studenticscom.js @@ -33,6 +33,20 @@ class Studenticscom extends Component {
this.props.statisticsy(false)} >
diff --git a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
index 44cdf6536..eb25dfbe6 100644
--- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
+++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
@@ -252,6 +252,20 @@ class Studentstatistics extends Component {
return (
this.props.statisticsy(false)} >
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index 702f90712..10301c8ea 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -28,7 +28,7 @@ class Videostatisticscomtwo extends Component {
className: 'font-14',
width: '50px',
render: (text, record) => (
- {record.number}
+