分班的处理

app/controllers/courses_controller.rb

@@ -27,7 +27,8 @@ class CoursesController < ApplicationController
                                      :attahcment_category_list,:export_member_scores_excel, :duplicate_course,
                                      :switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
-                                    :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs, :delete_informs]
+                                    :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs,
+                                    :delete_informs, :change_member_role]
   before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
                                                 :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@@ -39,7 +40,7 @@ class CoursesController < ApplicationController
                                        :set_course_group, :create_group_by_importing_file,
                                        :update_task_position, :tasks_list]
   before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
-                                                  :change_course_teacher, :course_group_list,
+                                                  :change_course_teacher, :course_group_list, :change_member_role,
                                                   :teacher_application_review, :apply_teachers, :delete_course_teacher]
   before_action :validate_course_name, only: [:create, :update]
   before_action :find_board, only: :board_list
@@ -340,8 +341,8 @@ class CoursesController < ApplicationController
 
     @has_graduation_design = @course.course_modules.graduation_module_not_hidden.any?
 
-    sort = params[:sort] || "desc"
-    @order = params[:order].to_i
+    sort = params[:sort] || "asc"
+    @order = params[:order] ? params[:order].to_i : 1
     if @order.present?
       case @order
       when 1
@@ -547,6 +548,61 @@ class CoursesController < ApplicationController
     end
   end
 
+  # 修改角色
+  def change_member_role
+    tip_exception("请至少选择一个角色") if params[:roles].blank?
+    tip_exception("不能具有老师、助教两种角色") if params[:roles].include?("PROFESSOR") && params[:roles].include?("ASSISTANT_PROFESSOR")
+    tip_exception("管理员不能切换为助教或老师") if @user_course_identity == Course::CREATOR &&
+      (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR"))
+
+    course_members = @course.course_members.where(user_id: params[:user_id])
+    tip_exception("非课堂成员不能修改角色") if course_members.blank?
+
+    ActiveRecord::Base.transaction do
+      # 第一次修改为教师或助教身份时直接创建数据
+      if params[:roles].include?("CREATOR")
+        teacher_member = course_members.where(role: %i[CREATOR]).take
+      elsif (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")) && !course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
+        teacher_member = CourseMember.create!(course_id: @course.id, user_id: params[:user_id], role: params[:roles].include?("PROFESSOR") ? 2 : 3)
+      elsif course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
+        teacher_member = course_members.where(role: %i[PROFESSOR ASSISTANT_PROFESSOR]).take
+        if params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")
+          # 如果之前有老师身份且老师身份要调整时，只需要修改role字段
+          if !params[:roles].include?(teacher_member.role) && params[:roles].include?("PROFESSOR")
+            teacher_member.PROFESSOR!
+          elsif !params[:roles].include?(teacher_member.role) && params[:roles].include?("ASSISTANT_PROFESSOR")
+            teacher_member.ASSISTANT_PROFESSOR!
+          end
+          teacher_member.save!
+        else
+          # 不含教师的参数时删除记录
+          teacher_member.destroy!
+          # CourseDeleteStudentNotifyJob.perform_later(@course.id, [teacher_member.user_id], current_user.id)
+        end
+      end
+
+      # 学生身份的处理
+      student_member = course_members.where(role: %i[STUDENT]).take
+      if params[:roles].include?("STUDENT") && student_member.blank?
+        correspond_teacher_exist = CourseMember.exists?(user_id: params[:user_id], is_active: 1, course_id: @course.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR])
+        new_student = CourseMember.new(user_id: params[:user_id], course_id: @course.id, role: 4)
+        new_student.is_active = 0 if correspond_teacher_exist
+        new_student.save!
+
+        CourseAddStudentCreateWorksJob.perform_later(@course.id, [params[:user_id]])
+        # StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
+      elsif !params[:roles].include?("STUDENT") && student_member.present?
+        # 删除学生身份时激活老师身份
+        teacher_member.update_attributes!(is_active: 1) if student_member.is_active && teacher_member.present?
+        student_member.destroy!
+        CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [params[:user_id]])
+        # CourseDeleteStudentNotifyJob.perform_later(@course.id, [params[:user_id]], current_user.id)
+      end
+
+      normal_status(0, "修改成功")
+    end
+  end
+
   # 教师和助教角色转换的接口
   def change_course_teacher
     begin
