Merge branch 'dev_chen' into dev_aliyun

video_log
cxt 5 years ago
commit ad1b8e93c7

@ -321,7 +321,7 @@ class ApplicationController < ActionController::Base
end
if !User.current.logged? && Rails.env.development?
User.current = User.find 1
User.current = User.find 3117
end

@ -0,0 +1,84 @@
class Weapps::AttendancesController < ApplicationController
before_action :require_login
before_action :find_course, only: [:create, :index, :student_attendances]
before_action :find_attendance, except: [:create, :index, :student_attendances]
before_action :user_course_identity
before_action :teacher_allowed, only: [:create]
def create
ActiveRecord::Base.transaction do
attendance = @course.course_attendances.create!(create_params.merge(user_id: current_user.id))
unless params[:group_ids].blank?
group_ids = @course.charge_group_ids(current_user) & params[:group_ids]
group_ids.each do |group_id|
@course.course_attendance_groups.create!(course_group_id: group_id, course_attendance: attendance)
end
else
@course.course_attendance_groups.create!(course_group_id: 0, course_attendance: attendance)
end
render_ok({attendance_id: attendance.id})
end
end
def index
end
def student_attendances
tip_exception(403, "") if @user_course_identity != Course::STUDENT
member = @course.students.find_by(user_id: current_user.id)
current_date = Date.current
current_end_time = Time.current.strftime("%H:%M:%S")
# 先算出该学生所在分班的签到id
# 分班id为0 表示签到不限制分班
group_ids = [member&.course_group_id.to_i, 0]
all_attendance_ids = @course.course_attendance_groups.where(course_group_id: group_ids).pluck(:course_attendance_id)
@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
@history_count = @history_attendances.size
student_attendance_ids = @history_attendances.pluck(:id)
student_attendance_ids += @current_attendance.present? ? [@current_attendance.id] : []
if student_attendance_ids.uniq.blank?
@normal_count = 0
@leave_count = 0
@absence_count = 0
else
@normal_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: 1).size
@leave_count = @course.course_member_attendances.where(course_attendance_id: student_attendance_ids, attendance_status: 2).size
@absence_count = student_attendance_ids.uniq.size - @normal_count - @leave_count
end
@all_history_count = @history_attendances.size
@history_attendances = paginate @history_attendances.includes(:course_member_attendances)
end
def show
end
def update
tip_exception(403, "") unless @user_course_identity < Course::PROFESSOR || @attendance.user_id == current_user.id
@attendance.update!(name: params[:name])
render_ok
end
def destroy
end
private
def create_params
params.permit(:name, :mode, :attendance_date, :start_time, :end_time)
end
def find_attendance
@attendance = CourseAttendance.find params[:id]
@course = @attendance.course
end
end

@ -0,0 +1,31 @@
class Weapps::CourseMemberAttendancesController < ApplicationController
before_action :require_login
def create
tip_exception("签到码不能为空") if params[:code].blank?
tip_exception("attendance_mode参数不对") if [1, 2].include?(params[:attendance_mode])
attendance = CourseAttendance.find_by(attendance_code: params[:code])
tip_exception("签到码输入有误") if attendance.blank? || attendance.course.blank?
member = attendance.course.students.find_by(user_id: current_user.id)
tip_exception("签到码输入有误") if member.blank?
start_time = "#{attendance.attendance_date} #{attendance.start_time}".to_time
end_time = "#{attendance.attendance_date} #{attendance.end_time}".to_time
Rails.logger.info("##############{start_time} #{end_time}")
tip_exception("不在签到时间内") unless start_time < Time.current && Time.current < end_time
current_attendance = attendance.course_member_attendances.find_by(user_id: current_user.id)
tip_exception("请勿重复签到") if current_attendance.present? && current_attendance.attendance_status == 1
tip_exception("您当前是请假状态,无法签到") if current_attendance.present? && current_attendance.attendance_status == 2
tip_exception("您当前是旷课状态,无法签到") if current_attendance.present? && current_attendance.attendance_status == 0
unless current_attendance.present?
attendance.course_member_attendances.create!(course_member_id: member.id, user_id: current_user.id, course_id: attendance.course_id,
course_group_id: member.course_group_id, attendance_status: 1, attendance_mode: params[:attendance_mode] || 2)
end
render_ok
end
end

@ -0,0 +1,7 @@
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 : 0
end
end

@ -90,6 +90,11 @@ class Course < ApplicationRecord
# 直播
has_many :live_links, dependent: :destroy
# 签到
has_many :course_attendances, dependent: :destroy
has_many :course_attendance_groups
has_many :course_member_attendances
validate :validate_sensitive_string
scope :hidden, ->(is_hidden = true) { where(is_hidden: is_hidden) }

@ -0,0 +1,33 @@
class CourseAttendance < ApplicationRecord
# mode: 0 两种签到1 二维码签到2 数字签到
belongs_to :course
belongs_to :user
has_many :course_attendance_groups, dependent: :destroy
has_many :course_member_attendances, 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
# 延迟生成邀请码
def attendance_code
return generate_attendance_code
end
# 生成邀请码
CODES = %W(2 3 4 5 6 7 8 9 A B C D E F G H J K L N M O P Q R S T U V W X Y Z)
def generate_attendance_code
code = read_attribute(:attendance_code)
if !code || code.size < 4
code = CODES.sample(4).join
return generate_attendance_code if CourseAttendance.where(attendance_code: code).present?
update_attribute(:attendance_code, code)
end
code
end
end

@ -0,0 +1,5 @@
class CourseAttendanceGroup < ApplicationRecord
belongs_to :course
belongs_to :course_attendance
belongs_to :course_group, optional: true
end

@ -8,6 +8,7 @@ class CourseMember < ApplicationRecord
belongs_to :course_group, counter_cache: true, optional: true
belongs_to :graduation_group, optional: true
has_many :teacher_course_groups, dependent: :destroy
has_many :course_member_attendances, dependent: :destroy
scope :teachers_and_admin, -> { where(role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR]) }
scope :students, ->(course) { where(course_id: course.id, role: %i[STUDENT])}

@ -0,0 +1,9 @@
class CourseMemberAttendance < ApplicationRecord
# attendance_mode 1 二维码签到2 数字签到3 老师签到
# attendance_status 1 正常签到2 请假0 旷课
belongs_to :course_member
belongs_to :user
belongs_to :course
belongs_to :course_attendance
belongs_to :course_group
end

@ -0,0 +1,5 @@
json.(attendance, :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)

@ -0,0 +1,12 @@
json.current_attendance do
json.partial! 'student_attendance', locals: {attendance: @current_attendance} if @current_attendance.present?
end
json.history_attendances @history_attendances do |attendance|
json.partial! 'student_attendance', locals: {attendance: attendance}
end
json.all_history_count @all_history_count
json.normal_count @normal_count
json.leave_count @leave_count
json.absence_count @absence_count

@ -177,6 +177,12 @@ zh-CN:
platform: '直播平台'
live_time: '开播时间'
duration: '直播时长'
course_attendance:
name: '签到名称'
mode: '签到方式'
attendance_date: '签到日期'
start_time: '开始时间'
end_time: '结束时间'

@ -1057,8 +1057,16 @@ Rails.application.routes.draw do
collection do
get :check_invite_code
end
resources :attendances, only: [:index, :update, :create, :show, :destroy], shallow: true do
collection do
get :student_attendances
end
end
end
resources :course_member_attendances, only: [:create]
resources :homework_commons do
post :update_settings, on: :member
end

@ -0,0 +1,16 @@
class CreateCourseAttendances < ActiveRecord::Migration[5.2]
def change
create_table :course_attendances do |t|
t.references :course, index: true
t.references :user, index: true
t.string :name
t.integer :mode, limit: 1, default: 0
t.date :attendance_date
t.time :start_time
t.time :end_time
t.string :attendance_code
t.timestamps
end
end
end

@ -0,0 +1,14 @@
class CreateCourseAttendanceGroups < ActiveRecord::Migration[5.2]
def change
create_table :course_attendance_groups do |t|
t.references :course, index: true
t.references :course_attendance
t.references :course_group, index: true
t.timestamps
end
add_index :course_attendance_groups, [:course_attendance_id, :course_group_id, :course_id], name: "course_group_attendance", unique: true
end
end

@ -0,0 +1,17 @@
class CreateCourseMemberAttendances < ActiveRecord::Migration[5.2]
def change
create_table :course_member_attendances do |t|
t.references :course_member, index: true
t.references :user
t.references :course, index: true
t.references :course_attendance
t.references :course_group, index: true
t.integer :attendance_mode, default: 0
t.integer :attendance_status, default: 0
t.timestamps
end
add_index :course_member_attendances, [:course_attendance_id, :user_id], unique: true, name: "index_on_user_attendance"
end
end

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe CourseAttendanceGroup, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe CourseAttendance, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe CourseMemberAttendance, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end
Loading…
Cancel
Save