From 853f9999231e878a27eec96524dde466ba5cbcb2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 13 Mar 2020 21:26:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attendances/index.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attendances/index.json.jbuilder b/app/views/attendances/index.json.jbuilder
index 8a4dd2bb1..21fc68d71 100644
--- a/app/views/attendances/index.json.jbuilder
+++ b/app/views/attendances/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.attendances @attendances do |attendance|
-  json.(attendance, :id, :name, :normal_count, :all_count, :mode)
+  json.(attendance, :id, :name, :normal_count, :all_count, :mode, :code)
   json.author do
     user = attendance.user
     json.user_name user.real_name

From 5df56b2d858c4ae662b88a3b1b3a295e658955ef Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 13 Mar 2020 21:28:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attendances/index.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attendances/index.json.jbuilder b/app/views/attendances/index.json.jbuilder
index 21fc68d71..b44f9a4fe 100644
--- a/app/views/attendances/index.json.jbuilder
+++ b/app/views/attendances/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.attendances @attendances do |attendance|
-  json.(attendance, :id, :name, :normal_count, :all_count, :mode, :code)
+  json.(attendance, :id, :name, :normal_count, :all_count, :mode, :attendance_code)
   json.author do
     user = attendance.user
     json.user_name user.real_name

From 46e5582afd168da701ee3ce4b3106cc10f8396b2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 13 Mar 2020 21:51:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb
index 5e92d5928..21a687d60 100644
--- a/app/controllers/weapps/course_member_attendances_controller.rb
+++ b/app/controllers/weapps/course_member_attendances_controller.rb
@@ -14,6 +14,9 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
       @members = @members.where(course_group_id: params[:group_ids])
     end
 
+    @page = params[:page] || 1
+    @limit = params[:limit] || 5
+
     if params[:attendance_status].present?
       @members = @members.joins(:course_member_attendances).where(course_member_attendances: {course_attendance_id: attendance.id, attendance_status: params[:attendance_status]})
     end
diff --git a/app/views/weapps/course_member_attendances/index.json.jbuilder b/app/views/weapps/course_member_attendances/index.json.jbuilder
index cec70b3fe..01d475e12 100644
--- a/app/views/weapps/course_member_attendances/index.json.jbuilder
+++ b/app/views/weapps/course_member_attendances/index.json.jbuilder
@@ -4,8 +4,9 @@
 #   json.student_id member.user&.student_id
 # end
 
-json.member_attendances @members.each do |member|
+json.member_attendances @members.each_with_index do |member, index|
   json.(member, :user_id)
+  json.index (@page.to_i - 1) * @limit.to_i + index + 1
   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"

From d65e12f7dd7826901b53c5fdb472e2c8d9eca26b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 13 Mar 2020 21:54:39 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/weapps/course_member_attendances/index.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/weapps/course_member_attendances/index.json.jbuilder b/app/views/weapps/course_member_attendances/index.json.jbuilder
index 01d475e12..765de5833 100644
--- a/app/views/weapps/course_member_attendances/index.json.jbuilder
+++ b/app/views/weapps/course_member_attendances/index.json.jbuilder
@@ -4,7 +4,7 @@
 #   json.student_id member.user&.student_id
 # end
 
-json.member_attendances @members.each_with_index do |member, index|
+json.member_attendances @members.each_with_index.to_a do |member, index|
   json.(member, :user_id)
   json.index (@page.to_i - 1) * @limit.to_i + index + 1
   json.user_name member.user&.real_name