@@ -715,8 +771,8 @@ class CoursesController < ApplicationController
   # 学生列表(包括各个子分班的学生列表)及搜索
   def students
     search = params[:search].present? ? params[:search].strip : nil
-    order = params[:order].present? ? params[:order].to_i : 0
-    sort = params[:sort].present? ? params[:sort] : "desc"
+    order = params[:order].present? ? params[:order].to_i : 1
+    sort = params[:sort].present? ? params[:sort] : "asc"
     course_group_id = params[:course_group_id].present? ? params[:course_group_id].to_i : nil
 
     @students = CourseMember.students(@course)

app/libs/util.rb

@@ -48,8 +48,8 @@ module Util
     return if str.blank?
 
     case type
-    when :phone then "#{str[0..2]}***#{str[-4..-1]}"
-    when :email then "#{str[0..2]}***#{str[str.rindex('@')..-1]}"
+    when :phone then "#{str[0..2]}***#{str[-3..-1]}"
+    when :email then "#{str[0]}***#{str[(str.rindex('@')-1)..-1]}"
     else "#{str[0..2]}***#{str[-3..-1]}"
     end
   end

app/models/user.rb

@@ -242,6 +242,11 @@ class User < ApplicationRecord
     user_extension&.department&.name || ''
   end
 
+  # 课堂的所有身份
+  def course_role course
+    course.course_members.where(user_id: id).pluck(:role)
+  end
+
   # 课堂的老师(创建者、老师、助教)
   def teacher_of_course?(course)
     course.course_members.exists?(user_id: id, role: [1,2,3], is_active: 1) || admin? || business?
@@ -583,6 +588,16 @@ class User < ApplicationRecord
     mail.present?
   end
 
+  # 手机号：123***123
+  def hidden_phone
+    Util.conceal(phone, :phone).to_s
+  end
+
+  # 邮箱：w***l@qq.com
+  def hidden_mail
+    Util.conceal(mail, :email).to_s
+  end
+
   # 学院的url标识
   def college_identifier
     Department.find_by_id(department_members.pluck(:department_id).first)&.identifier

app/views/courses/students.json.jbuilder

@@ -1,12 +1,17 @@
 json.students do
   json.array! @students do |student|
     json.user_id student.user_id
-    json.login student.user.try(:login)
+    # json.login student.user.try(:login)
     json.name student.user.try(:real_name)
     json.name_link user_path(student.user)
     json.student_id student.user.try(:student_id)
     json.course_group_name student.course_group.try(:name)
     json.course_member_id student.id
+    if @user_course_identity < Course::ASSISTANT_PROFESSOR
+      json.member_roles student.user.course_role(@course)
+    end
+    json.user_phone student.user.hidden_phone
+    json.user_mail student.user.hidden_mail
   end
 end
 json.students_count @students_count

app/views/courses/teachers.json.jbuilder

@@ -16,6 +16,9 @@ json.teacher_list do
     end
     json.graduation_group teacher.graduation_group.try(:name)
     json.graduation_group_id teacher.graduation_group.try(:id)
+    if @user_course_identity < Course::ASSISTANT_PROFESSOR
+      json.member_roles teacher.user.course_role(@course)
+    end
   end
 end
 json.teacher_list_size @teacher_list_size

app/views/users/accounts/show.json.jbuilder

@@ -1,5 +1,7 @@
-json.extract! observed_user, :id, :nickname, :phone, :mail, :show_realname
+json.extract! observed_user, :id, :nickname, :show_realname
 
+json.phone observed_user.hidden_phone
+json.mail observed_user.hidden_mail
 json.avatar_url url_to_avatar(observed_user)
 user = ActiveDecorator::Decorator.instance.decorate(observed_user)
 json.name user.name

config/routes.rb

@@ -331,6 +331,7 @@ Rails.application.routes.draw do
         post 'join_graduation_group'
         post 'set_course_group'
         post 'change_course_admin'
+        post 'change_member_role'
         post 'change_course_teacher'
         post 'delete_course_teacher'
         post 'teacher_application_review'