Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/weapps/attendances_controller.rb

@@ -14,7 +14,7 @@ class Weapps::AttendancesController < ApplicationController
         group_ids.each do |group_id|
           @course.course_attendance_groups.create!(course_group_id: group_id, course_attendance: attendance)
         end
-        CreateStudentAttendanceRecordJob.perform_now(attendance.id, group_ids)
+        CreateStudentAttendanceRecordJob.perform_later(attendance.id, group_ids)
       else
         @course.course_attendance_groups.create!(course_group_id: 0, course_attendance: attendance)
         CreateStudentAttendanceRecordJob.perform_later(attendance.id, [0])
@@ -27,7 +27,8 @@ 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}'").take
+    @current_attendance = @course.course_attendances.where("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}')")
     @all_member_attendances = CourseMemberAttendance.where(course_attendance_id: all_attendances)
@@ -54,11 +55,11 @@ class Weapps::AttendancesController < ApplicationController
     @history_attendances = @course.course_attendances.where(id: all_attendance_ids.uniq).
       where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')").order("id desc")
     @current_attendance = @course.course_attendances.where(id: all_attendance_ids.uniq).
-      where("attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}'").take
+      where("attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}'")
     @history_count = @history_attendances.size
 
     student_attendance_ids = @history_attendances.pluck(:id)
-    student_attendance_ids += @current_attendance.present? ? [@current_attendance.id] : []
+    student_attendance_ids += @current_attendance.present? ? @current_attendance.pluck(:id) : []
 
     if student_attendance_ids.uniq.blank?
       @normal_count = 0

app/controllers/weapps/courses_controller.rb

@@ -8,18 +8,32 @@ class Weapps::CoursesController < Weapps::BaseController
 
   def course_activities
     @course = current_course
-    homework_commons = @course.homework_commons.where(homework_type: ["practice", "normal"]).homework_published
+
     member = @course.course_members.find_by(user_id: current_user.id, is_active: 1)
+
+    # 签到数据
+    attendances = @course.course_attendances
+    current_date = Date.current
+    current_end_time = Time.current.strftime("%H:%M:%S")
+    if @user_course_identity == Course::STUDENT
+      attendances = attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: [member.try(:course_group_id).to_i, 0]})
+                      .where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and start_time < '#{current_end_time}')")
+    end
+    attendance_ids = attendances.blank? ? "(-1)" : "(" + attendances.pluck(:id).join(",") + ")"
+
+    homework_commons = @course.homework_commons.where(homework_type: ["practice", "normal"]).homework_published
     if (@user_course_identity == Course::STUDENT && member.try(:course_group_id).to_i == 0) || @user_course_identity > Course::STUDENT
       homework_commons = homework_commons.unified_setting
     elsif @user_course_identity == Course::STUDENT
-      not_homework_ids = @course.homework_group_settings.none_published.where("course_group_id = #{member.try(:course_group_id)}").pluck(:homework_common_id)
+      not_homework_ids = @course.homework_group_settings.none_published.where("course_group_id = #{member.try(:course_group_id)}")
+                           .pluck(:homework_common_id)
       homework_commons = homework_commons.where.not(id: not_homework_ids)
     end
     homework_ids = homework_commons.blank? ? "(-1)" : "(" + homework_commons.pluck(:id).join(",") + ")"
 
     activities = @course.course_activities.where("course_act_type in ('Course', 'CourseMessage') or
-                  (course_act_type = 'HomeworkCommon' and course_act_id in #{homework_ids})").order("id desc")
+                  (course_act_type = 'HomeworkCommon' and course_act_id in #{homework_ids}) or
+                  (course_act_type = 'CourseAttendance' and course_act_id in #{attendance_ids})").order("id desc")
     @activities_count = activities.size
     @activities = paginate activities.includes(:course_act, user: :user_extension)
   end

app/models/course_activity.rb

@@ -2,10 +2,11 @@ class CourseActivity < ApplicationRecord
   belongs_to :course_act, polymorphic: true
   belongs_to :course
   belongs_to :user
-  belongs_to :exercise
-  belongs_to :poll
-  belongs_to :course_message
-  belongs_to :homework_common
+  belongs_to :exercise, optional: true
+  belongs_to :poll, optional: true
+  belongs_to :course_message, optional: true
+  belongs_to :homework_common, optional: true
+  belongs_to :course_attendance, optional: true
 
   # after_create :add_course_lead
 

app/models/course_attendance.rb

@@ -9,13 +9,15 @@ class CourseAttendance < ApplicationRecord
   has_many :course_attendance_groups, dependent: :destroy
   has_many :course_member_attendances, dependent: :destroy
 
+  has_one :course_act, class_name: 'CourseActivity', as: :course_act, dependent: :destroy
+
   validates :name, presence: true
   validates :mode, presence: true
   validates :attendance_date, presence: true
   validates :start_time, presence: true
   validates :end_time, presence: true
 
-  after_create :generate_attendance_code
+  after_create :generate_attendance_code, :act_as_course_activity
 
   # 正常签到人数
   def normal_count
@@ -43,6 +45,11 @@ class CourseAttendance < ApplicationRecord
     a_start_time < Time.current && Time.current < a_end_time
   end
 
+  #课程动态公共表记录
+  def act_as_course_activity
+    CourseActivity.create(user_id: user_id, course_id: course_id, course_act: self)
+  end
+
   # 延迟生成邀请码
   def attendance_code
     return generate_attendance_code

app/views/weapps/attendances/index.json.jbuilder

@@ -1,5 +1,8 @@
-json.current_attendance do
-  json.(@current_attendance, :id, :normal_count, :all_count) if @current_attendance
+json.current_attendance @current_attendance do |attendance|
+  json.(attendance, :id, :normal_count, :all_count)
+  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")
 end
 
 all_normal_rate = []

app/views/weapps/attendances/show.json.jbuilder

@@ -5,6 +5,10 @@ json.all_count @all_count
 json.code @attendance.attendance_code
 json.mode @attendance.mode
 json.edit_auth @user_course_identity < Course::PROFESSOR || @attendance.user_id == User.current.id
+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.course_groups @groups do |group|
   json.(group, :id, :name, :course_members_count)
   json.attendance_count group_attendance_count(@all_attendances, group) if @_is_current_attendance

app/views/weapps/attendances/student_attendances.json.jbuilder

@@ -1,5 +1,5 @@
-json.current_attendance do
-  json.partial! 'student_attendance', locals: {attendance: @current_attendance} if @current_attendance.present?
+json.current_attendance @current_attendance do |attendance|
+  json.partial! 'student_attendance', locals: {attendance: attendance}
 end
 
 json.history_attendances @history_attendances do |attendance|