commit
e719671132
@ -0,0 +1,2 @@
|
||||
web: cd client && npm start
|
||||
api: bundle exec rails s -p 3001
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,81 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
if ($('body.admins-user-schools-statistics-index-page').length > 0) {
|
||||
var $form = $('.user-schools-statistic-list-form');
|
||||
|
||||
// ************** 学校选择 *************
|
||||
var matcherFunc = function(params, data){
|
||||
if ($.trim(params.term) === '') {
|
||||
return data;
|
||||
}
|
||||
if (typeof data.text === 'undefined') {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (data.name && data.name.indexOf(params.term) > -1) {
|
||||
var modifiedData = $.extend({}, data, true);
|
||||
return modifiedData;
|
||||
}
|
||||
|
||||
// Return `null` if the term should not be displayed
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
var defineSchoolSelect = function (schools) {
|
||||
$form.find('.school-select').select2({
|
||||
theme: 'bootstrap4',
|
||||
placeholder: '选择学校/单位',
|
||||
minimumInputLength: 1,
|
||||
data: schools,
|
||||
templateResult: function (item) {
|
||||
if(!item.id || item.id === '') return item.text;
|
||||
return item.name;
|
||||
},
|
||||
templateSelection: function(item){
|
||||
if (item.id) {
|
||||
$form.find('#school_id').val(item.id);
|
||||
}
|
||||
return item.name || item.text;
|
||||
},
|
||||
matcher: matcherFunc
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
// 初始化学校选择器
|
||||
$.ajax({
|
||||
url: '/api/schools/for_option.json',
|
||||
dataType: 'json',
|
||||
type: 'GET',
|
||||
success: function(data) {
|
||||
defineSchoolSelect(data.schools);
|
||||
}
|
||||
});
|
||||
|
||||
// 清空
|
||||
$form.on('click', '.clear-btn', function(){
|
||||
$form.find('select[name="date"]').val('');
|
||||
$form.find('select[name="province"]').val('');
|
||||
$form.find('.school-select').val('').trigger('change');
|
||||
$form.find('input[type="submit"]').trigger('click');
|
||||
})
|
||||
|
||||
|
||||
// 导出
|
||||
$('.export-action').on('click', function(){
|
||||
var form = $(".user-schools-statistic-list-form")
|
||||
var exportLink = $(this);
|
||||
var date = form.find("select[name='date']").val();
|
||||
var schoolId = form.find('input[name="school_id"]').val();
|
||||
var province = form.find('input[name="province"]').val();
|
||||
console.log(province)
|
||||
if(province == "" || province == null){
|
||||
alert("只能按省份导出");
|
||||
return;
|
||||
}
|
||||
|
||||
var url = exportLink.data("url").split('?')[0] + "?date=" + date + "&school_id=" + schoolId + "&province=" + province;
|
||||
window.open(url);
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -0,0 +1,25 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
if ($('.weapp-banner-setting-container').length > 0) {
|
||||
var $form = $('#course_form');
|
||||
|
||||
$('.course.banner-item-bottom').on("change", 'input[type="file"]', function() {
|
||||
var $fileInput = $(this);
|
||||
var file = this.files[0];
|
||||
var imageType = /image.*/;
|
||||
if (file && file.type.match(imageType)) {
|
||||
$form.ajaxSubmit()
|
||||
}
|
||||
});
|
||||
|
||||
var $shixunform = $('#shixun_form');
|
||||
|
||||
$('.shixun.banner-item-bottom').on("change", 'input[type="file"]', function() {
|
||||
var $fileInput = $(this);
|
||||
var file = this.files[0];
|
||||
var imageType = /image.*/;
|
||||
if (file && file.type.match(imageType)) {
|
||||
$shixunform.ajaxSubmit()
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
@ -1,171 +1,154 @@
|
||||
.admins-laboratories-index-page {
|
||||
.laboratory-list-table {
|
||||
.member-container {
|
||||
.laboratory-user {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
|
||||
.laboratory-user-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 22px;
|
||||
line-height: 22px;
|
||||
padding: 2px 5px;
|
||||
margin: 2px 2px;
|
||||
border: 1px solid #91D5FF;
|
||||
background-color: #E6F7FF;
|
||||
color: #91D5FF;
|
||||
border-radius: 4px;
|
||||
.laboratory-list-table {
|
||||
.member-container {
|
||||
.laboratory-user {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
.laboratory-user-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 22px;
|
||||
line-height: 22px;
|
||||
padding: 2px 5px;
|
||||
margin: 2px 2px;
|
||||
border: 1px solid #91D5FF;
|
||||
background-color: #E6F7FF;
|
||||
color: #91D5FF;
|
||||
border-radius: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.admins-laboratory-settings-show-page, .admins-laboratory-settings-update-page {
|
||||
.edit-laboratory-setting-container {
|
||||
.logo-item {
|
||||
display: flex;
|
||||
|
||||
&-img {
|
||||
display: block;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
background: #f0f0f0;
|
||||
}
|
||||
|
||||
&-upload {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
background: #F5F5F5;
|
||||
border: 1px solid #E5E5E5;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 27px;
|
||||
left: 39px;
|
||||
width: 2px;
|
||||
height: 26px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 39px;
|
||||
left: 27px;
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
}
|
||||
|
||||
&-left {
|
||||
position: relative;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
|
||||
&.has-img {
|
||||
.logo-item-upload {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.logo-item-upload {
|
||||
display: block;
|
||||
background: rgba(145, 145, 145, 0.8);
|
||||
.admins-laboratory-settings-show-page,
|
||||
.admins-laboratory-settings-update-page,
|
||||
.weapp-banner-setting-container {
|
||||
.edit-laboratory-setting-container {
|
||||
.logo-item {
|
||||
display: flex;
|
||||
&-img {
|
||||
display: block;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
background: #f0f0f0;
|
||||
}
|
||||
&-upload {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
background: #F5F5F5;
|
||||
border: 1px solid #E5E5E5;
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 27px;
|
||||
left: 39px;
|
||||
width: 2px;
|
||||
height: 26px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 39px;
|
||||
left: 27px;
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
}
|
||||
&-left {
|
||||
position: relative;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
&.has-img {
|
||||
.logo-item-upload {
|
||||
display: none;
|
||||
}
|
||||
&:hover {
|
||||
.logo-item-upload {
|
||||
display: block;
|
||||
background: rgba(145, 145, 145, 0.8);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
&-right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
color: #777777;
|
||||
font-size: 12px;
|
||||
}
|
||||
&-title {
|
||||
color: #23272B;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&-right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
color: #777777;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
&-title {
|
||||
color: #23272B;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
.banner-item {
|
||||
margin-bottom: 15px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
&-img {
|
||||
display: block;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
background: #f0f0f0;
|
||||
}
|
||||
|
||||
&-upload {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
background: #F5F5F5;
|
||||
border: 1px solid #E5E5E5;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 27px;
|
||||
left: 149px;
|
||||
width: 2px;
|
||||
height: 26px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 39px;
|
||||
left: 137px;
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
}
|
||||
|
||||
&-top {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
&-bottom {
|
||||
position: relative;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
|
||||
&.has-img {
|
||||
.banner-item-upload {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.banner-item-upload {
|
||||
display: block;
|
||||
background: rgba(145, 145, 145, 0.8);
|
||||
.banner-item {
|
||||
margin-bottom: 15px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
&-img {
|
||||
display: block;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
background: #f0f0f0;
|
||||
}
|
||||
&-upload {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
background: #F5F5F5;
|
||||
border: 1px solid #E5E5E5;
|
||||
&::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 27px;
|
||||
left: 149px;
|
||||
width: 2px;
|
||||
height: 26px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 39px;
|
||||
left: 137px;
|
||||
width: 26px;
|
||||
height: 2px;
|
||||
background: #E5E5E5;
|
||||
}
|
||||
}
|
||||
&-top {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
&-bottom {
|
||||
position: relative;
|
||||
width: 300px;
|
||||
height: 80px;
|
||||
&.has-img {
|
||||
.banner-item-upload {
|
||||
display: none;
|
||||
}
|
||||
&:hover {
|
||||
.banner-item-upload {
|
||||
display: block;
|
||||
background: rgba(145, 145, 145, 0.8);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
&-title {
|
||||
color: #23272B;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&-title {
|
||||
color: #23272B;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
class Admins::UserSchoolsStatisticsController < Admins::BaseController
|
||||
|
||||
def export
|
||||
params[:per_page] = 500
|
||||
_count, @schools = Admins::UserSchoolsStatisticQuery.call(params)
|
||||
|
||||
filename = ['用户运营统计', Time.zone.now.strftime('%Y%m%d%H%M%S')].join('-') << '.xlsx'
|
||||
render xlsx: 'export', filename: filename
|
||||
end
|
||||
|
||||
def index
|
||||
default_sort('cnt', 'desc')
|
||||
total_count, schools = Admins::UserSchoolsStatisticQuery.call(params)
|
||||
|
||||
@schools = paginate schools, total_count: total_count
|
||||
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,52 @@
|
||||
class Admins::WeappBannersController < Admins::BaseController
|
||||
|
||||
def index
|
||||
@shixun = WeappSettings::ShixunBanner.first
|
||||
@course = WeappSettings::CourseBanner.first
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
old_carouse = WeappSettings::CourseBanner.first
|
||||
|
||||
if old_carouse.present?
|
||||
old_carouse.destroy!
|
||||
file_path = Util::FileManage.source_disk_filename(old_carouse)
|
||||
File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
|
||||
end
|
||||
|
||||
@course = WeappSettings::CourseBanner.create!
|
||||
save_image_file(params[:course_banner], @course)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def shixun_banner
|
||||
ActiveRecord::Base.transaction do
|
||||
old_shixun = WeappSettings::ShixunBanner.first
|
||||
|
||||
if old_shixun.present?
|
||||
old_shixun.destroy!
|
||||
file_path = Util::FileManage.source_disk_filename(old_shixun)
|
||||
File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
|
||||
end
|
||||
|
||||
@shixun = WeappSettings::ShixunBanner.create!
|
||||
save_image_file(params[:shixun_banner], @shixun)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
private
|
||||
|
||||
def save_image_file(file, model)
|
||||
return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
|
||||
|
||||
file_path = Util::FileManage.source_disk_filename(model)
|
||||
File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
|
||||
Util.write_file(file, file_path)
|
||||
end
|
||||
|
||||
end
|
||||
@ -0,0 +1,35 @@
|
||||
class CourseVideosController < ApplicationController
|
||||
before_action :require_login
|
||||
before_action :validate_params
|
||||
before_action :find_course, only: [:create]
|
||||
before_action :find_video, only: [:update]
|
||||
before_action :teacher_allowed
|
||||
|
||||
def create
|
||||
title = params[:name].strip
|
||||
link = params[:link].strip
|
||||
course_second_category_id = params[:category_id] || 0
|
||||
@course.course_videos.create!(title: title, link: link, is_link: 1, user_id: current_user.id, course_second_category_id: course_second_category_id)
|
||||
render_ok
|
||||
end
|
||||
|
||||
def update
|
||||
title = params[:name].strip
|
||||
link = params[:link].strip
|
||||
@video.update!(title: title, link: link)
|
||||
render_ok
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def validate_params
|
||||
tip_exception("视频名称不能为空") if params[:name].blank?
|
||||
tip_exception("链接地址不能为空") if params[:link].blank?
|
||||
end
|
||||
|
||||
def find_video
|
||||
@video = CourseVideo.find params[:id]
|
||||
@course = @video.course
|
||||
end
|
||||
|
||||
end
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,169 @@
|
||||
class Weapps::AttendancesController < ApplicationController
|
||||
before_action :require_login
|
||||
before_action :find_course, only: [:create, :index, :student_attendances, :history_attendances]
|
||||
before_action :find_attendance, except: [:create, :index, :student_attendances, :history_attendances]
|
||||
before_action :user_course_identity
|
||||
before_action :teacher_allowed, only: [:create]
|
||||
before_action :edit_auth, only: [:update, :destroy, :end]
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
attendance = @course.course_attendances.create!(create_params.merge(user_id: current_user.id))
|
||||
unless params[:group_ids].blank? || @course.course_groups.where(id: params[:group_ids]).count == @course.course_groups.count
|
||||
group_ids = @course.charge_group_ids(current_user) & params[:group_ids].map(&:to_i)
|
||||
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)
|
||||
else
|
||||
@course.course_attendance_groups.create!(course_group_id: 0, course_attendance: attendance)
|
||||
CreateStudentAttendanceRecordJob.perform_now(attendance.id, [0])
|
||||
end
|
||||
render_ok({attendance_id: attendance.id})
|
||||
end
|
||||
end
|
||||
|
||||
def index
|
||||
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}' 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}')")
|
||||
@all_member_attendances = CourseMemberAttendance.where(course_attendance_id: all_attendances)
|
||||
if params[:group_id].present?
|
||||
all_attendances = all_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: [params[:group_id], 0]})
|
||||
@all_member_attendances = @all_member_attendances.joins(:course_member).where(course_members: {course_group_id: params[:group_id]})
|
||||
end
|
||||
|
||||
@history_attendances = all_attendances.order("id asc")
|
||||
@all_history_count = @history_attendances.size
|
||||
end
|
||||
|
||||
def student_attendances
|
||||
tip_exception(403) if @user_course_identity > Course::STUDENT
|
||||
# tip_exception("学生身份的签到列表") if @user_course_identity != Course::STUDENT
|
||||
member = @course.students.find_by(user_id: current_user.id)
|
||||
if member.present?
|
||||
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_attendance_ids = member.course_member_attendances.where(course_id: @course.id).pluck(:course_attendance_id)
|
||||
|
||||
@history_attendances = @course.course_attendances.where(id: history_attendance_ids.uniq).
|
||||
where("attendance_date < '#{current_date}' or (attendance_date = '#{current_date}' and end_time < '#{current_end_time}')").order("id desc")
|
||||
@current_attendances = @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}'")
|
||||
@history_count = @history_attendances.size
|
||||
|
||||
# 当前签到如果存在快捷签到，则直接签到（不在这里处理）
|
||||
# quick_attendances = @current_attendances.where(mode: "QUICK")
|
||||
# if quick_attendances.present?
|
||||
# student_direct_attendance quick_attendances, member
|
||||
# end
|
||||
|
||||
student_attendance_ids = @history_attendances.pluck(:id)
|
||||
student_attendance_ids += @current_attendances.present? ? @current_attendances.pluck(: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_member_id: member&.id, course_attendance_id: student_attendance_ids, attendance_status: "NORMAL").size
|
||||
@leave_count = @course.course_member_attendances.where(course_member_id: member&.id, course_attendance_id: student_attendance_ids, attendance_status: "LEAVE").size
|
||||
# 旷课只统计历史签到的
|
||||
@absence_count = @course.course_member_attendances.where(course_member_id: member&.id, course_attendance_id: @history_attendances.pluck(:id), attendance_status: "ABSENCE").size
|
||||
end
|
||||
|
||||
@all_history_count = @history_attendances.size
|
||||
@history_attendances = paginate @history_attendances.includes(:course_member_attendances)
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
@normal_count = @attendance.normal_count
|
||||
@leave_count = @attendance.leave_count
|
||||
@absence_count = @attendance.absence_count
|
||||
@all_count = @attendance.course_member_attendances.size
|
||||
|
||||
@_is_current_attendance = @attendance.current_attendance?
|
||||
|
||||
if @attendance.course_attendance_groups.first&.course_group_id.to_i == 0
|
||||
@group_ids = @course.course_groups.pluck(:id) + [0]
|
||||
else
|
||||
@group_ids = @attendance.course_attendance_groups.pluck(:course_group_id)
|
||||
end
|
||||
|
||||
@groups = @course.course_groups.where(id: @group_ids)
|
||||
@course_members = @course.students if @_is_current_attendance
|
||||
|
||||
@all_attendances = @attendance.course_member_attendances
|
||||
end
|
||||
|
||||
def update
|
||||
@attendance.update!(name: params[:name])
|
||||
render_ok
|
||||
end
|
||||
|
||||
def destroy
|
||||
@attendance.destroy!
|
||||
render_ok
|
||||
end
|
||||
|
||||
def history_attendances
|
||||
current_date = Date.current
|
||||
current_end_time = Time.current.strftime("%H:%M:%S")
|
||||
|
||||
@history_attendances = @course.course_attendances.where("attendance_date < '#{current_date}' or
|
||||
(attendance_date = '#{current_date}' and end_time < '#{current_end_time}')").order("id desc")
|
||||
@all_history_count = @history_attendances.size
|
||||
@history_attendances = paginate @history_attendances.includes(:course_member_attendances)
|
||||
end
|
||||
|
||||
def end
|
||||
a_end_time = "#{@attendance.attendance_date} #{@attendance.end_time}".to_time
|
||||
tip_exception("该签到已截止") if a_end_time < Time.now
|
||||
|
||||
a_start_time = "#{@attendance.attendance_date} #{@attendance.start_time}".to_time
|
||||
if a_start_time > Time.now
|
||||
@attendance.update!(end_time: Time.current, start_time: Time.current, attendance_date: Date.current)
|
||||
else
|
||||
@attendance.update!(end_time: Time.current)
|
||||
end
|
||||
render_ok
|
||||
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
|
||||
|
||||
def edit_auth
|
||||
tip_exception(403, "") unless @user_course_identity < Course::PROFESSOR || @attendance.user_id == current_user.id
|
||||
end
|
||||
|
||||
def student_direct_attendance quick_attendances, member
|
||||
quick_attendances.each do |attendance|
|
||||
current_attendance = attendance.course_member_attendances.find_by(user_id: member.user_id)
|
||||
if current_attendance.present?
|
||||
current_attendance.update!(attendance_status: "NORMAL", attendance_mode: "QUICK")
|
||||
else
|
||||
attendance.course_member_attendances.create!(course_member_id: member.id, user_id: member.user_id, course_id: attendance.course_id,
|
||||
course_group_id: member.course_group_id, attendance_status: "NORMAL", attendance_mode: "QUICK")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,12 @@
|
||||
class Weapps::BannersController < Weapps::BaseController
|
||||
|
||||
def index
|
||||
shixun = WeappSettings::ShixunBanner.first
|
||||
course = WeappSettings::CourseBanner.first
|
||||
|
||||
render json: {
|
||||
shixun_img: shixun ? Util::FileManage.source_disk_file_url(shixun) : '',
|
||||
course_img: course ? Util::FileManage.source_disk_file_url(course) : ''
|
||||
}
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,81 @@
|
||||
class Weapps::CourseMemberAttendancesController < ApplicationController
|
||||
before_action :require_login
|
||||
before_action :find_course, :user_course_identity, only: [:update_status]
|
||||
|
||||
def index
|
||||
attendance = CourseAttendance.find params[:attendance_id]
|
||||
if attendance.course_attendance_groups.first&.course_group_id.to_i == 0
|
||||
@members = attendance.course.students
|
||||
else
|
||||
@members = attendance.course.students.where(course_group_id: attendance.course_attendance_groups.pluck(:course_group_id))
|
||||
end
|
||||
@member_attendances = attendance.course_member_attendances
|
||||
if params[:group_ids].present?
|
||||
@members = @members.where(course_group_id: params[:group_ids])
|
||||
end
|
||||
|
||||
if params[:attendance_status].present?
|
||||
@members = @members.joins(:course_member_attendances).where(course_member_attendances: {course_attendance_id: attendance.id, attendance_status: params[:attendance_status]})
|
||||
end
|
||||
|
||||
@members = @members.joins(:course_member_attendances).order("attendance_status=1 desc, course_member_attendances.updated_at desc")
|
||||
@members_count = @members.uniq.count
|
||||
@members = paginate @members.preload(user: :user_extension).uniq
|
||||
|
||||
# @member_attendances = @member_attendances.where(attendance_status: params[:attendance_status]) if params[:attendance_status].present?
|
||||
# @member_attendances = @member_attendances.joins(user: :user_extension).order("attendance_status=1 desc, course_member_attendances.updated_at desc, user_extensions.student_id asc")
|
||||
# @member_attendances = paginate @member_attendances.preload(user: :user_extension)
|
||||
end
|
||||
|
||||
def create
|
||||
tip_exception("签到码不能为空") if params[:attendance_mode] != "QUICK" && params[:code].blank?
|
||||
tip_exception("attendance_mode参数不对") unless ["NUMBER", "QRCODE", "QUICK"].include?(params[:attendance_mode])
|
||||
|
||||
if params[:attendance_mode] == "QUICK"
|
||||
attendance = CourseAttendance.find_by(id: params[:attendance_id])
|
||||
else
|
||||
attendance = CourseAttendance.find_by(attendance_code: params[:code])
|
||||
end
|
||||
tip_exception("该签到不存在") if attendance.blank? || attendance.course.blank?
|
||||
|
||||
member = attendance.course.students.find_by(user_id: current_user.id)
|
||||
tip_exception("该签到不存在") if member.blank?
|
||||
|
||||
tip_exception("不在签到时间内") unless attendance.current_attendance?
|
||||
|
||||
tip_exception("只支持数字签到") if attendance.mode != "ALL" && attendance.mode == "NUMBER" && params[:attendance_mode] != "NUMBER"
|
||||
tip_exception("只支持二维码签到") if attendance.mode != "ALL" && attendance.mode == "QRCODE" && params[:attendance_mode] != "QRCODE"
|
||||
tip_exception("只支持快捷签到") if attendance.mode == "QUICK" && params[:attendance_mode] != "QUICK"
|
||||
|
||||
current_attendance = attendance.course_member_attendances.find_by(user_id: current_user.id)
|
||||
if current_attendance.present?
|
||||
tip_exception("请勿重复签到") if current_attendance.attendance_status == "NORMAL"
|
||||
tip_exception("您当前是请假状态，无法签到") if current_attendance.attendance_status == "LEAVE"
|
||||
tip_exception("您当前是旷课状态，无法签到") if current_attendance.attendance_status == "ABSENCE" && current_attendance.attendance_mode == "TEACHER"
|
||||
current_attendance.update!(attendance_status: "NORMAL", attendance_mode: params[:attendance_mode])
|
||||
else
|
||||
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: "NORMAL", attendance_mode: params[:attendance_mode])
|
||||
end
|
||||
|
||||
render_ok
|
||||
end
|
||||
|
||||
def update_status
|
||||
tip_exception("user_id不能为空") if params[:user_id].blank?
|
||||
tip_exception(403, "无权限调整签到状态") if @user_course_identity > Course::ASSISTANT_PROFESSOR
|
||||
tip_exception("attendance_status参数不对") unless ["NORMAL", "LEAVE", "ABSENCE"].include?(params[:attendance_status])
|
||||
attendance = @course.course_attendances.find_by!(id: params[:attendance_id])
|
||||
current_attendance = attendance.course_member_attendances.find_by(user_id: params[:user_id])
|
||||
if current_attendance.present?
|
||||
current_attendance.update!(attendance_status: params[:attendance_status], attendance_mode: "TEACHER")
|
||||
else
|
||||
member = attendance.course.students.find_by(user_id: params[:user_id])
|
||||
tip_exception( "该用户非课堂学生") if member.blank?
|
||||
attendance.course_member_attendances.create!(course_member_id: member.id, user_id: params[:user_id], course_id: attendance.course_id,
|
||||
course_group_id: member.course_group_id, attendance_status: params[:attendance_status], attendance_mode: "TEACHER")
|
||||
end
|
||||
render_ok
|
||||
end
|
||||
|
||||
end
|
||||
@ -0,0 +1,20 @@
|
||||
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 : "ABSENCE"
|
||||
end
|
||||
|
||||
def group_attendance_count attendances, member_ids
|
||||
# course_member_ids = group.course_members.pluck(:id)
|
||||
attendances.select{|attendance| member_ids.include?(attendance.course_member_id) && attendance.attendance_status == "NORMAL"}.size
|
||||
end
|
||||
|
||||
def history_member_count member_attendances, status, attendance_id
|
||||
member_attendances.select{|member_attendance| member_attendance.attendance_status == status && member_attendance.course_attendance_id == attendance_id}.size
|
||||
end
|
||||
|
||||
def cal_rate base, sum
|
||||
sum == 0 ? 0 : (base.to_f / sum)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,26 @@
|
||||
class CreateStudentAttendanceRecordJob < ApplicationJob
|
||||
queue_as :default
|
||||
|
||||
def perform(attendance_id, group_ids)
|
||||
attendance = CourseAttendance.find_by(id: attendance_id)
|
||||
course = attendance.course
|
||||
return if attendance.blank? || course.blank?
|
||||
|
||||
if group_ids.include?(0)
|
||||
students = course.students
|
||||
else
|
||||
students = course.students.where(course_group_id: group_ids)
|
||||
end
|
||||
|
||||
attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at]
|
||||
|
||||
same_attrs = {course_attendance_id: attendance.id, course_id: course.id}
|
||||
|
||||
CourseMemberAttendance.bulk_insert(*attrs) do |worker|
|
||||
|
||||
students.each do |student|
|
||||
worker.add same_attrs.merge(user_id: student.user_id, course_member_id: student.id, course_group_id: student.course_group_id)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,32 @@
|
||||
class StudentJoinAttendanceRecordJob < ApplicationJob
|
||||
queue_as :default
|
||||
|
||||
def perform(member_id)
|
||||
member = CourseMember.find_by(id: member_id)
|
||||
course = member&.course
|
||||
return if member.blank? || course.blank?
|
||||
|
||||
current_date = Date.current
|
||||
current_end_time = Time.current.strftime("%H:%M:%S")
|
||||
group_ids = member.course_group_id == 0 ? [0] : [member.course_group_id, 0]
|
||||
|
||||
current_attendance_ids = course.course_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: group_ids}).
|
||||
where("(attendance_date = '#{current_date}' and start_time <= '#{current_end_time}' and end_time > '#{current_end_time}') or (attendance_date > '#{current_date}')").pluck(:id)
|
||||
|
||||
all_group_attendance_ids = course.course_attendances.joins(:course_attendance_groups).where(course_attendance_groups: {course_group_id: 0}).pluck(:id)
|
||||
member.course_member_attendances.where.not(course_attendance_id: all_group_attendance_ids+current_attendance_ids).delete_all
|
||||
|
||||
attrs = %i[course_attendance_id user_id course_member_id course_id course_group_id created_at updated_at]
|
||||
|
||||
same_attrs = {course_member_id: member_id, course_id: course.id, user_id: member.user_id, course_group_id: member.course_group_id}
|
||||
|
||||
CourseMemberAttendance.bulk_insert(*attrs) do |worker|
|
||||
|
||||
current_attendance_ids.each do |attendance_id|
|
||||
unless course.course_member_attendances.where(course_member_id: member_id, course_attendance_id: attendance_id).exists?
|
||||
worker.add same_attrs.merge(course_attendance_id: attendance_id)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -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
|
||||
@ -0,0 +1,5 @@
|
||||
class CourseAttendanceGroup < ApplicationRecord
|
||||
belongs_to :course
|
||||
belongs_to :course_attendance
|
||||
belongs_to :course_group, optional: true
|
||||
end
|
||||
@ -1,4 +1,8 @@
|
||||
class CourseVideo < ApplicationRecord
|
||||
belongs_to :course
|
||||
belongs_to :video
|
||||
belongs_to :video, optional: true
|
||||
belongs_to :user, optional: true
|
||||
|
||||
validates :title, length: { maximum: 60, too_long: "不能超过60个字符" }, allow_blank: true
|
||||
validates :link, format: { with: CustomRegexp::URL, message: "必须为网址超链接" }, allow_blank: true
|
||||
end
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
#encoding=utf-8
|
||||
class Ecloud < ActiveRecord::Base
|
||||
# attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime,
|
||||
# :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email,
|
||||
# :effecttime, :operatime
|
||||
|
||||
has_many :ecloud_services, :dependent => :destroy # 业务列表
|
||||
has_many :ecloud_productparas, :dependent => :destroy # 开通参数列表
|
||||
|
||||
has_one :ecloud_user
|
||||
end
|
||||
@ -0,0 +1,3 @@
|
||||
class EcloudLog < ActiveRecord::Base
|
||||
|
||||
end
|
||||
@ -0,0 +1,4 @@
|
||||
class EcloudProductpara < ActiveRecord::Base
|
||||
# attr_accessible :key, :value, :ecloud_id
|
||||
belongs_to :ecloud
|
||||
end
|
||||
@ -0,0 +1,3 @@
|
||||
class EcloudUser < ActiveRecord::Base
|
||||
has_many :ecloud_user_paras
|
||||
end
|
||||
@ -0,0 +1,3 @@
|
||||
class EcloudUserPara < ActiveRecord::Base
|
||||
belongs_to :ecloud_user
|
||||
end
|
||||
@ -1,9 +1,9 @@
|
||||
class HackSet < ApplicationRecord
|
||||
validates_length_of :input, maximum: 1000, message: "不能超过1000个字符"
|
||||
validates_length_of :output, maximum: 1000, message: "不能超过1000个字符"
|
||||
validates :input, presence: { message: "测试集输入不能为空" }
|
||||
validates :output, presence: { message: "测试集输出不能为空" }
|
||||
validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个测试集的输入不能相同"
|
||||
#validates :input, presence: { message: "测试集输入不能为空" }
|
||||
validates_presence_of :output, message: "不能为空"
|
||||
#validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个不能相同"
|
||||
# 编程题测试集
|
||||
belongs_to :hack
|
||||
end
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
class TeacherGroupRecord < ApplicationRecord
|
||||
belongs_to :user
|
||||
belongs_to :course
|
||||
end
|
||||
@ -0,0 +1,3 @@
|
||||
class WeappSettings::CourseBanner < WeappSetting
|
||||
default_scope { order(position: :asc) }
|
||||
end
|
||||
@ -0,0 +1,3 @@
|
||||
class WeappSettings::ShixunBanner < WeappSetting
|
||||
default_scope { order(position: :asc) }
|
||||
end
|
||||
@ -0,0 +1,114 @@
|
||||
class Admins::UserSchoolsStatisticQuery < ApplicationQuery
|
||||
include CustomSortable
|
||||
|
||||
attr_reader :params
|
||||
|
||||
sort_columns :cnt,
|
||||
default_by: :cnt, default_direction: :desc
|
||||
|
||||
def initialize(params)
|
||||
@params = params
|
||||
end
|
||||
|
||||
def call
|
||||
schools = School
|
||||
if params[:province].present?
|
||||
schools = schools.where("province like ?", "%#{params[:province]}%")
|
||||
end
|
||||
|
||||
if params[:school_id].present?
|
||||
schools = schools.where(id: params[:school_id])
|
||||
end
|
||||
|
||||
total = schools.count
|
||||
# 根据排序字段进行查询
|
||||
schools = query_by_sort_column(schools.group(:id), params[:sort_by])
|
||||
#schools = custom_sort(schools, params[:sort_by], params[:sort_direction])
|
||||
schools = schools.limit(page_size).offset(offset).to_a
|
||||
# 查询并组装其它数据
|
||||
schools = package_other_data(schools)
|
||||
[total, schools]
|
||||
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def package_other_data(schools)
|
||||
ids = schools.map(&:id)
|
||||
user_e = UserExtension.where(school_id: schools.map(&:id))
|
||||
#study_myshixun = Myshixun.joins("join user_extensions ue on ue.user_id = myshixuns.user_id").where(ue: {school_id: ids})
|
||||
#finish_myshixun = Myshixun.joins("join user_extensions ue on ue.user_id = myshixuns.user_id")
|
||||
# .where(ue: {school_id: ids}, myshixuns: {status: 1})
|
||||
study_challenge = Game.joins("join user_extensions ue on ue.user_id = games.user_id")
|
||||
.where(ue: {school_id: ids},).where( games:{status: [0, 1, 2]})
|
||||
finish_challenge = Game.joins("join user_extensions ue on ue.user_id = games.user_id")
|
||||
.where(ue: {school_id: ids}).where(games: {status: 2})
|
||||
reg_teacher = user_e.where(identity: 'teacher')
|
||||
reg_student = user_e.where.not(identity: 'teacher')
|
||||
|
||||
if time_range.present?
|
||||
#study_myshixun = study_myshixun.where(updated_at: time_range)
|
||||
#finish_myshixun = finish_myshixun.where(updated_at: time_range)
|
||||
study_challenge = study_challenge.where(updated_at: time_range)
|
||||
finish_challenge = finish_challenge.where(updated_at: time_range)
|
||||
reg_teacher = reg_teacher.where(created_at: time_range)
|
||||
reg_student = reg_student.where(created_at: time_range)
|
||||
user_e = user_e.joins(:user).where(users: {last_login_on: time_range})
|
||||
end
|
||||
|
||||
#study_myshixun_map = study_myshixun.reorder(nil).group(:school_id).count
|
||||
#finish_myshixun_map = finish_myshixun.reorder(nil).group(:school_id).count
|
||||
study_challenge_map = study_challenge.reorder(nil).group(:school_id).count
|
||||
finish_challenge_map = finish_challenge.reorder(nil).group(:school_id).count
|
||||
evaluate_count_map = study_challenge.reorder(nil).group(:school_id).sum(:evaluate_count)
|
||||
reg_teacher_map = reg_teacher.reorder(nil).group(:school_id).count
|
||||
reg_student_map = reg_student.reorder(nil).group(:school_id).count
|
||||
user_e_map = user_e.reorder(nil).group(:school_id).count
|
||||
|
||||
schools.each do |school|
|
||||
school._extra_data = {
|
||||
#study_shixun_count: study_myshixun_map.fetch(schools.id, 0),
|
||||
#finish_shixun_count: finish_myshixun_map.fetch(schools.id, 0),
|
||||
study_challenge_count: study_challenge_map.fetch(school.id, 0),
|
||||
finish_challenge_count: finish_challenge_map.fetch(school.id, 0),
|
||||
evaluate_count: evaluate_count_map.fetch(school.id, 0),
|
||||
reg_teacher_count: reg_teacher_map.fetch(school.id, 0),
|
||||
reg_student_count: reg_student_map.fetch(school.id, 0),
|
||||
user_active_count: user_e_map.fetch(school.id, 0)
|
||||
}
|
||||
end
|
||||
schools
|
||||
end
|
||||
|
||||
def query_by_sort_column(schools, sort_by_column)
|
||||
#base_query_column = 'schools.*'
|
||||
|
||||
case sort_by_column.to_s
|
||||
when 'cnt' then
|
||||
schools.left_joins(:user_extensions).select("schools.*, count(*) cnt").order("cnt desc")
|
||||
else
|
||||
schools
|
||||
end
|
||||
end
|
||||
|
||||
def time_range
|
||||
@_time_range ||= begin
|
||||
case params[:date]
|
||||
when 'dayly' then 1.days.ago..Time.now
|
||||
when 'weekly' then 1.weeks.ago..Time.now
|
||||
when 'monthly' then 1.months.ago..Time.now
|
||||
when 'quarterly' then 3.months.ago..Time.now
|
||||
when 'yearly' then 1.years.ago..Time.now
|
||||
else ''
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def page_size
|
||||
params[:per_page].to_i.zero? ? 20 : params[:per_page].to_i
|
||||
end
|
||||
|
||||
def offset
|
||||
(params[:page].to_i.zero? ? 0 : params[:page].to_i - 1) * page_size
|
||||
end
|
||||
end
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue