|
|
|
@ -27,7 +27,7 @@ class Weapps::AttendancesController < ApplicationController
|
|
|
|
|
tip_exception(403) if @user_course_identity >= Course::STUDENT
|
|
|
|
|
current_date = Date.current
|
|
|
|
|
current_end_time = Time.current.strftime("%H:%M:%S")
|
|
|
|
|
@current_attendance = @course.course_attendances.where("attendance_date = '#{current_date}' and end_time > '#{current_end_time}'")
|
|
|
|
|
@current_attendance = @course.course_attendances.where("attendance_date > '#{current_date}' or (attendance_date = '#{current_date}' and end_time > '#{current_end_time}')")
|
|
|
|
|
.order("attendance_date asc, start_time asc")
|
|
|
|
|
|
|
|
|
|
all_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')")
|
|
|
|
|