From 1ba5860d5a8c41d99d855cc3017737d07ee433ae Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 5 Mar 2020 21:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weapps/course_member_attendances_controller.rb            | 1 +
 app/views/shixuns/_top.json.jbuilder                          | 2 +-
 .../weapps/course_member_attendances/index.json.jbuilder      | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb
index a7d6ee1f9..7e315fc85 100644
--- a/app/controllers/weapps/course_member_attendances_controller.rb
+++ b/app/controllers/weapps/course_member_attendances_controller.rb
@@ -19,6 +19,7 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
     end
 
     @members = @members.joins(:course_member_attendances).order("attendance_status=1 desc, course_member_attendances.updated_at desc")
+    @members_count = @members.uniq.count
     @members = paginate @members.preload(user: :user_extension).uniq
 
     # @member_attendances = @member_attendances.where(attendance_status: params[:attendance_status]) if params[:attendance_status].present?
diff --git a/app/views/shixuns/_top.json.jbuilder b/app/views/shixuns/_top.json.jbuilder
index 130706649..362cfd15b 100644
--- a/app/views/shixuns/_top.json.jbuilder
+++ b/app/views/shixuns/_top.json.jbuilder
@@ -13,7 +13,7 @@ json.identifier     shixun.identifier
 json.name           shixun.name
 json.stu_num        shixun.myshixuns_count
 json.experience     shixun.all_score
-json.diffcult       diff_to_s(shixun.trainee)
+json.diffcult       level_to_s(shixun.trainee)
 json.score_info     shixun.shixun_preference_info # todo: 这块可以改成只显示实训的平均分，不用每次都去取每种星的分数了。
 json.is_jupyter     shixun.is_jupyter
 # 用于是否显示导航栏中的'背景知识'
diff --git a/app/views/weapps/course_member_attendances/index.json.jbuilder b/app/views/weapps/course_member_attendances/index.json.jbuilder
index 30d3e721e..cec70b3fe 100644
--- a/app/views/weapps/course_member_attendances/index.json.jbuilder
+++ b/app/views/weapps/course_member_attendances/index.json.jbuilder
@@ -9,4 +9,6 @@ json.member_attendances @members.each do |member|
   json.user_name member.user&.real_name
   json.student_id member.user&.student_id
   json.attendance_status @member_attendances.select{|attendance| attendance.course_member_id == member.id}.first&.attendance_status || "ABSENCE"
-end
\ No newline at end of file
+end
+
+json.members_count @members_count
\ No newline at end of file