Merge branches 'dev_ysm' and 'jingsai01ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysm
commit
9ac8efcc1f
@ -1,18 +1,18 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
$('.admin-modal-container').on('show.bs.modal', '.modal.admin-edit-subject-modal', function(){
|
||||
var $modal = $('.modal.admin-edit-subject-modal');
|
||||
var $form = $modal.find('form.admin-edit-subject-form');
|
||||
$(document).on('turbolinks:load', function () {
|
||||
$('.admin-modal-container').on('show.bs.modal', '.modal.admin-edit-subject-modal', function () {
|
||||
var $modal = $('.modal.admin-edit-subject-modal');
|
||||
var $form = $modal.find('form.admin-edit-subject-form');
|
||||
|
||||
$modal.on('click', '.submit-btn', function(){
|
||||
$form.find('.error').html('');
|
||||
var url = $form.attr('action');
|
||||
$modal.on('click', '.submit-btn', function () {
|
||||
$form.find('.error').html('');
|
||||
var url = $form.attr('action');
|
||||
|
||||
$.ajax({
|
||||
method: 'PATCH',
|
||||
dataType: 'script',
|
||||
url: url,
|
||||
data: $form.serialize()
|
||||
});
|
||||
});
|
||||
})
|
||||
});
|
||||
$.ajax({
|
||||
method: 'PATCH',
|
||||
dataType: 'script',
|
||||
url: url,
|
||||
data: $form.serialize()
|
||||
});
|
||||
});
|
||||
})
|
||||
});
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
$('.admin-modal-container').on('show.bs.modal', '.admin-save-competition-prize-modal', function(event){
|
||||
var $modal = $('.modal.admin-save-competition-prize-modal');
|
||||
var $form = $modal.find('form.admin-save-competition-prize-form');
|
||||
|
||||
$form.validate({
|
||||
errorElement: 'span',
|
||||
errorClass: 'danger text-danger',
|
||||
rules: {
|
||||
'competition_prize[name]': {
|
||||
required: true,
|
||||
maxlength: 10
|
||||
},
|
||||
'competition_prize[num]': {
|
||||
required: true,
|
||||
digits: true,
|
||||
min: 1
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$modal.on('click', '.submit-btn', function(){
|
||||
$form.find('.error').html('');
|
||||
var url = $form.attr('action');
|
||||
var formMethod = $form.data('form-method')
|
||||
|
||||
if ($form.valid()) {
|
||||
$.ajax({
|
||||
method: formMethod,
|
||||
dataType: 'json',
|
||||
url: url,
|
||||
data: $form.serialize(),
|
||||
success: function(data){
|
||||
if(data && data.status === 0) {
|
||||
show_success_flash();
|
||||
$(document).trigger('prize.save.success');
|
||||
$modal.modal('hide');
|
||||
} else {
|
||||
$modal.find('.error').html(data.message)
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
});
|
||||
@ -1,107 +1,107 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
if ($('body.admins-subjects-index-page').length > 0) {
|
||||
var $form = $('.subject-list-form');
|
||||
$(document).on('turbolinks:load', function () {
|
||||
if ($('body.admins-subjects-index-page').length > 0) {
|
||||
var $form = $('.subject-list-form');
|
||||
|
||||
// ************** 学校选择 *************
|
||||
$form.find('.school-select').select2({
|
||||
theme: 'bootstrap4',
|
||||
placeholder: '请选择创建者单位',
|
||||
minimumInputLength: 1,
|
||||
ajax: {
|
||||
delay: 500,
|
||||
url: '/api/schools/for_option.json',
|
||||
dataType: 'json',
|
||||
data: function(params){
|
||||
return { keyword: params.term };
|
||||
},
|
||||
processResults: function(data){
|
||||
return { results: data.schools }
|
||||
}
|
||||
},
|
||||
templateResult: function (item) {
|
||||
if(!item.id || item.id === '') return item.text;
|
||||
return item.name;
|
||||
},
|
||||
templateSelection: function(item){
|
||||
if (item.id) {
|
||||
}
|
||||
return item.name || item.text;
|
||||
}
|
||||
});
|
||||
// ************** 学校选择 *************
|
||||
$form.find('.school-select').select2({
|
||||
theme: 'bootstrap4',
|
||||
placeholder: '请选择创建者单位',
|
||||
minimumInputLength: 1,
|
||||
ajax: {
|
||||
delay: 500,
|
||||
url: '/api/schools/for_option.json',
|
||||
dataType: 'json',
|
||||
data: function (params) {
|
||||
return {keyword: params.term};
|
||||
},
|
||||
processResults: function (data) {
|
||||
return {results: data.schools}
|
||||
}
|
||||
},
|
||||
templateResult: function (item) {
|
||||
if (!item.id || item.id === '') return item.text;
|
||||
return item.name;
|
||||
},
|
||||
templateSelection: function (item) {
|
||||
if (item.id) {
|
||||
}
|
||||
return item.name || item.text;
|
||||
}
|
||||
});
|
||||
|
||||
// 清空
|
||||
$form.on('click', '.clear-btn', function(){
|
||||
$form.find('select[name="status"]').val('');
|
||||
$form.find('.school-select').val('').trigger('change');
|
||||
$form.find('input[name="keyword"]').val('');
|
||||
$form.find('#homepage_show').attr('checked', false);
|
||||
$form.find('#excellent').attr('checked', false);
|
||||
$form.find('input[type="submit"]').trigger('click');
|
||||
})
|
||||
// 清空
|
||||
$form.on('click', '.clear-btn', function () {
|
||||
$form.find('select[name="status"]').val('');
|
||||
$form.find('.school-select').val('').trigger('change');
|
||||
$form.find('input[name="keyword"]').val('');
|
||||
$form.find('#homepage_show').attr('checked', false);
|
||||
$form.find('#excellent').attr('checked', false);
|
||||
$form.find('input[type="submit"]').trigger('click');
|
||||
})
|
||||
|
||||
// 上传图片
|
||||
$('.modal.admin-upload-file-modal').on('upload:success', function(e, data){
|
||||
var $imageElement = $('.subject-image-' + data.source_id);
|
||||
$imageElement.attr('src', data.url);
|
||||
$imageElement.show();
|
||||
$imageElement.next().html('重新上传');
|
||||
})
|
||||
// 上传图片
|
||||
$('.modal.admin-upload-file-modal').on('upload:success', function (e, data) {
|
||||
var $imageElement = $('.subject-image-' + data.source_id);
|
||||
$imageElement.attr('src', data.url);
|
||||
$imageElement.show();
|
||||
$imageElement.next().html('重新上传');
|
||||
})
|
||||
|
||||
// 定义状态切换监听事件
|
||||
var defineStatusChangeFunc = function(doElement, undoElement, url, callback){
|
||||
$('.subject-list-container').on('click', doElement, function(){
|
||||
var $doAction = $(this);
|
||||
var $undoAction = $doAction.siblings(undoElement);
|
||||
// 定义状态切换监听事件
|
||||
var defineStatusChangeFunc = function (doElement, undoElement, url, callback) {
|
||||
$('.subject-list-container').on('click', doElement, function () {
|
||||
var $doAction = $(this);
|
||||
var $undoAction = $doAction.siblings(undoElement);
|
||||
|
||||
var subjectId = $doAction.data('id');
|
||||
customConfirm({
|
||||
content: '确认进行该操作吗？',
|
||||
ok: function(){
|
||||
$.ajax({
|
||||
url: '/admins/subjects/' + subjectId + url,
|
||||
method: 'POST',
|
||||
dataType: 'json',
|
||||
success: function() {
|
||||
show_success_flash();
|
||||
$doAction.hide();
|
||||
$undoAction.show();
|
||||
if(callback && typeof callback === "function"){
|
||||
callback(subjectId, url);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
// 隐藏与取消隐藏
|
||||
defineStatusChangeFunc('.hide-action', '.active-action', '/hide');
|
||||
defineStatusChangeFunc('.active-action', '.hide-action', '/cancel_hide');
|
||||
var subjectId = $doAction.data('id');
|
||||
customConfirm({
|
||||
content: '确认进行该操作吗？',
|
||||
ok: function () {
|
||||
$.ajax({
|
||||
url: '/admins/subjects/' + subjectId + url,
|
||||
method: 'POST',
|
||||
dataType: 'json',
|
||||
success: function () {
|
||||
show_success_flash();
|
||||
$doAction.hide();
|
||||
$undoAction.show();
|
||||
if (callback && typeof callback === "function") {
|
||||
callback(subjectId, url);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
// 隐藏与取消隐藏
|
||||
defineStatusChangeFunc('.hide-action', '.active-action', '/hide');
|
||||
defineStatusChangeFunc('.active-action', '.hide-action', '/cancel_hide');
|
||||
|
||||
// 首页展示与取消首页展示
|
||||
var homepageShowCallback = function(subjectId, url){
|
||||
var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
|
||||
// 首页展示与取消首页展示
|
||||
var homepageShowCallback = function (subjectId, url) {
|
||||
var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
|
||||
|
||||
if(url === '/homepage_show'){
|
||||
$subjectItem.find('.homepage-show-badge').show();
|
||||
} else {
|
||||
$subjectItem.find('.homepage-show-badge').hide();
|
||||
}
|
||||
}
|
||||
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage_show', homepageShowCallback);
|
||||
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage_show', homepageShowCallback);
|
||||
if (url === '/homepage_show') {
|
||||
$subjectItem.find('.homepage-show-badge').show();
|
||||
} else {
|
||||
$subjectItem.find('.homepage-show-badge').hide();
|
||||
}
|
||||
}
|
||||
defineStatusChangeFunc('.homepage-show-action', '.homepage-hide-action', '/homepage_show', homepageShowCallback);
|
||||
defineStatusChangeFunc('.homepage-hide-action', '.homepage-show-action', '/cancel_homepage_show', homepageShowCallback);
|
||||
|
||||
// 设为金课与取消金课
|
||||
var excellentCallback = function(subjectId, url){
|
||||
var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
|
||||
// 设为金课与取消金课
|
||||
var excellentCallback = function (subjectId, url) {
|
||||
var $subjectItem = $('.subject-list-container').find('.subject-item-' + subjectId);
|
||||
|
||||
if(url === '/excellent'){
|
||||
$subjectItem.find('.excellent-badge').show();
|
||||
} else {
|
||||
$subjectItem.find('.excellent-badge').hide();
|
||||
}
|
||||
}
|
||||
defineStatusChangeFunc('.excellent-action', '.cancel-excellent-action', '/excellent', excellentCallback);
|
||||
defineStatusChangeFunc('.cancel-excellent-action', '.excellent-action', '/cancel_excellent', excellentCallback);
|
||||
}
|
||||
});
|
||||
if (url === '/excellent') {
|
||||
$subjectItem.find('.excellent-badge').show();
|
||||
} else {
|
||||
$subjectItem.find('.excellent-badge').hide();
|
||||
}
|
||||
}
|
||||
defineStatusChangeFunc('.excellent-action', '.cancel-excellent-action', '/excellent', excellentCallback);
|
||||
defineStatusChangeFunc('.cancel-excellent-action', '.excellent-action', '/cancel_excellent', excellentCallback);
|
||||
}
|
||||
});
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
class Admins::CompetitionPrizeUsersController < Admins::BaseController
|
||||
def index
|
||||
@competition = current_competition
|
||||
|
||||
prize_users = Admins::CompetitionPrizeUserQuery.call(params.merge(competition_id: current_competition.id))
|
||||
include_class = [:competition_team, :competition_prize, :approver,
|
||||
user: [:process_real_name_apply, :process_professional_apply, user_extension: :school]]
|
||||
@prize_users = paginate(prize_users.preload(include_class))
|
||||
end
|
||||
|
||||
def create
|
||||
Admins::CreateCompetitionPrizeUsersService.call(current_competition)
|
||||
render_ok
|
||||
rescue ApplicationService::Error => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def approve
|
||||
Admins::ApproveCompetitionPrizeUserService.call(current_prize_user, current_user)
|
||||
@prize_user = current_prize_user
|
||||
rescue ApplicationService::Error => ex
|
||||
render_js_error(ex.message, type: :notify)
|
||||
end
|
||||
|
||||
def unapprove
|
||||
Admins::UnapproveCompetitionPrizeUserService.call(current_prize_user, current_user)
|
||||
@prize_user = current_prize_user
|
||||
rescue ApplicationService::Error => ex
|
||||
render_js_error(ex.message, type: :notify)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def current_prize_user
|
||||
@_current_prize_user ||= current_competition.competition_prize_users.find(params[:id])
|
||||
end
|
||||
|
||||
def current_competition
|
||||
@_current_competition ||= Competition.find(params[:competition_id])
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,43 @@
|
||||
class Admins::CompetitionPrizesController < Admins::BaseController
|
||||
def index
|
||||
@competition = current_competition
|
||||
end
|
||||
|
||||
def new
|
||||
@prize = current_competition.competition_prizes.new
|
||||
end
|
||||
|
||||
def create
|
||||
@prize = current_competition.competition_prizes.create!(save_params)
|
||||
render_ok
|
||||
end
|
||||
|
||||
def edit
|
||||
@prize = current_competition_prize
|
||||
end
|
||||
|
||||
def update
|
||||
current_competition_prize.update!(save_params)
|
||||
render_ok
|
||||
end
|
||||
|
||||
def destroy
|
||||
current_competition_prize.destroy!
|
||||
|
||||
render_delete_success
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def current_competition_prize
|
||||
@_current_competition_prize ||= current_competition.competition_prizes.find(params[:id])
|
||||
end
|
||||
|
||||
def current_competition
|
||||
@_current_competition ||= Competition.find(params[:competition_id])
|
||||
end
|
||||
|
||||
def save_params
|
||||
params.require(:competition_prize).permit(:name, :category, :num)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,23 @@
|
||||
class Competitions::CertificatesController < Competitions::BaseController
|
||||
def personal
|
||||
prize_user = CompetitionPrizeUser.find_by!(user: current_user, id: params[:id])
|
||||
return render_not_found unless prize_user.certificate_exist?
|
||||
|
||||
team = prize_user.competition_team
|
||||
prize = prize_user.competition_prize
|
||||
filename = "#{current_competition.name}-#{prize.name}-#{team.name}-#{prize_user.user.real_name}.pdf"
|
||||
|
||||
send_file prize_user.certificate_path, filename: filename
|
||||
end
|
||||
|
||||
def team
|
||||
team = CompetitionTeam.find(id: params[:id])
|
||||
return render_forbidden unless team.team_members.exists?(user_id: current_user.id)
|
||||
return render_not_found unless team.certificate_exist?
|
||||
|
||||
prize = team.competition_prize_users.first.competition_prize
|
||||
filename = "#{current_competition.name}-#{prize.name}-#{team.name}.pdf"
|
||||
|
||||
send_file team.certificate_path, filename: filename
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,25 @@
|
||||
class Competitions::PrizeLeaderAccountsController < Competitions::BaseController
|
||||
before_action :require_prize_team_leader!
|
||||
|
||||
def update
|
||||
Competitions::SavePrizeTeamAccountService.call(current_competition, current_user, update_params)
|
||||
render_ok
|
||||
rescue ApplicationService::Error => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def require_prize_team_leader!
|
||||
prize_user = current_competition.competition_prize_users.joins(:competition_prize)
|
||||
.where(competition_prizes: { category: :bonus })
|
||||
.find_by(leader: true, user_id: current_user.id)
|
||||
return if prize_user.present?
|
||||
|
||||
render_forbidden
|
||||
end
|
||||
|
||||
def update_params
|
||||
params.permit(:bank, :second_bank, :card_no)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,26 @@
|
||||
class Competitions::PrizesController < Competitions::BaseController
|
||||
before_action :require_prize_user!
|
||||
|
||||
def show
|
||||
self_prizes = current_competition.competition_prize_users.where(user_id: current_user.id).includes(:competition_team)
|
||||
|
||||
@leader = self_prizes.any?(&:leader?) # 是否为队长
|
||||
@bank_account = self_prizes.find(&:leader?).extra if @leader
|
||||
|
||||
@self_prizes = self_prizes.select(&:certificate_exist?) # 个人证书quit
|
||||
@team_prizes = self_prizes.map(&:competition_team).uniq.select(&:certificate_exists?) # 团队证书
|
||||
|
||||
prize_users = current_competition.competition_prize_users.where(competition_team_id: self_prizes.map(&:competition_team_id))
|
||||
.includes(:competition_team, user: [:user_extension, :process_real_name_apply, :process_professional_apply])
|
||||
|
||||
@prize_user_map = prize_users.group_by(&:competition_team)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def require_prize_user!
|
||||
return if current_competition.competition_prize_users.exists?(user: current_user)
|
||||
|
||||
render_forbidden
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,9 @@
|
||||
class Competitions::SavePrizeTeamAccountForm
|
||||
include ActiveModel::Model
|
||||
|
||||
attr_accessor :bank, :second_bank, :card_no
|
||||
|
||||
validates :bank, presence: true
|
||||
validates :second_bank, presence: true
|
||||
validates :card_no, presence: true
|
||||
end
|
||||
@ -0,0 +1,10 @@
|
||||
module Admins::CompetitionPrizeUsersHelper
|
||||
def display_auth_state(flag, other = false, success: nil, normal: nil, error: nil)
|
||||
success ||= '<i class="fa fa-check text-success font-16"/>'.html_safe
|
||||
normal ||= '--'
|
||||
error ||= '<i class="fa fa-close text-secondary font-16"/>'.html_safe
|
||||
|
||||
return success if flag
|
||||
other ? normal : error
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,21 @@
|
||||
class CompetitionPrize < ApplicationRecord
|
||||
extend Enumerize
|
||||
|
||||
belongs_to :competition
|
||||
|
||||
has_many :competition_prize_users, dependent: :destroy
|
||||
|
||||
enumerize :category, in: %i[bonus unset]
|
||||
|
||||
def self.member_suffix
|
||||
'_member'
|
||||
end
|
||||
|
||||
def self.teacher_suffix
|
||||
'_teacher'
|
||||
end
|
||||
|
||||
def self.team_suffix
|
||||
'_team'
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,48 @@
|
||||
class CompetitionPrizeUser < ApplicationRecord
|
||||
include AASM
|
||||
|
||||
belongs_to :competition
|
||||
belongs_to :competition_team
|
||||
belongs_to :competition_prize
|
||||
belongs_to :user
|
||||
belongs_to :approver, class_name: 'User', optional: true # 审批人
|
||||
|
||||
serialize :extra, JSON
|
||||
|
||||
aasm(:status) do
|
||||
state :pending, initial: true
|
||||
state :approved
|
||||
|
||||
event :approve do
|
||||
transitions from: [:pending], to: :approved, guard: :user_certified?
|
||||
end
|
||||
|
||||
event :unapprove do
|
||||
transitions from: [:approved], to: :pending
|
||||
end
|
||||
end
|
||||
|
||||
delegate :bank, :second_bank, :card_no, to: :extra, allow_nil: true
|
||||
|
||||
def user_certified?
|
||||
user.certification? && user.professional_certification?
|
||||
end
|
||||
|
||||
def certificate_exist?
|
||||
Util::FileManage.exists?(self)
|
||||
end
|
||||
|
||||
def certificate_url
|
||||
Util::FileManage.source_disk_file_url(self)
|
||||
end
|
||||
|
||||
def certificate_path
|
||||
Util::FileManage.source_disk_filename(self)
|
||||
end
|
||||
|
||||
def role_text
|
||||
return '队长' if leader?
|
||||
|
||||
user.is_teacher? ? '教师' : '队员'
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,5 @@
|
||||
class ExerciseUserScore < ApplicationRecord
|
||||
belongs_to :exercise
|
||||
belongs_to :exercise_user
|
||||
belongs_to :user
|
||||
end
|
||||
@ -0,0 +1,77 @@
|
||||
class Admins::CompetitionPrizeUserQuery < ApplicationQuery
|
||||
include CustomSortable
|
||||
|
||||
attr_reader :params
|
||||
|
||||
sort_columns :rank, default_by: :rank, default_direction: :asc
|
||||
|
||||
def initialize(params)
|
||||
@params = params
|
||||
end
|
||||
|
||||
def call
|
||||
records = CompetitionPrizeUser.all
|
||||
|
||||
# 竞赛过滤
|
||||
records = records.where(competition_id: params[:competition_id]) if params[:competition_id].present?
|
||||
|
||||
# 关键字检索
|
||||
keyword = params[:keyword].to_s.strip
|
||||
if keyword.present?
|
||||
like_sql = 'competition_teams.name LIKE :keyword OR schools.name LIKE :keyword'
|
||||
records = records.left_joins(:competition_team, user: { user_extension: :school })
|
||||
.where(like_sql, keyword: "%#{keyword}%")
|
||||
end
|
||||
|
||||
# 奖项过滤
|
||||
records = records.where(competition_prize_id: params[:prize_id]) if params[:prize_id].present?
|
||||
|
||||
# 审批状态过滤
|
||||
records = records.where(status: params[:status]) if params[:status].present?
|
||||
|
||||
# 职业过滤
|
||||
if params[:identity].present?
|
||||
records = records.left_joins(user: :user_extension).where(user_extensions: { identity: params[:identity] })
|
||||
end
|
||||
|
||||
# 实名认证过滤
|
||||
records = real_name_auth_filter(records) if params[:real_name_auth].present?
|
||||
|
||||
# 职业认证过滤
|
||||
records = professional_auth_filter(records) if params[:professional_auth].present?
|
||||
|
||||
custom_sort(records, params[:sort_by], params[:sort_direction])
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def real_name_auth_filter(records)
|
||||
records = records.left_joins(:user)
|
||||
sql = ApplyUserAuthentication.real_name_auth.processing.where('apply_user_authentications.user_id = users.id').to_sql
|
||||
|
||||
case params[:real_name_auth]
|
||||
when 'authed' then
|
||||
records.where(users: { authentication: true })
|
||||
when 'not_authed' then
|
||||
records.where(users: { authentication: false }).where("NOT EXISTS (#{sql})")
|
||||
when 'authing' then
|
||||
records.where(users: { authentication: false }).where("EXISTS (#{sql})")
|
||||
else records
|
||||
end
|
||||
end
|
||||
|
||||
def professional_auth_filter(records)
|
||||
records = records.left_joins(:user)
|
||||
sql = ApplyUserAuthentication.professional_auth.processing.where('apply_user_authentications.user_id = users.id').to_sql
|
||||
|
||||
case params[:professional_auth]
|
||||
when 'authed' then
|
||||
records.where(users: { professional_certification: true })
|
||||
when 'not_authed' then
|
||||
records.where(users: { professional_certification: false }).where("NOT EXISTS (#{sql})")
|
||||
when 'authing' then
|
||||
records.where(users: { professional_certification: false }).where("EXISTS (#{sql})")
|
||||
else records
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,26 @@
|
||||
class Admins::ApproveCompetitionPrizeUserService < ApplicationService
|
||||
attr_reader :prize_user, :approver
|
||||
|
||||
def initialize(prize_user, approver)
|
||||
@prize_user = prize_user
|
||||
@approver = approver
|
||||
end
|
||||
|
||||
def call
|
||||
raise Error, '请勿重复审批' if prize_user.approved?
|
||||
raise Error, '该用户未认证完成' unless prize_user.user_certified?
|
||||
|
||||
ActiveRecord::Base.transaction do
|
||||
prize_user.approve
|
||||
prize_user.approver = approver
|
||||
prize_user.approved_at = Time.now
|
||||
prize_user.save!
|
||||
|
||||
if prize_user.competition_team.all_prize_approved?
|
||||
# TODO: 生成团队证书
|
||||
end
|
||||
|
||||
# TODO: 生成个人证书
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,27 @@
|
||||
class Admins::UnapproveCompetitionPrizeUserService < ApplicationService
|
||||
attr_reader :prize_user, :approver
|
||||
|
||||
def initialize(prize_user, approver)
|
||||
@prize_user = prize_user
|
||||
@approver = approver
|
||||
end
|
||||
|
||||
def call
|
||||
raise Error, '状态有误' if prize_user.pending?
|
||||
|
||||
ActiveRecord::Base.transaction do
|
||||
prize_user.unapprove
|
||||
prize_user.approver = approver
|
||||
prize_user.approved_at = nil
|
||||
prize_user.save!
|
||||
|
||||
# 删除团队证书
|
||||
team_certificate_path = Util::FileManage.source_disk_filename(prize_user.competition_team, CompetitionTeam.certificate_suffix)
|
||||
File.delete(team_certificate_path) if File.exist?(team_certificate_path)
|
||||
|
||||
# 删除个人证书
|
||||
user_certificate_path = Util::FileManage.source_disk_filename(prize_user)
|
||||
File.delete(user_certificate_path) if File.exist?(user_certificate_path)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,19 @@
|
||||
class Competitions::SavePrizeTeamAccountService < ApplicationService
|
||||
attr_reader :competition, :user, :params
|
||||
|
||||
def initialize(competition, user, params)
|
||||
@competition = competition
|
||||
@user = user
|
||||
@params = params
|
||||
end
|
||||
|
||||
def call
|
||||
Competitions::SavePrizeTeamAccountForm.new(params).validate!
|
||||
|
||||
prize_leaders = competition.competition_prize_users.where(competition.competition_prize_users)
|
||||
|
||||
raise Error, '审批通过后不能修改' if prize_leaders.exists?(status: :approved)
|
||||
|
||||
prize_leaders.update_all(extra: params)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1 @@
|
||||
$('.competition-prize-user-list-container .competition-prize-user-item-<%= @prize_user.id %>').html("<%= j( render partial: 'admins/competition_prize_users/shared/tr', locals: { prize_user: @prize_user } ) %>");
|
||||
@ -0,0 +1,58 @@
|
||||
<%
|
||||
define_admin_breadcrumbs do
|
||||
add_admin_breadcrumb('竞赛列表', admins_competitions_path)
|
||||
add_admin_breadcrumb(@competition.name)
|
||||
end
|
||||
%>
|
||||
|
||||
<div class="box search-form-container flex-column mb-0 pb-0 competition-prize-user-form">
|
||||
<ul class="nav nav-tabs w-100 search-form-tabs">
|
||||
<li class="nav-item">
|
||||
<%= link_to '报名列表', admins_competition_enroll_lists_path(@competition), class: "nav-link search-form-tab" %>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<%= link_to '获奖证书审批', admins_competition_competition_prize_users_path(@competition), class: "nav-link search-form-tab active" %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="d-flex">
|
||||
<%= form_tag(admins_competition_competition_prize_users_path(unsafe_params), method: :get, class: 'search-form mt-3 flex-1 d-flex align-items-end', remote: true) do %>
|
||||
<div class="form-group mb-0 mr-3">
|
||||
<label for="status">奖项：</label>
|
||||
<% prize_options = [['不限', '']] + @competition.competition_prizes.map{ |p| [p.name, p.id] } %>
|
||||
<%= select_tag(:prize_id, options_for_select(prize_options), class: 'form-control') %>
|
||||
</div>
|
||||
|
||||
<% auth_options = [['不限', ''], %w(未认证 not_authed), %w(待认证 authing), %w(已认证 authed)] %>
|
||||
<div class="form-group mb-0 mr-3">
|
||||
<label for="status">实名认证状态：</label>
|
||||
<%= select_tag(:real_name_auth, options_for_select(auth_options), class: 'form-control') %>
|
||||
</div>
|
||||
<div class="form-group mb-0 mr-3">
|
||||
<label for="status">职业认证状态：</label>
|
||||
<%= select_tag(:professional_auth, options_for_select(auth_options), class: 'form-control') %>
|
||||
</div>
|
||||
|
||||
<div class="form-group mb-0 mr-3">
|
||||
<label for="status">职业：</label>
|
||||
<%- identity_options = [['不限', ''], %w(教师 0), %w(学生 1)] %>
|
||||
<%= select_tag(:identity, options_for_select(identity_options), class: 'form-control') %>
|
||||
</div>
|
||||
|
||||
<div class="form-group mb-0 mr-3">
|
||||
<label for="status">审批状态：</label>
|
||||
<%- status_options = [['不限', ''], %w(未审批 pending), %w(已审批 approved)] %>
|
||||
<%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
|
||||
</div>
|
||||
|
||||
<%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '战队/学校名称检索') %>
|
||||
|
||||
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
|
||||
<%= link_to '清除', admins_competition_competition_prize_users_path(@competition), class: "btn btn-default",'data-disable-with': '清除中...' %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box competition-prize-user-list-container">
|
||||
<%= render(partial: 'admins/competition_prize_users/shared/list', locals: { prize_users: @prize_users }) %>
|
||||
</div>
|
||||
@ -0,0 +1 @@
|
||||
$('.competition-prize-user-list-container').html("<%= j( render partial: 'admins/competition_prize_users/shared/list', locals: { prize_users: @prize_users } ) %>");
|
||||
@ -0,0 +1,33 @@
|
||||
<table class="table table-hover text-center competition-prize-user-list-table">
|
||||
<thead class="thead-light">
|
||||
<tr>
|
||||
<th width="6%">奖项</th>
|
||||
<th width="5%">排名</th>
|
||||
<th width="10%" class="text-left">战队名称</th>
|
||||
<th width="8%">真实姓名</th>
|
||||
<th width="5%">职业</th>
|
||||
<th width="8%">学号</th>
|
||||
<th width="10%">单位</th>
|
||||
<th width="5%">实名</th>
|
||||
<th width="5%">职业</th>
|
||||
<th width="5%">手机</th>
|
||||
<th width="5%">队长</th>
|
||||
<th width="10%">审批时间</th>
|
||||
<th width="8%">审批人</th>
|
||||
<th width="10%">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody style="overflow-wrap:break-word;">
|
||||
<% if prize_users.present? %>
|
||||
<% prize_users.each do |prize_user| %>
|
||||
<tr class="competition-prize-user-item-<%= prize_user.id %>">
|
||||
<%= render('admins/competition_prize_users/shared/tr', prize_user: prize_user) %>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= render 'admins/shared/no_data_for_table' %>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= render partial: 'admins/shared/paginate', locals: { objects: prize_users } %>
|
||||
@ -0,0 +1,26 @@
|
||||
<%- user = prize_user.user -%>
|
||||
<td><%= prize_user.competition_prize.name %></td>
|
||||
<td><%= prize_user.rank %></td>
|
||||
<td class="text-left"><%= prize_user.competition_team.name %></td>
|
||||
<td><%= user.real_name %></td>
|
||||
<td><%= user.identity %></td>
|
||||
<td><%= user.is_teacher? ? user.user_extension.technical_title : user.user_extension.student_id %></td>
|
||||
<td><%= user.school_name %></td>
|
||||
<td><%= display_auth_state(user.authentication?, user.process_real_name_apply.present?) %></td>
|
||||
<td><%= display_auth_state(user.professional_certification?, user.process_professional_apply.present?) %></td>
|
||||
<td><%= display_auth_state user.phone_binded? %></td>
|
||||
<td><%= display_auth_state prize_user.leader?, error: '' %></td>
|
||||
<td><%= display_text prize_user.approved_at&.strftime('%Y-%m-%d %H:%M') %></td>
|
||||
<td><%= display_text prize_user.approver&.real_name %></td>
|
||||
|
||||
<td class="action-container">
|
||||
<% if prize_user.pending? %>
|
||||
<%= link_to('审批通过', approve_admins_competition_competition_prize_user_path(prize_user.competition, prize_user),
|
||||
data: { confirm: '确认审批通过吗？' },
|
||||
remote: true, method: :post, class: 'approve-action') %>
|
||||
<% else %>
|
||||
<%= link_to('撤销审批', unapprove_admins_competition_competition_prize_user_path(prize_user.competition, prize_user),
|
||||
data: { confirm: '确认撤销审批吗？' },
|
||||
remote: true, method: :post, class: 'approve-action') %>
|
||||
<% end %>
|
||||
</td>
|
||||
@ -0,0 +1 @@
|
||||
$('.competition-prize-user-list-container .competition-prize-user-item-<%= @prize_user.id %>').html("<%= j( render partial: 'admins/competition_prize_users/shared/tr', locals: { prize_user: @prize_user } ) %>");
|
||||
@ -0,0 +1,2 @@
|
||||
$('.admin-modal-container').html("<%= j( render partial: 'admins/competition_prizes/shared/save_competition_prize_modal', locals: { prize: @prize, title: '编辑奖项', form_method: 'PATCH' } ) %>");
|
||||
$('.modal.admin-save-competition-prize-modal').modal('show');
|
||||
@ -0,0 +1 @@
|
||||
$('#competition-prize-card .competition-prize-table tbody').html("<%= j( render partial: 'admins/competition_settings/shared/competition_prizes', locals: { competition: @competition } ) %>");
|
||||
@ -0,0 +1,2 @@
|
||||
$('.admin-modal-container').html("<%= j( render partial: 'admins/competition_prizes/shared/save_competition_prize_modal', locals: { prize: @prize, title: '新建奖项', form_method: 'POST' } ) %>");
|
||||
$('.modal.admin-save-competition-prize-modal').modal('show');
|
||||
@ -0,0 +1,29 @@
|
||||
<div class="modal fade admin-save-competition-prize-modal" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"><%= title ||= '保存奖项设置' %></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<%= simple_form_for([:admins, prize.competition, prize], data: { form_method: form_method }, html: { class: 'admin-save-competition-prize-form' }, defaults: { wrapper_html: { class: 'offset-md-1 col-md-10' } }) do |f| %>
|
||||
|
||||
<%= f.input :name, label: '奖项名称：', placeholder: '请输入奖项名称' %>
|
||||
<%= f.input :num, as: :integer, label: '数量：', placeholder: '请输入数量', input_html: { min: 1 } %>
|
||||
|
||||
<%= f.input :category, label: '奖励类型：' do %>
|
||||
<%= f.select :category, [%w(奖金 bonus), %w(无 unset)], {}, class: 'form-control' %>
|
||||
<% end %>
|
||||
|
||||
<div class="error text-danger"></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
|
||||
<button type="button" class="btn btn-primary submit-btn">确认</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,27 @@
|
||||
<% competition.competition_prizes.each_with_index do |prize, index| %>
|
||||
<tr class="competition-prize-item-<%= prize.id %>">
|
||||
<td><%= index + 1 %></td>
|
||||
<td><%= prize.name %></td>
|
||||
<td><%= prize.num %></td>
|
||||
<td><%= prize.category_text %></td>
|
||||
<td>
|
||||
<% member_image_exists = Util::FileManage.exists?(prize, CompetitionPrize.member_suffix) %>
|
||||
<%= image_tag(member_image_exists ? Util::FileManage.source_disk_file_url(prize, CompetitionPrize.member_suffix) : '', height: 60, class: "w-100 preview-image prize-member-image-#{prize.id}", style: member_image_exists ? '' : 'display:none') %>
|
||||
<%= javascript_void_link member_image_exists ? '重新上传' : '上传模板', class: 'action upload-prize-member-image-action', data: { source_id: prize.id, source_type: 'CompetitionPrize', suffix: CompetitionPrize.member_suffix, toggle: 'modal', target: '.admin-upload-file-modal' } %>
|
||||
</td>
|
||||
<td>
|
||||
<% team_image_exists = Util::FileManage.exists?(prize, CompetitionPrize.team_suffix) %>
|
||||
<%= image_tag(team_image_exists ? Util::FileManage.source_disk_file_url(prize, CompetitionPrize.team_suffix) : '', height: 60, class: "w-100 preview-image prize-team-image-#{prize.id}", style: team_image_exists ? '' : 'display:none') %>
|
||||
<%= javascript_void_link team_image_exists ? '重新上传' : '上传模板', class: 'action upload-prize-team-image-action', data: { source_id: prize.id, source_type: 'CompetitionPrize', suffix: CompetitionPrize.team_suffix, toggle: 'modal', target: '.admin-upload-file-modal' } %>
|
||||
</td>
|
||||
<td>
|
||||
<% teacher_image_exists = Util::FileManage.exists?(prize, CompetitionPrize.teacher_suffix) %>
|
||||
<%= image_tag(teacher_image_exists ? Util::FileManage.source_disk_file_url(prize, CompetitionPrize.teacher_suffix) : '', height: 60, class: "w-100 preview-image prize-teacher-image-#{prize.id}", style: teacher_image_exists ? '' : 'display:none') %>
|
||||
<%= javascript_void_link teacher_image_exists ? '重新上传' : '上传模板', class: 'action upload-prize-teacher-image-action', data: { source_id: prize.id, source_type: 'CompetitionPrize', suffix: CompetitionPrize.teacher_suffix, toggle: 'modal', target: '.admin-upload-file-modal' } %>
|
||||
</td>
|
||||
<td class="action-container">
|
||||
<%= link_to '编辑', edit_admins_competition_competition_prize_path(competition, prize), remote: true, class: 'action edit-competition-prize-action' %>
|
||||
<%= delete_link '删除', admins_competition_competition_prize_path(competition, prize, element: ".competition-prize-item-#{prize.id}"), class: 'action delete-competition-prize-action' %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
@ -0,0 +1,55 @@
|
||||
json.leader @leader
|
||||
|
||||
json.bank_account @bank_account if @leader
|
||||
|
||||
json.personal_certifications do
|
||||
json.array! @self_prizes do |prize_user|
|
||||
json.url personal_competitions_certificate_path(current_competition, prize_user)
|
||||
end
|
||||
end
|
||||
|
||||
json.team_certifications do
|
||||
json.array! @team_prizes do |team|
|
||||
json.url team_competitions_certificate_path(current_competition, team)
|
||||
end
|
||||
end
|
||||
|
||||
json.teams do
|
||||
json.array! @prize_user_map do |team, prize_users|
|
||||
json.extract! team, :id, :name
|
||||
|
||||
json.bank_account prize_users.find(&:leader?).extra
|
||||
|
||||
json.team_members do
|
||||
json.array! prize_users do |prize_user|
|
||||
user = prize_user.user
|
||||
|
||||
json.role prize_user.role_text
|
||||
json.name user.real_name
|
||||
|
||||
real_name_auth =
|
||||
if user.authentication?
|
||||
'authed'
|
||||
elsif user.process_real_name_apply.present?
|
||||
'authing'
|
||||
else
|
||||
'not_authed'
|
||||
end
|
||||
json.real_name_auth real_name_auth
|
||||
|
||||
professional_auth =
|
||||
if user.professional_certification?
|
||||
'authed'
|
||||
elsif user.process_professional_apply.present?
|
||||
'authing'
|
||||
else
|
||||
'not_authed'
|
||||
end
|
||||
json.professional_auth professional_auth
|
||||
|
||||
json.phone_binded user.phone_binded?
|
||||
json.email_binded user.email_binded?
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,7 +1,7 @@
|
||||
json.course_members @course_members.each do |member|
|
||||
user = member.user
|
||||
json.user_login user.login
|
||||
json.user_name user.real_name
|
||||
json.user_login user&.login
|
||||
json.user_name user&.real_name
|
||||
# json.course_group member.course_group_name
|
||||
json.total_score member.score
|
||||
end
|
||||
@ -1,4 +1,6 @@
|
||||
admins-mirror_scripts: 'admins-mirror_repositories'
|
||||
admins-laboratory_settings: 'admins-laboratories'
|
||||
admins-carousels: 'admins-laboratories'
|
||||
admins-competition_settings: 'admins-competitions'
|
||||
admins-competition_settings: 'admins-competitions'
|
||||
admins-enroll_lists: 'admins-competitions'
|
||||
admins-competition_prize_users: 'admins-competitions'
|
||||
@ -0,0 +1,6 @@
|
||||
zh-CN:
|
||||
enumerize:
|
||||
competition_prize:
|
||||
category:
|
||||
bonus: '奖金'
|
||||
unset: '无'
|
||||
@ -0,0 +1,8 @@
|
||||
'zh-CN':
|
||||
activemodel:
|
||||
attributes:
|
||||
competitions/save_prize_team_account_form:
|
||||
bank: '开户行'
|
||||
second_bank: '支行'
|
||||
card_no: '卡号'
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
class AddTotalScoreToHomeworkCommons < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
add_column :homework_commons, :total_score, :float, default: 100
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,10 @@
|
||||
class InitCompetitionCertificateModuleData < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
Competition.find_each do |competition|
|
||||
competition.competition_modules.where(module_type: 'certificate').delete_all
|
||||
|
||||
position = competition.competition_modules.maximum(:position) + 1
|
||||
competition.competition_modules.create(module_type: 'certificate', position: position, name: '获奖证书', hidden: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,13 @@
|
||||
class CreateCompetitionPrizes < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
create_table :competition_prizes do |t|
|
||||
t.references :competition
|
||||
|
||||
t.string :name
|
||||
t.string :category
|
||||
t.integer :num
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,20 @@
|
||||
class CreateCompetitionPrizeUsers < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
create_table :competition_prize_users do |t|
|
||||
t.references :competition
|
||||
t.references :competition_team
|
||||
t.references :competition_prize
|
||||
t.references :user
|
||||
t.references :approver
|
||||
|
||||
t.string :status
|
||||
t.integer :rank
|
||||
t.boolean :leader, default: false
|
||||
t.text :extra
|
||||
|
||||
t.datetime :approved_at
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,13 @@
|
||||
class CreateExerciseUserScores < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
create_table :exercise_user_scores do |t|
|
||||
t.references :exercise, index: true
|
||||
t.references :exercise_user, index: true
|
||||
t.float :score
|
||||
t.text :comment
|
||||
t.references :user, index: true
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
end
|
||||
end
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -0,0 +1,183 @@
|
||||
/*垂直布局
|
||||
|
||||
一
|
||||
二
|
||||
三
|
||||
*/
|
||||
.flexdirectionjust{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
|
||||
.directstwebkitflex{
|
||||
display: flex;
|
||||
display: -webkit-flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.diredisplayitflex{
|
||||
display: flex;
|
||||
display: -webkit-flex;
|
||||
align-items: center;
|
||||
}
|
||||
/*垂直布局*/
|
||||
/*靠左侧
|
||||
一 二 三 四 五 六 七 八
|
||||
*/
|
||||
.flexdirection{
|
||||
display: flex;
|
||||
flex-direction:row;
|
||||
}
|
||||
|
||||
.flexdirections{
|
||||
display: flex;
|
||||
flex-direction:initial;
|
||||
}
|
||||
/*靠左侧
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/*靠右侧八 七 六 五 四 三 二 一*/
|
||||
.flexdirectionss{
|
||||
display: flex;
|
||||
flex-direction:row-reverse;
|
||||
}
|
||||
|
||||
|
||||
/*垂直布局
|
||||
一
|
||||
二
|
||||
三
|
||||
四
|
||||
*/
|
||||
.flexdidirectionss{
|
||||
display: flex;
|
||||
flex-direction:column;
|
||||
}
|
||||
|
||||
/*垂直布局
|
||||
四
|
||||
三
|
||||
二
|
||||
一
|
||||
*/
|
||||
.flexdidireverses{
|
||||
display: flex;
|
||||
flex-direction:column-reverse;
|
||||
}
|
||||
|
||||
.fontcolorsysl{
|
||||
color:#FF0000
|
||||
}
|
||||
.fontcolorsyslhei{
|
||||
color:#000000
|
||||
}
|
||||
.fontcolorsyslhui{
|
||||
color:#888888
|
||||
}
|
||||
.fontcolorsyslhui1{
|
||||
color:#666666;
|
||||
}
|
||||
.fontcolorsysllan{
|
||||
color:#4CACFF
|
||||
}
|
||||
.fontcolorsysljin{
|
||||
color:#DD7600
|
||||
}
|
||||
|
||||
.w200{
|
||||
width: 200px;
|
||||
}
|
||||
.w64{
|
||||
width: 64px;
|
||||
}
|
||||
|
||||
.w60{
|
||||
width: 60px;
|
||||
}
|
||||
.w98{
|
||||
width: 98px;
|
||||
}
|
||||
|
||||
.myysllineheight{
|
||||
line-height: 40px;
|
||||
}
|
||||
.myyslminwidth{
|
||||
min-width: 60px;
|
||||
}
|
||||
|
||||
.myyslminwidth276{
|
||||
width: 276px;
|
||||
}
|
||||
|
||||
.buttongo{
|
||||
background: #E7E7E7;
|
||||
border: 1px solid #E7E7E7;
|
||||
width: 60px;
|
||||
height: 30px;
|
||||
border-radius: 4px;
|
||||
color: #999999;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.buttongo2{
|
||||
background: #4CACFF;
|
||||
border: 1px solid #4CACFF;
|
||||
width: 60px;
|
||||
height: 30px;
|
||||
border-radius: 4px;
|
||||
color: #FFFFFF;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.fontwenzi{
|
||||
text-align: center;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
.mt17{
|
||||
margin-top: 17px;
|
||||
}
|
||||
.mt36{
|
||||
margin-top: 36px;
|
||||
}
|
||||
.mt23{
|
||||
margin-top: 23px;
|
||||
}
|
||||
.mt19{
|
||||
margin-top: 19px;
|
||||
}
|
||||
.mt23{
|
||||
margin-top: 23px;
|
||||
}
|
||||
.mt34{
|
||||
margin-top: 34px;
|
||||
}
|
||||
.ml11{
|
||||
margin-left: 11px;
|
||||
}
|
||||
.ml38{
|
||||
margin-left: 38px;
|
||||
}
|
||||
.ml7{
|
||||
margin-left: 7px;
|
||||
}
|
||||
|
||||
.colorgreenlight{
|
||||
color:#6EC76E
|
||||
}
|
||||
|
||||
.colorgreenorg{
|
||||
color: #FF7300;
|
||||
}
|
||||
|
||||
.borcolors{
|
||||
border: 1px solid #4CACFF;
|
||||
|
||||
text-align: center;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,123 +1,128 @@
|
||||
import React,{ Component } from "react";
|
||||
import {Menu, Dropdown, Icon,Input,Checkbox} from "antd";
|
||||
import React, {Component} from "react";
|
||||
import {Menu, Dropdown, Icon, Input, Checkbox} from "antd";
|
||||
import {getImageUrl} from 'educoder';
|
||||
const { Search } = Input;
|
||||
class Dropdownbox extends Component{
|
||||
constructor(props){
|
||||
|
||||
const {Search} = Input;
|
||||
|
||||
class Dropdownbox extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state={
|
||||
activeKey:'1',
|
||||
this.state = {
|
||||
activeKey: '1',
|
||||
visible: false,
|
||||
onSearchvalue:undefined,
|
||||
checkedValues:[]
|
||||
onSearchvalue: undefined,
|
||||
checkedValues: []
|
||||
}
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
let {group_ids}=this.props;
|
||||
if(group_ids){
|
||||
let {group_ids} = this.props;
|
||||
if (group_ids) {
|
||||
this.setState({
|
||||
checkedValues:group_ids
|
||||
checkedValues: group_ids
|
||||
})
|
||||
}
|
||||
}
|
||||
componentDidUpdate=(prevProps)=>{
|
||||
if(prevProps!=this.props){
|
||||
let {group_ids}=this.props;
|
||||
if(group_ids){
|
||||
|
||||
componentDidUpdate = (prevProps) => {
|
||||
if (prevProps != this.props) {
|
||||
let {group_ids} = this.props;
|
||||
if (group_ids) {
|
||||
this.setState({
|
||||
checkedValues:group_ids
|
||||
checkedValues: group_ids
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
SaveChange=()=>{
|
||||
this.props.postwork_scoredata(this.state.checkedValues)
|
||||
SaveChange = () => {
|
||||
this.props.postwork_scoredata(this.state.checkedValues)
|
||||
}
|
||||
|
||||
|
||||
handleVisibleChange=flag=>{
|
||||
this.setState({ visible: flag });
|
||||
handleVisibleChange = flag => {
|
||||
this.setState({visible: flag});
|
||||
};
|
||||
|
||||
CheckboxonChange=(checkedValues)=>{
|
||||
this.setState({
|
||||
checkedValues:checkedValues
|
||||
})
|
||||
CheckboxonChange = (checkedValues) => {
|
||||
this.setState({
|
||||
checkedValues: checkedValues
|
||||
})
|
||||
}
|
||||
|
||||
unCheckboxonChange=()=>{
|
||||
unCheckboxonChange = () => {
|
||||
this.setState({
|
||||
checkedValues:[],
|
||||
onSearchvalue:undefined
|
||||
checkedValues: [],
|
||||
onSearchvalue: undefined
|
||||
})
|
||||
}
|
||||
|
||||
onSearch=(value)=>{
|
||||
onSearch = (value) => {
|
||||
this.setState({
|
||||
onSearchvalue:value
|
||||
onSearchvalue: value
|
||||
})
|
||||
}
|
||||
|
||||
onSearchonChange=(e)=>{
|
||||
onSearchonChange = (e) => {
|
||||
this.setState({
|
||||
onSearchvalue:e.target.value
|
||||
onSearchvalue: e.target.value
|
||||
})
|
||||
}
|
||||
|
||||
render(){
|
||||
let {course_groups}=this.props;
|
||||
render() {
|
||||
let {course_groups} = this.props;
|
||||
|
||||
const menu = (
|
||||
<Checkbox.Group style={{ width: 220 }} className={"StatisticsMenubox"} value={this.state.checkedValues} onChange={(checkedValues)=>this.CheckboxonChange(checkedValues)}>
|
||||
<Menu className="Statisticslibox">
|
||||
<Checkbox.Group style={{width: 220}} className={"StatisticsMenubox"} value={this.state.checkedValues}
|
||||
onChange={(checkedValues) => this.CheckboxonChange(checkedValues)}>
|
||||
<Menu className="Statisticslibox">
|
||||
<li className={"Statisticsli"}>
|
||||
{course_groups&&course_groups.length>10?<Search
|
||||
{course_groups && course_groups.length > 10 ? <Search
|
||||
placeholder="请输入名称搜索"
|
||||
onSearch={(value)=>this.onSearch(value)}
|
||||
onChange={(e)=>this.onSearchonChange(e)}
|
||||
onSearch={(value) => this.onSearch(value)}
|
||||
onChange={(e) => this.onSearchonChange(e)}
|
||||
value={this.state.onSearchvalue}
|
||||
style={{ width: 200 }}
|
||||
/>:""}
|
||||
style={{width: 200}}
|
||||
/> : ""}
|
||||
</li>
|
||||
{course_groups&&course_groups.map((item,key)=>{
|
||||
if(this.state.onSearchvalue){
|
||||
if(item.name.indexOf(this.state.onSearchvalue) != -1){
|
||||
return(
|
||||
{course_groups && course_groups.map((item, key) => {
|
||||
if (this.state.onSearchvalue) {
|
||||
if (item.name.indexOf(this.state.onSearchvalue) != -1) {
|
||||
return (
|
||||
<Menu.Item key={key}>
|
||||
<Checkbox value={item.id} key={item.id}> {item.name}</Checkbox>
|
||||
<Checkbox value={item.id} key={item.id}> {item.name}</Checkbox>
|
||||
</Menu.Item>
|
||||
)
|
||||
}
|
||||
}else{
|
||||
return(
|
||||
} else {
|
||||
return (
|
||||
<Menu.Item key={key}>
|
||||
<Checkbox value={item.id} key={item.id}> {item.name}</Checkbox>
|
||||
<Checkbox value={item.id} key={item.id}> {item.name}</Checkbox>
|
||||
</Menu.Item>
|
||||
)
|
||||
}
|
||||
})}
|
||||
<Menu.Divider />
|
||||
<Menu.Divider/>
|
||||
<li className={"Statisticsli"}>
|
||||
<span onClick={()=>this.SaveChange()} className={"ant-btn-link"}>确定</span>
|
||||
<span className={"ml20 ant-btn-link"} onClick={()=>this.unCheckboxonChange()}>重置</span>
|
||||
<span onClick={() => this.SaveChange()} className={"ant-btn-link"}>确定</span>
|
||||
<span className={"ml20 ant-btn-link"} onClick={() => this.unCheckboxonChange()}>重置</span>
|
||||
</li>
|
||||
</Menu>
|
||||
</Checkbox.Group>
|
||||
);
|
||||
|
||||
return(
|
||||
return (
|
||||
<React.Fragment>
|
||||
<Dropdown overlay={menu}
|
||||
onVisibleChange={this.handleVisibleChange}
|
||||
visible={this.state.visible}
|
||||
>
|
||||
<a className="ant-dropdown-link">
|
||||
分班 <Icon type="down" />
|
||||
分班 <Icon type="down"/>
|
||||
</a>
|
||||
</Dropdown>
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
export default Dropdownbox;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue