diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index af235c4c9..4cf6aa15a 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -549,7 +549,7 @@ class CoursesController < ApplicationController course_member = CourseMember.find_by!(id: params[:course_member_id].to_i, course_id: @course.id) tip_exception("删除失败") if course_member.CREATOR? or course_member.STUDENT? - course_student = CourseMember.find_by(id: course_member.user_id, course_id: @course.id, role: %i[STUDENT]) + course_student = CourseMember.find_by(user_id: course_member.user_id, course_id: @course.id, role: %i[STUDENT]) course_member.destroy! course_student.update_attributes(is_active: 1) if course_student.present? && !course_student.is_active normal_status(0, "删除成功") @@ -772,8 +772,10 @@ class CoursesController < ApplicationController students.each do |student| course_member = CourseMember.find_by(id: student[:course_member_id].to_i, course_id: @course.id) if course_member.present? + member_teacher = CourseMember.find_by(user_id: course_member.user_id, course_id: @course.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR]) student_ids << course_member.user_id course_member.destroy! + member_teacher.update_attributes(is_active: 1) if member_teacher.present? end end CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, student_ids) if student_ids.present? diff --git a/app/models/course.rb b/app/models/course.rb index b46464ea6..e2fc5140b 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -82,6 +82,7 @@ class Course < ApplicationRecord scope :by_keywords, lambda { |keywords| where("name LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank? } + scope :started, -> { where("start_date is null or start_date <= '#{Date.today}'") } acts_as_taggable diff --git a/app/services/users/course_service.rb b/app/services/users/course_service.rb index 9eb34917e..de70c5b86 100644 --- a/app/services/users/course_service.rb +++ b/app/services/users/course_service.rb @@ -23,11 +23,11 @@ class Users::CourseService def category_scope_courses case params[:category] when 'study' then - user.as_student_courses + user.as_student_courses.started when 'manage' then user.manage_courses else - ids = user.as_student_courses.pluck(:id) + user.manage_courses.pluck(:id) + ids = user.as_student_courses.started.pluck(:id) + user.manage_courses.pluck(:id) Course.where(id: ids) end end diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 3c1d4392e..3e94ad328 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -503,7 +503,12 @@ class CoursesBanner extends Component { } {excellent===true? - 开放课程 + + + + :""} this.showsandians(e,key,item.category_url,1)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}> { item.type==="announcement"?: - item.type==="online_learning"?: + item.type==="online_learning"?: item.type==="shixun_homework"?: item.type==="common_homework"?: item.type==="group_homework"?: @@ -1001,7 +1001,7 @@ class Coursesleftnav extends Component{ { item.type==="announcement"?: - item.type==="online_learning"?: + item.type==="online_learning"?: item.type==="shixun_homework"?: item.type==="common_homework"?: item.type==="group_homework"?: diff --git a/public/react/src/modules/courses/coursesPublic/CoursesListType.js b/public/react/src/modules/courses/coursesPublic/CoursesListType.js index 09a07ca73..d5805c0d5 100644 --- a/public/react/src/modules/courses/coursesPublic/CoursesListType.js +++ b/public/react/src/modules/courses/coursesPublic/CoursesListType.js @@ -55,6 +55,8 @@ class CoursesListType extends Component { {item==="未提交"?未提交:""} {item==="已确认"?已确认:""} {item==="已截止"?已截止:""} + {item==="开放课程"?开放课程:""} + ) diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index f9e32f95e..dbdd42398 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -907,6 +907,10 @@ a.white-btn.use_scope-btn:hover{ .edu-filter-btn-FC2B6A{ background:#FC2B6A !important; } + +.edu-filter-btn-FF6800{ + background:#FF6800 !important; +} .color666666{ color:#666666 !important; } diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index b18d13f2a..6800093d4 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -332,8 +332,8 @@ class DetailTop extends Component{ border-radius:4px; border:1px solid rgba(255,255,255,1); } - .minwinth600{ - min-width:600px; + .maxwinth700{ + max-width:700px; } ` } @@ -361,7 +361,7 @@ class DetailTop extends Component{ { detailInfoList.member_count!=0 ?
  • 学习人数{detailInfoList.member_count}
    • : ""} } -
    +
    {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?