|
|
|
@ -298,7 +298,13 @@ class CoursesController < ApplicationController
|
|
|
|
@applications = CourseMessage.unhandled_join_course_requests_by_course(@course).
|
|
|
|
@applications = CourseMessage.unhandled_join_course_requests_by_course(@course).
|
|
|
|
joins("join users on course_messages.course_message_id=users.id").
|
|
|
|
joins("join users on course_messages.course_message_id=users.id").
|
|
|
|
where("LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{search_str}%")
|
|
|
|
where("LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{search_str}%")
|
|
|
|
@teacher_list_size = @course.teachers.size
|
|
|
|
if @course.try(:id) != 1309 || current_user.admin? || current_user.try(:id) == 15582
|
|
|
|
|
|
|
|
teacher_list = @course.course_members.where("course_members.role in (1, 2, 3)")
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
teacher_list = @course.course_members.where("(course_members.role in (1, 3) or (course_members.user_id = #{current_user.id}
|
|
|
|
|
|
|
|
and course_members.role = 2))")
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
@teacher_list_size = teacher_list.size
|
|
|
|
@applications_size = CourseMessage.unhandled_join_course_requests_by_course(@course).size
|
|
|
|
@applications_size = CourseMessage.unhandled_join_course_requests_by_course(@course).size
|
|
|
|
@is_admin = @user_course_identity < Course::PROFESSOR
|
|
|
|
@is_admin = @user_course_identity < Course::PROFESSOR
|
|
|
|
end
|
|
|
|
end
|
|
|
|
@ -924,16 +930,23 @@ class CoursesController < ApplicationController
|
|
|
|
course_message = CourseMessage.new(course_id: course.id, user_id: course.tea_id, status: 0,
|
|
|
|
course_message = CourseMessage.new(course_id: course.id, user_id: course.tea_id, status: 0,
|
|
|
|
course_message_id: current_user.id, course_message_type: "JoinCourseRequest",
|
|
|
|
course_message_id: current_user.id, course_message_type: "JoinCourseRequest",
|
|
|
|
viewed: false)
|
|
|
|
viewed: false)
|
|
|
|
course_message.content = 2 if params[:professor].present? && params[:professor].to_i == 1
|
|
|
|
if params[:professor].present? && params[:professor].to_i == 1
|
|
|
|
course_message.content = 3 if params[:assistant_professor].present? && params[:assistant_professor].to_i == 1
|
|
|
|
course_message.content = 2
|
|
|
|
|
|
|
|
role = 9
|
|
|
|
|
|
|
|
message = "教师申请已提交，请等待审核"
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
course_message.content = 3
|
|
|
|
|
|
|
|
role = 7
|
|
|
|
|
|
|
|
message = "助教申请已提交，请等待审核"
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
course_message.save!
|
|
|
|
course_message.save!
|
|
|
|
|
|
|
|
|
|
|
|
role = course_message.content == 2 ? '9' : '7' # 7:助教 9:教师
|
|
|
|
# role = course_message.content == 2 ? '9' : '7' # 7:助教 9:教师
|
|
|
|
ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
|
|
|
|
ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
|
|
|
|
message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
|
|
|
|
# message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
message = "#{existing_course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核"
|
|
|
|
message = "#{existing_course_message.content == '2' ? '教师' : '助教'}申请已提交，请等待审核"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else
|
|
|
|
else
|
|
|
|
message = "您已是课堂成员"
|
|
|
|
message = "您已是课堂成员"
|
|
|
|
|
