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