From 81380ea879011eac6cbd36c38755d3f2156b8b3c Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 2 Mar 2020 16:08:10 +0800 Subject: [PATCH 1/9] =?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 +++++++++++++++++++ app/models/course.rb | 4 ++ app/models/course_attendance.rb | 13 +++++++ app/models/course_attendance_group.rb | 5 +++ config/routes.rb | 2 + ...0200302034841_create_course_attendances.rb | 15 ++++++++ ...2035218_create_course_attendance_groups.rb | 13 +++++++ spec/models/course_attendance_group_spec.rb | 5 +++ spec/models/course_attendance_spec.rb | 5 +++ 9 files changed, 100 insertions(+) create mode 100644 app/controllers/attendances_controller.rb create mode 100644 app/models/course_attendance.rb create mode 100644 app/models/course_attendance_group.rb create mode 100644 db/migrate/20200302034841_create_course_attendances.rb create mode 100644 db/migrate/20200302035218_create_course_attendance_groups.rb create mode 100644 spec/models/course_attendance_group_spec.rb create mode 100644 spec/models/course_attendance_spec.rb diff --git a/app/controllers/attendances_controller.rb b/app/controllers/attendances_controller.rb new file mode 100644 index 000000000..fc94eaf5b --- /dev/null +++ b/app/controllers/attendances_controller.rb @@ -0,0 +1,38 @@ +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/models/course.rb b/app/models/course.rb index 14c17cf39..74be99bb2 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -90,6 +90,10 @@ class Course < ApplicationRecord # 直播 has_many :live_links, dependent: :destroy + # 签到 + has_many :course_attendances, dependent: :destroy + has_many :course_attendance_groups, dependent: :destroy + validate :validate_sensitive_string scope :hidden, ->(is_hidden = true) { where(is_hidden: is_hidden) } diff --git a/app/models/course_attendance.rb b/app/models/course_attendance.rb new file mode 100644 index 000000000..fcad77ec1 --- /dev/null +++ b/app/models/course_attendance.rb @@ -0,0 +1,13 @@ +class CourseAttendance < ApplicationRecord + belongs_to :course + belongs_to :user + + has_many :course_attendance_groups, 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 + +end diff --git a/app/models/course_attendance_group.rb b/app/models/course_attendance_group.rb new file mode 100644 index 000000000..8de9ebe88 --- /dev/null +++ b/app/models/course_attendance_group.rb @@ -0,0 +1,5 @@ +class CourseAttendanceGroup < ApplicationRecord + belongs_to :course + belongs_to :course_attendance + belongs_to :course_group +end diff --git a/config/routes.rb b/config/routes.rb index ba0827676..6a25a076e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -554,6 +554,8 @@ 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 diff --git a/db/migrate/20200302034841_create_course_attendances.rb b/db/migrate/20200302034841_create_course_attendances.rb new file mode 100644 index 000000000..25eaf0d8e --- /dev/null +++ b/db/migrate/20200302034841_create_course_attendances.rb @@ -0,0 +1,15 @@ +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.timestamps + end + end +end diff --git a/db/migrate/20200302035218_create_course_attendance_groups.rb b/db/migrate/20200302035218_create_course_attendance_groups.rb new file mode 100644 index 000000000..0f76beea3 --- /dev/null +++ b/db/migrate/20200302035218_create_course_attendance_groups.rb @@ -0,0 +1,13 @@ +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 + + add_index :course_attendances, [:course_attendance_id, :course_group_id, :course_id], name: "course_group_attendance", unique: true + end + end +end diff --git a/spec/models/course_attendance_group_spec.rb b/spec/models/course_attendance_group_spec.rb new file mode 100644 index 000000000..2fc1a2a0a --- /dev/null +++ b/spec/models/course_attendance_group_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CourseAttendanceGroup, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/course_attendance_spec.rb b/spec/models/course_attendance_spec.rb new file mode 100644 index 000000000..a54f4be64 --- /dev/null +++ b/spec/models/course_attendance_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CourseAttendance, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From c3d98855cb854f04e0c5c95b11552c182aa8af0d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 2 Mar 2020 19:38:05 +0800 Subject: [PATCH 2/9] =?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 6a25a076e..ba06cb4c7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -554,8 +554,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 @@ -1054,6 +1052,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 From e7b8946bdae698cf277f00fcab4e20f42a748b05 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 14:42:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weapps/attendances_controller.rb | 65 +++++++++---------- app/helpers/weapps/attendances_helper.rb | 7 ++ app/models/course_attendance_group.rb | 2 +- .../_student_attendance.json.jbuilder | 5 ++ .../student_attendances.json.jbuilder | 2 +- config/routes.rb | 2 +- 6 files changed, 47 insertions(+), 36 deletions(-) create mode 100644 app/helpers/weapps/attendances_helper.rb create mode 100644 app/views/weapps/attendances/_student_attendance.json.jbuilder diff --git a/app/controllers/weapps/attendances_controller.rb b/app/controllers/weapps/attendances_controller.rb index 69d2f658d..f61cc95c2 100644 --- a/app/controllers/weapps/attendances_controller.rb +++ b/app/controllers/weapps/attendances_controller.rb @@ -1,7 +1,7 @@ class Weapps::AttendancesController < ApplicationController before_action :require_login - before_action :find_course, only: [:create, :index] - before_action :find_attendance, except: [:create, :index] + 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] @@ -25,38 +25,37 @@ class Weapps::AttendancesController < ApplicationController 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) + 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 diff --git a/app/helpers/weapps/attendances_helper.rb b/app/helpers/weapps/attendances_helper.rb new file mode 100644 index 000000000..087084288 --- /dev/null +++ b/app/helpers/weapps/attendances_helper.rb @@ -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 \ No newline at end of file diff --git a/app/models/course_attendance_group.rb b/app/models/course_attendance_group.rb index 8de9ebe88..02c2f6fb9 100644 --- a/app/models/course_attendance_group.rb +++ b/app/models/course_attendance_group.rb @@ -1,5 +1,5 @@ class CourseAttendanceGroup < ApplicationRecord belongs_to :course belongs_to :course_attendance - belongs_to :course_group + belongs_to :course_group, optional: true end diff --git a/app/views/weapps/attendances/_student_attendance.json.jbuilder b/app/views/weapps/attendances/_student_attendance.json.jbuilder new file mode 100644 index 000000000..9461c4976 --- /dev/null +++ b/app/views/weapps/attendances/_student_attendance.json.jbuilder @@ -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) \ No newline at end of file diff --git a/app/views/weapps/attendances/student_attendances.json.jbuilder b/app/views/weapps/attendances/student_attendances.json.jbuilder index 2c9bad5ac..91c6fd457 100644 --- a/app/views/weapps/attendances/student_attendances.json.jbuilder +++ b/app/views/weapps/attendances/student_attendances.json.jbuilder @@ -1,5 +1,5 @@ json.current_attendance do - json.partial! 'student_attendance', locals: {attendance: @current_attendance} + json.partial! 'student_attendance', locals: {attendance: @current_attendance} if @current_attendance.present? end json.history_attendances @history_attendances do |attendance| diff --git a/config/routes.rb b/config/routes.rb index ba06cb4c7..f82dfec11 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1054,7 +1054,7 @@ Rails.application.routes.draw do end resources :attendances, only: [:index, :update, :create, :show, :destroy], shallow: true do - member do + collection do get :student_attendances end end From 2491524975c1e9c57231167976c418dfd1dbfcb8 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 15:18:46 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course_member_attendance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/course_member_attendance.rb b/app/models/course_member_attendance.rb index a03d016bb..3b8aafda0 100644 --- a/app/models/course_member_attendance.rb +++ b/app/models/course_member_attendance.rb @@ -1,6 +1,6 @@ class CourseMemberAttendance < ApplicationRecord # attendance_mode ：1 二维码签到，2 数字签到，3 老师签到 - # attendance_status ：1 正常签到，2 请假 + # attendance_status ：1 正常签到，2 请假，0 旷课 belongs_to :course_member belongs_to :user belongs_to :course From 6632e728db76363d37ef0ef583ad561e08148146 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 18:17:29 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 2 +- .../course_member_attendances_controller.rb | 31 +++++++++++++++++++ app/models/course_member.rb | 1 + config/routes.rb | 2 ++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 app/controllers/weapps/course_member_attendances_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 15f918c01..b9d50a970 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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 diff --git a/app/controllers/weapps/course_member_attendances_controller.rb b/app/controllers/weapps/course_member_attendances_controller.rb new file mode 100644 index 000000000..9eca18d4b --- /dev/null +++ b/app/controllers/weapps/course_member_attendances_controller.rb @@ -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 \ No newline at end of file diff --git a/app/models/course_member.rb b/app/models/course_member.rb index 65849e5de..4772f0c36 100644 --- a/app/models/course_member.rb +++ b/app/models/course_member.rb @@ -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])} diff --git a/config/routes.rb b/config/routes.rb index b7c14e098..5ef805f21 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1065,6 +1065,8 @@ Rails.application.routes.draw do end end + resources :course_member_attendances, only: [:create] + resources :homework_commons do post :update_settings, on: :member end From faeecb454affe4c87b3fa7364ff62015c9b512bc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 3 Mar 2020 18:25:18 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E3=80=81=E5=AE=9E?= =?UTF-8?q?=E8=B7=B5=E8=AF=BE=E7=A8=8B=E5=8F=91=E9=80=81=E8=87=B3=E8=AF=BE?= =?UTF-8?q?=E5=A0=82=E7=9A=84=E8=B7=B3=E8=BD=AC=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/send_to_course.json.jbuilder | 2 +- app/views/subjects/send_to_course.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shixuns/send_to_course.json.jbuilder b/app/views/shixuns/send_to_course.json.jbuilder index 13b221d75..3331880c2 100644 --- a/app/views/shixuns/send_to_course.json.jbuilder +++ b/app/views/shixuns/send_to_course.json.jbuilder @@ -1,4 +1,4 @@ json.status 1 json.message "发送成功" json.course_id @course.id -json.first_category_url module_url(@course.none_hidden_course_modules.first, @course) \ No newline at end of file +json.first_category_url module_url(@course.shixun_course_modules.first, @course) \ No newline at end of file diff --git a/app/views/subjects/send_to_course.json.jbuilder b/app/views/subjects/send_to_course.json.jbuilder index defe309a2..e2ac515a6 100644 --- a/app/views/subjects/send_to_course.json.jbuilder +++ b/app/views/subjects/send_to_course.json.jbuilder @@ -1,3 +1,3 @@ json.status 1 json.message "发送成功" -json.url module_url(@course.none_hidden_course_modules.first, @course) \ No newline at end of file +json.url module_url(@course.shixun_course_modules.first, @course) \ No newline at end of file From c7eddb85a35d8b4185a17103275622271daa9001 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 3 Mar 2020 19:22:30 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8Dpod?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admins/dashboards_controller.rb | 8 + app/views/admins/dashboards/index.html.erb | 147 +++++------------- 2 files changed, 50 insertions(+), 105 deletions(-) diff --git a/app/controllers/admins/dashboards_controller.rb b/app/controllers/admins/dashboards_controller.rb index 3971971ff..15be92b99 100644 --- a/app/controllers/admins/dashboards_controller.rb +++ b/app/controllers/admins/dashboards_controller.rb @@ -5,6 +5,14 @@ class Admins::DashboardsController < Admins::BaseController @month_active_user_count = User.where(last_login_on: current_month).count @new_user_count = User.where(created_on: current_month).count + + shixun_tomcat = edu_setting('cloud_bridge') + + uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo" + res = interface_post uri, params, 502, "数据接口延迟" + if res['code'] == 0 + @pod_num = res['sum'] || 0 + end end def month_active_user diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb index e02c307a5..9aca8675b 100644 --- a/app/views/admins/dashboards/index.html.erb +++ b/app/views/admins/dashboards/index.html.erb @@ -42,10 +42,7 @@ - - - - + @@ -63,13 +60,50 @@ - - - - + + + +
+
+
+
+
+
当前在线用户数
+ <%= @month_active_user_count %> +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+
当前Pod总数
+ <%= @pod_num.to_i %> +
+
+
+ +
+
+
+ +
+
+
+
@@ -100,14 +134,6 @@
- - - - - - - -
@@ -127,92 +153,3 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - <%# 5.times do %> - - - - - - - - - <%# end %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%# 5.times do %> - - - - - - - - - - - - - - - - - - - <%# end %> - - - - - - - \ No newline at end of file From 05b0a14323bf7bb651a5878236f496cfed0d53b4 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 3 Mar 2020 19:29:27 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9C=A8=E7=BA=BFpods=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/dashboards/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb index 9aca8675b..d182bba8a 100644 --- a/app/views/admins/dashboards/index.html.erb +++ b/app/views/admins/dashboards/index.html.erb @@ -72,7 +72,7 @@
当前在线用户数
- <%= @month_active_user_count %> + <%= @online_users %>
From 92e88f08d1bdce53d9c5ce5a3f253cb316c4b06b Mon Sep 17 00:00:00 2001 From: anke1460 Date: Tue, 3 Mar 2020 20:01:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/login_helper.rb | 6 ++++ app/controllers/main_controller.rb | 1 + app/libs/user_online.rb | 41 ++++++++++++++++++++++ app/views/admins/dashboards/index.html.erb | 2 +- 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 app/libs/user_online.rb diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index b85b17a22..e3ef0480c 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -35,6 +35,7 @@ module LoginHelper UserAction.create(action_id: user&.id, action_type: 'Login', user_id: user&.id, ip: request.remote_ip) user.update_column(:last_login_on, Time.now) + # 注册完成后有一天的试用申请(先去掉) # UserDayCertification.create(user_id: user.id, status: 1) end @@ -44,6 +45,8 @@ module LoginHelper if autologin = cookies.delete(autologin_cookie_name) User.current.delete_autologin_token(autologin) end + + UserOnline.logout(User.current.id) User.current.delete_session_token(session[:tk]) self.logged_user = nil end @@ -52,6 +55,7 @@ module LoginHelper default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id" # end session[:"#{default_yun_session}"] = nil + session[:request_user_id] = nil end # Sets the logged in user @@ -78,6 +82,8 @@ module LoginHelper # # end # session[:user_id] = user.id + UserOnline.login(user.id) + session[:request_user_id] = user.id session[:"#{default_yun_session}"] = user.id session[:ctime] = Time.now.utc.to_i session[:atime] = Time.now.utc.to_i diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 69323bf49..3d2383573 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -4,6 +4,7 @@ class MainController < ApplicationController skip_before_action :setup_laboratory def first_stamp + UserOnline.login(session[:request_user_id]) if session[:request_user_id] render :json => { status: 0, message: Time.now.to_i } end diff --git a/app/libs/user_online.rb b/app/libs/user_online.rb new file mode 100644 index 000000000..8db5754f3 --- /dev/null +++ b/app/libs/user_online.rb @@ -0,0 +1,41 @@ +module UserOnline + class << self + def login(user_id) + set_bit(user_id, 1) + end + + def logout(user_id) + set_bit(user_id, 0) + end + + def set_bit(user_id, flag) + if !Rails.cache.data.exists(cache_key) + Rails.cache.data.setbit(cache_key, user_id, flag) + Rails.cache.data.expire(cache_key, 20 * 60 + 10) + else + Rails.cache.data.setbit(cache_key, user_id, flag) + end + end + + def count + if Rails.cache.is_a?(ActiveSupport::Cache::RedisStore) + Rails.cache.data.bitcount(cache_key) + else + 0 + end + end + + def cache_key + if Rails.cache.is_a?(ActiveSupport::Cache::RedisStore) + # 10分钟为一段记录用户在线, 统计范围为20分钟内的线用户 + # TODO 更精确时长 + begin_hour = Time.now.beginning_of_hour + minutes_piece = (Time.now - begin_hour) / 600 + time = begin_hour.since((minutes_piece.to_i - 1) * 600).strftime("%H-%M") + "online_user_#{time}" + else + raise '请配置config.cache_store = redis_store' + end + end + end +end diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb index d182bba8a..896b12a2f 100644 --- a/app/views/admins/dashboards/index.html.erb +++ b/app/views/admins/dashboards/index.html.erb @@ -72,7 +72,7 @@
当前在线用户数
- <%= @online_users %> + <%= UserOnline.count %>