From af6e0d456a4c01d6f1e6d0b2337278d410261a03 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 2 Mar 2020 19:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attendances_controller.rb | 38 --------- .../weapps/attendances_controller.rb | 85 +++++++++++++++++++ app/models/course.rb | 3 +- app/models/course_attendance.rb | 20 +++++ app/models/course_member_attendance.rb | 9 ++ .../weapps/attendances/index.json.jbuilder | 0 .../student_attendances.json.jbuilder | 12 +++ config/locales/zh-CN.yml | 6 ++ config/routes.rb | 8 +- ...0200302034841_create_course_attendances.rb | 1 + ...2035218_create_course_attendance_groups.rb | 3 +- ...100750_create_course_member_attendances.rb | 17 ++++ spec/models/course_member_attendance_spec.rb | 5 ++ 13 files changed, 165 insertions(+), 42 deletions(-) delete mode 100644 app/controllers/attendances_controller.rb create mode 100644 app/controllers/weapps/attendances_controller.rb create mode 100644 app/models/course_member_attendance.rb create mode 100644 app/views/weapps/attendances/index.json.jbuilder create mode 100644 app/views/weapps/attendances/student_attendances.json.jbuilder create mode 100644 db/migrate/20200302100750_create_course_member_attendances.rb create mode 100644 spec/models/course_member_attendance_spec.rb diff --git a/app/controllers/attendances_controller.rb b/app/controllers/attendances_controller.rb deleted file mode 100644 index fc94eaf5b..000000000 --- a/app/controllers/attendances_controller.rb +++ /dev/null @@ -1,38 +0,0 @@ -class AttendancesController < ApplicationController - before_action :require_login - before_action :find_course, only: [:create, :index] - - def create - ActiveRecord::Base.transaction do - attendance = @course.course_attendances.create!(create_params) - unless params[:group_ids].blank? - params[:group_ids].each do |group_id| - @course.course_attendance_groups.create!(course_group_id: group_id, course_attendance: attendance) - end - else - - end - end - end - - def index - - end - - def show - - end - - def update - - end - - def destroy - - end - - private - def create_params - params.permit(:name, :mode, :attendance_date, :start_time, :end_time) - end -end \ No newline at end of file diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb new file mode 100644 index 000000000..69d2f658d --- /dev/null +++ b/app/controllers/weapps/attendances_controller.rb @@ -0,0 +1,85 @@ +class Weapps::AttendancesController < ApplicationController + before_action :require_login + before_action :find_course, only: [:create, :index] + before_action :find_attendance, except: [:create, :index] + 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 + if @user_course_identity == Course::STUDENT + current_date = Date.current + current_end_time = Time.current.strftime("%H:%M:%S") + member = @course.students.find_by(user_id: current_user.id) + + # 先算出该学生所在分班的签到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 + 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 \ No newline at end of file diff --git a/app/models/course.rb b/app/models/course.rb index 74be99bb2..5ae7f9484 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -92,7 +92,8 @@ class Course < ApplicationRecord # 签到 has_many :course_attendances, dependent: :destroy - has_many :course_attendance_groups, dependent: :destroy + has_many :course_attendance_groups + has_many :course_member_attendances validate :validate_sensitive_string diff --git a/app/models/course_attendance.rb b/app/models/course_attendance.rb index fcad77ec1..f3bcffc56 100644 --- a/app/models/course_attendance.rb +++ b/app/models/course_attendance.rb @@ -1,8 +1,10 @@ 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 @@ -10,4 +12,22 @@ class CourseAttendance < ApplicationRecord 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 diff --git a/app/models/course_member_attendance.rb b/app/models/course_member_attendance.rb new file mode 100644 index 000000000..a03d016bb --- /dev/null +++ b/app/models/course_member_attendance.rb @@ -0,0 +1,9 @@ +class CourseMemberAttendance < ApplicationRecord + # attendance_mode :1 二维码签到,2 数字签到,3 老师签到 + # attendance_status :1 正常签到,2 请假 + belongs_to :course_member + belongs_to :user + belongs_to :course + belongs_to :course_attendance + belongs_to :course_group +end diff --git a/app/views/weapps/attendances/index.json.jbuilder b/app/views/weapps/attendances/index.json.jbuilder new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/weapps/attendances/student_attendances.json.jbuilder b/app/views/weapps/attendances/student_attendances.json.jbuilder new file mode 100644 index 000000000..2c9bad5ac --- /dev/null +++ b/app/views/weapps/attendances/student_attendances.json.jbuilder @@ -0,0 +1,12 @@ +json.current_attendance do + json.partial! 'student_attendance', locals: {attendance: @current_attendance} +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 \ No newline at end of file diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 4f41df0c5..f9671eec1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -177,6 +177,12 @@ zh-CN: platform: '直播平台' live_time: '开播时间' duration: '直播时长' + course_attendance: + name: '签到名称' + mode: '签到方式' + attendance_date: '签到日期' + start_time: '开始时间' + end_time: '结束时间' diff --git a/config/routes.rb b/config/routes.rb index 1b3d93c44..33ca88c6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -557,8 +557,6 @@ Rails.application.routes.draw do end end - resources :attendances, only: [:index, :update, :create, :show, :destroy], shallow: true - resources :live_links, only: [:index, :update, :create, :edit, :destroy], shallow: true resources :homework_commons, shallow: true do @@ -1059,6 +1057,12 @@ Rails.application.routes.draw do collection do get :check_invite_code end + + resources :attendances, only: [:index, :update, :create, :show, :destroy], shallow: true do + member do + get :student_attendances + end + end end resources :homework_commons do diff --git a/db/migrate/20200302034841_create_course_attendances.rb b/db/migrate/20200302034841_create_course_attendances.rb index 25eaf0d8e..e99668058 100644 --- a/db/migrate/20200302034841_create_course_attendances.rb +++ b/db/migrate/20200302034841_create_course_attendances.rb @@ -8,6 +8,7 @@ class CreateCourseAttendances < ActiveRecord::Migration[5.2] t.date :attendance_date t.time :start_time t.time :end_time + t.string :attendance_code t.timestamps end diff --git a/db/migrate/20200302035218_create_course_attendance_groups.rb b/db/migrate/20200302035218_create_course_attendance_groups.rb index 0f76beea3..048a33c06 100644 --- a/db/migrate/20200302035218_create_course_attendance_groups.rb +++ b/db/migrate/20200302035218_create_course_attendance_groups.rb @@ -7,7 +7,8 @@ class CreateCourseAttendanceGroups < ActiveRecord::Migration[5.2] t.timestamps - add_index :course_attendances, [:course_attendance_id, :course_group_id, :course_id], name: "course_group_attendance", unique: true end + + add_index :course_attendance_groups, [:course_attendance_id, :course_group_id, :course_id], name: "course_group_attendance", unique: true end end diff --git a/db/migrate/20200302100750_create_course_member_attendances.rb b/db/migrate/20200302100750_create_course_member_attendances.rb new file mode 100644 index 000000000..b9c39902f --- /dev/null +++ b/db/migrate/20200302100750_create_course_member_attendances.rb @@ -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 diff --git a/spec/models/course_member_attendance_spec.rb b/spec/models/course_member_attendance_spec.rb new file mode 100644 index 000000000..5e66e8f1a --- /dev/null +++ b/spec/models/course_member_attendance_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CourseMemberAttendance, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end