From 428f62f504426d935c73daab0d6cc3419612efcc Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 20 Mar 2020 16:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=A7=86=E8=A7=92=E7=9A=84?=
 =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E7=AD=BE=E5=88=B0=E5=88=97=E8=A1=A8=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb                    | 2 +-
 app/helpers/weapps/attendances_helper.rb                     | 4 +++-
 app/views/attendances/index.json.jbuilder                    | 4 +++-
 .../weapps/attendances/_student_attendance.json.jbuilder     | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 15e795bdb..fa4648852 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -330,7 +330,7 @@ class ApplicationController < ActionController::Base
 		end
 
 		if !User.current.logged? && Rails.env.development?
-			User.current = User.find 1
+			User.current = User.find 3117
 		end
 
 
diff --git a/app/helpers/weapps/attendances_helper.rb b/app/helpers/weapps/attendances_helper.rb
index e0223ad74..f2b6d55d7 100644
--- a/app/helpers/weapps/attendances_helper.rb
+++ b/app/helpers/weapps/attendances_helper.rb
@@ -2,7 +2,9 @@ module Weapps::AttendancesHelper
 
   def student_attendance_status attendance, user
     st_attendance = attendance.course_member_attendances.find_by(user_id: user.id)
-    st_attendance.present? ? st_attendance.attendance_status : "ABSENCE"
+    attendance_status = st_attendance.present? ? st_attendance.attendance_status : "ABSENCE"
+    attendance_mode = st_attendance.present? ? st_attendance.attendance_mode : "DEFAULT"
+    {attendance_status: attendance_status, attendance_mode: attendance_mode}
   end
 
   def group_attendance_count attendances, member_ids
diff --git a/app/views/attendances/index.json.jbuilder b/app/views/attendances/index.json.jbuilder
index b44f9a4fe..b42420b5b 100644
--- a/app/views/attendances/index.json.jbuilder
+++ b/app/views/attendances/index.json.jbuilder
@@ -11,7 +11,9 @@ json.attendances @attendances do |attendance|
   json.edit_auth @user_course_identity < Course::PROFESSOR || attendance.user_id == User.current.id
 
   if @user_course_identity == Course::STUDENT
-    json.attendance_status student_attendance_status(attendance, User.current)
+    student_attendance_status = student_attendance_status(attendance, User.current)
+    json.attendance_status student_attendance_status[:attendance_status]
+    json.attendance_mode student_attendance_status[:attendance_mode]
   end
 end
 
diff --git a/app/views/weapps/attendances/_student_attendance.json.jbuilder b/app/views/weapps/attendances/_student_attendance.json.jbuilder
index 6fd5e9d70..94c600831 100644
--- a/app/views/weapps/attendances/_student_attendance.json.jbuilder
+++ b/app/views/weapps/attendances/_student_attendance.json.jbuilder
@@ -2,4 +2,7 @@ json.(attendance, :id, :name, :mode)
 json.attendance_date attendance.attendance_date.strftime("%Y/%m/%d")
 json.start_time attendance.start_time.strftime("%H:%M")
 json.end_time attendance.end_time.strftime("%H:%M")
-json.attendance_status student_attendance_status(attendance, User.current)
\ No newline at end of file
+
+student_attendance_status = student_attendance_status(attendance, User.current)
+json.attendance_status student_attendance_status[:attendance_status]
+json.attendance_mode student_attendance_status[:attendance_mode]
\ No newline at end of file