Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

competition setting && competition team

Browse Source
dev_bj
p31729568 6 years ago
parent 070be6e895
commit e84afb2f41
11 changed files with 282 additions and 228 deletions
Show Stats Download Patch File Download Diff File

181
app/controllers/competition_teams_controller.rb
Unescape View File

@ -38,32 +38,34 @@ class CompetitionTeamsController < ApplicationController
end end
def create def create
if params[:name]
# 判断用户是否已创建过战队 # 判断用户是否已创建过战队
if @competition.competition_teams.where(:user_id => User.current.id).count > 0 && !User.current.is_teacher if @competition.competition_teams.where(:user_id => User.current.id).count > 0 && !User.current.is_teacher
@status = 1 @status, @message = -1, '您已创建过战队，不能重复创建'
else return
invite_code = generate_team_code
teacher_id = User.current.user_extensions.identity == 0 ? User.current.id : params[:teacher]
new_team = CompetitionTeam.create(:competition_id => @competition.id, :name => params[:name],
:invite_code => invite_code, :user_id => User.current.id, :teacher_id => teacher_id)
new_team.team_members << TeamMember.new(:user_id => User.current.id, :role => 1, :competition_id => @competition.id, :is_teacher => User.current.user_extensions.identity == 0 ? 1 : 0)
if params[:member_ids]
params[:member_ids].each do |user_id|
new_team.team_members << TeamMember.new(:user_id => user_id, :role => 2, :competition_id => @competition.id)
end end
if params[:name].blank?
@status, @message = -1, '战队名称不能为空'
return
end end
if params[:teacher] && params[:teacher].strip != ""
new_team.team_members << TeamMember.new(:user_id => params[:teacher], :role => 2, :competition_id => @competition.id, :is_teacher => 1) is_teacher = User.current.user_extensions.identity == 0
# 创建成功且配置了指导老师 return unless member_and_teacher_count_valid?(is_teacher)
@status = 0
elsif User.current.user_extensions.identity != 0 ActiveRecord::Base.transaction do
# 创建成功未配置指导老师 invite_code = generate_team_code
@status = 2 new_team = CompetitionTeam.create(:competition_id => @competition.id, :name => params[:name],
elsif User.current.user_extensions.identity == 0 :invite_code => invite_code, :user_id => User.current.id)
@status = 0 new_team.team_members.create!(user_id: User.current.id, role: 1, competition_id: @competition.id, is_teacher: User.current.user_extensions.identity == 0 ? 1 : 0)
params[:member_ids].try(:each) do |user_id|
next if user_id.to_i == User.current.id
new_team.team_members.create!(user_id: user_id, role: 2, competition_id: @competition.id)
end end
params[:teacher_ids].try(:each) do |user_id|
next if user_id.to_i == User.current.id
new_team.team_members.create!(user_id: user_id, role: 3, competition_id: @competition.id, is_teacher: 1)
end end
end end
end end
@ -89,79 +91,80 @@ class CompetitionTeamsController < ApplicationController
end end
def update def update
unless @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now is_teacher = @team.user.user_extensions.identity == 0
if params[:name] return unless member_and_teacher_count_valid?(is_teacher)
teacher_id = User.current.user_extensions.identity == 0 ? User.current.id : params[:teacher]
@team.update_attributes(:name => params[:name], :teacher_id => teacher_id) ActiveRecord::Base.transaction do
@team.team_members.update_all(:is_teacher => 0) unless @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now
if @team.user.user_extensions.identity == 0 @team.update_attributes(name: params[:name]) if params[:name].present?
@team.team_members.where(:user_id => @team.user_id).update_all(:is_teacher => 1)
end
team_member_ids = @team.team_members.where(:role => 2, :is_teacher => 0).map(&:user_id) team_member_ids = @team.team_members.where(role: 2, is_teacher: 0).pluck(:user_id)
new_member_ids = (params[:member_ids] || []).collect(&:to_i) new_member_ids = (params[:member_ids].presence || []).map(&:to_i)
new_member_ids << @team.user_id unless is_teacher
# 删除的成员 # 删除的成员
delete_member_ids = team_member_ids - new_member_ids delete_member_ids = team_member_ids - new_member_ids
@team.team_members.where(:role => 2, :user_id => delete_member_ids).destroy_all @team.team_members.where(role: 2, user_id: delete_member_ids).delete_all
# 新增加的成员 # 新增加的成员
(new_member_ids - team_member_ids).each do |user_id| (new_member_ids - team_member_ids).each do |user_id|
@team.team_members << TeamMember.new(:user_id => user_id, :role => 2, :competition_id => @competition.id) next if user_id.to_i == @team.user_id
end @team.team_members.create!(user_id: user_id, role: 2, competition_id: @competition.id)
end end
end end
# 判断之前是否已存在指导老师，不存在则创建 否则更新 teacher_ids = @team.teachers.pluck(:user_id)
if params[:teacher] && params[:teacher].strip != "" new_teacher_ids = (params[:teacher_ids].presence || []).map(&:to_i)
o_teacher = @team.team_members.where(:is_teacher => 1).first new_teacher_ids << @team.user_id if is_teacher
unless o_teacher.present? && o_teacher.user_id == params[:teacher].to_i # 删除的老师
if o_teacher.present? delete_teacher_ids = teacher_ids - new_teacher_ids
o_teacher.update_attributes(:user_id => params[:teacher]) @team.team_members.where(role: 3, user_id: delete_teacher_ids).delete_all
else # 新增加的老师
teacher = @team.team_members.where(:user_id => params[:teacher]).first (new_teacher_ids - teacher_ids).each do |user_id|
if teacher.present? next if user_id.to_i == @team.user_id
teacher.update_column("is_teacher", 1) @team.team_members.create!(user_id: user_id, role: 3, competition_id: @competition.id, is_teacher: true)
else
@team.team_members << TeamMember.new(:user_id => params[:teacher], :role => 2, :competition_id => @competition.id, :is_teacher => 1)
end
end end
end end
@team.update_attributes(:teacher_id => params[:teacher])
elsif @team.user.user_extensions.identity != 0
@team.update_attributes(:teacher_id => nil)
@team.team_members.where(:is_teacher => 1).destroy_all
end
end end
# @status:提示语标志（0：加入成功；1：邀请码错误；2：已经加入了其他队, 3：超过人数限制，4：已有指导老师，5：只有学生和老师身份的用户才能加入战队） # @status:提示语标志（0：加入成功；1：邀请码错误；2：已经加入了其他队, 3：超过人数限制，4：已有指导老师，5：只有学生和老师身份的用户才能加入战队）
def join_team def join_team
team = @competition.competition_teams.where(:invite_code => params[:code]).first team = @competition.competition_teams.where(invite_code: params[:code]).first
if team.present? if team.blank?
@status, @message = -1, '战队邀请码错误'
return
end
if TeamMember.where(:user_id => User.current.id, :competition_team_id => @competition.competition_teams.map(&:id), :is_teacher => 0).count > 0 if TeamMember.where(:user_id => User.current.id, :competition_team_id => @competition.competition_teams.map(&:id), :is_teacher => 0).count > 0
@status = 2 @status, @message = -1, '您已加入战队，不能重复加'
else return
# 老师身份加入战队判断是否已有指导老师
if User.current.user_extensions.identity == 0
if team.teacher_id.present?
@status = 4
else
@status = 0
team.update_attributes(:teacher_id => User.current.id)
team.team_members << TeamMember.new(:user_id => User.current.id, :role => 2, :competition_id => @competition.id, :is_teacher => 1)
end end
elsif User.current.user_extensions.identity == 1
if team.team_members.count < @competition.max_num.to_i if team.team_members.where(user_id: User.current.id).exists?
team.team_members << TeamMember.new(:user_id => User.current.id, :role => 2, :competition_id => @competition.id) @status, @message = -1, '您已加入该战队'
@status = 0 return
else
@status = 3
end end
else
@status = 5 # 老师身份加入战队
if User.current.user_extensions.identity == 0
teacher_staff = @competition.where(category: 'teacher').first
if teacher_staff.blank?
@status, @message = -1, '该竞赛不能配备导师'
return
end end
if team.teachers.count + 1 > teacher_staff.maximum
@status, @message = -1, '该战队导师人数已满'
return
end end
team.team_members.create!(user_id: User.current.id, role: 3, competition_id: @competition.id, is_teacher: true)
else else
@status = 1 max_member_count = @competition.where('category != "teacher"').sum(:maximum)
if team.members.count + 1 > max_member_count
@status, @message = -1, '该战队成员人数已满'
return
end
team.team_members.create!(user_id: User.current.id, role: 2, competition_id: @competition.id)
end end
end end
@ -169,9 +172,6 @@ class CompetitionTeamsController < ApplicationController
def exit_team def exit_team
team_member = @team.team_members.where(:user_id => User.current.id).first team_member = @team.team_members.where(:user_id => User.current.id).first
if team_member.present? if team_member.present?
if team_member.is_teacher
@team.update_attributes(:teacher_id => nil)
end
if team_member.user_id != @team.user_id if team_member.user_id != @team.user_id
team_member.destroy team_member.destroy
@status = 1 @status = 1
@ -214,4 +214,33 @@ class CompetitionTeamsController < ApplicationController
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end
def member_and_teacher_count_valid?(is_teacher)
teacher_staff = @competition.competition_staffs.where(category: 'teacher').first
teacher_count = params[:teacher_ids].try(:size) || 0
teacher_count += 1 if is_teacher
# 检查老师数量
if teacher_staff.blank? && teacher_count > 0
@status, @message = -1, '该竞赛不能配备导师'
return false
elsif teacher_staff.present? && (teacher_staff.minimum > teacher_count || teacher_staff.maximum < teacher_count)
@status = -1
@message = teacher_staff.maximum == teacher_staff.maximum ? "导师数量应为#{teacher_staff.minimum}人" : "导师数量应为#{teacher_staff.minimum}-#{teacher_staff.maximum}人"
return false
end
member_relations = @competition.competition_staffs.where('category != "teacher"')
min_member_count = member_relations.sum(:minimum)
max_member_count = member_relations.sum(:maximum)
member_count = params[:member_ids].try(:size) || 0
member_count += 1 unless is_teacher
# 检查成员数据
if min_member_count > member_count || member_count > max_member_count
@status = -1
@message = min_member_count == max_member_count ? "成员数量应为#{max_member_count}人" : "成员数量应为#{min_member_count}-#{max_member_count}人"
return false
end
true
end
end end

3
app/controllers/competitions_controller.rb
Unescape View File

@ -110,7 +110,8 @@ class CompetitionsController < ApplicationController
@team_members_count = TeamMember.where(:competition_team_id => @teams.pluck(:id)).count @team_members_count = TeamMember.where(:competition_team_id => @teams.pluck(:id)).count
@is_enroll = CompetitionTeam.where(:id => TeamMember.where(:user_id => @user, :competition_team_id => @competition.competition_teams.map(&:id)).pluck(:competition_team_id)).reorder("created_at desc") @is_enroll = CompetitionTeam.where(:id => TeamMember.where(:user_id => @user, :competition_team_id => @competition.competition_teams.map(&:id)).pluck(:competition_team_id)).reorder("created_at desc")
@show_notice = (@competition.identifier == "gcc-dev-2018" || @competition.identifier == "gcc-annotation-2018") && @competition.competition_teams.where(:user_id => User.current.id, :teacher_id => nil).count > 0 @show_notice = (@competition.identifier == "gcc-dev-2018" || @competition.identifier == "gcc-annotation-2018") &&
@competition.competition_teams.joins(:team_members).where(:user_id => User.current.id).group('competition_teams.id').sum('IF(team_members.is_teacher=1, 1, 0)').values.any?(&:zero?)
@teams = paginateHelper @teams, 50 @teams = paginateHelper @teams, 50
respond_to do |format| respond_to do |format|
format.js format.js

3
app/models/competition_team.rb
Unescape View File

@ -2,7 +2,10 @@
class CompetitionTeam < ActiveRecord::Base class CompetitionTeam < ActiveRecord::Base
belongs_to :user belongs_to :user
belongs_to :competition belongs_to :competition
has_many :team_members, :dependent => :destroy has_many :team_members, :dependent => :destroy
has_many :members, conditions: 'is_teacher = 0', class_name: 'TeamMember'
has_many :teachers, conditions: 'is_teacher = 1', class_name: 'TeamMember'
has_many :competition_scores, :dependent => :destroy has_many :competition_scores, :dependent => :destroy
# team_type 0：组队 1：个人 # team_type 0：组队 1：个人
# attr_accessible :invite_code, :name, :team_type # attr_accessible :invite_code, :name, :team_type

2
app/models/team_member.rb
Unescape View File

@ -3,5 +3,5 @@ class TeamMember < ActiveRecord::Base
belongs_to :competition belongs_to :competition
belongs_to :user belongs_to :user
# role 1：创建者 2：成员 3：指导老师 # role 1：创建者 2：成员 3：指导老师
# attr_accessible :role attr_accessible :role, :user_id, :competition_id, :is_teacher
end end

95
app/views/competition_teams/_competition_team_form.html.erb
Unescape View File

@ -1,7 +1,12 @@
<% none_edit = @team.try(:id).present? && @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %> <% none_edit = @team.try(:id).present? && @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %>
<%= labelled_form_for @team, :html => {:id => 'competition_team_form', :multipart => true, :remote => true} do |f| %> <%= labelled_form_for @team, :html => {:id => 'competition_team_form', :multipart => true, :remote => true} do |f| %>
<input type="hidden" id="max_num" value="<%= @competition.max_num %>"> <% teacher_staff = @competition.competition_staffs.where(category: 'teacher').first %>
<input type="hidden" id="min_num" value="<%= @competition.min_num %>"> <% min_member_staff = @competition.competition_staffs.where('category != "teacher"').sum(:minimum) %>
<% max_member_staff = @competition.competition_staffs.where('category != "teacher"').sum(:maximum) %>
<input type="hidden" id="teacher_maximum" value="<%= teacher_staff.try(:maximum) || 0 %>">
<input type="hidden" id="teacher_minimum" value="<%= teacher_staff.try(:minimum) || 0 %>">
<input type="hidden" id="member_maximum" value="<%= max_member_staff || 0 %>">
<input type="hidden" id="member_minimum" value="<%= min_member_staff || 0 %>">
<input type="hidden" id="team_id" value="<%= @team.try(:id) %>"> <input type="hidden" id="team_id" value="<%= @team.try(:id) %>">
<input type="hidden" name="com_id" value="<%= @competition.id %>"> <input type="hidden" name="com_id" value="<%= @competition.id %>">
@ -15,6 +20,7 @@
</div> </div>
<p style="line-height: 27px;height: 27px"><span id="team_name_notice" class="color-orange-tip ml73 none"></span></p> <p style="line-height: 27px;height: 27px"><span id="team_name_notice" class="color-orange-tip ml73 none"></span></p>
<% if teacher_staff.present? %>
<div class="df pl20 pr20"> <div class="df pl20 pr20">
<label class="ml10 mt3">导师：</label> <label class="ml10 mt3">导师：</label>
<div class="flex1 pr search-new"> <div class="flex1 pr search-new">
@ -31,6 +37,8 @@
<a class="fl ml20 white-btn edu-blueback-btn mt4" onclick="add_teacher()">添加导师</a> <a class="fl ml20 white-btn edu-blueback-btn mt4" onclick="add_teacher()">添加导师</a>
</div> </div>
<p style="line-height: 27px;height: 27px"><span id="teacher_notice" class="color-orange-tip ml73 none"></span></p> <p style="line-height: 27px;height: 27px"><span id="teacher_notice" class="color-orange-tip ml73 none"></span></p>
<% end %>
<% if min_member_staff > 0 %>
<div class="df pl20 pr20"> <div class="df pl20 pr20">
<label class="mt3"><span class="mr3 color-orange">*</span>队员：</label> <label class="mt3"><span class="mr3 color-orange">*</span>队员：</label>
<div class="flex1 search-new"> <div class="flex1 search-new">
@ -47,6 +55,7 @@
<a class="fl ml20 white-btn edu-blueback-btn mt4" onclick="<%= none_edit ? '' : 'add_member()' %>">添加成员</a> <a class="fl ml20 white-btn edu-blueback-btn mt4" onclick="<%= none_edit ? '' : 'add_member()' %>">添加成员</a>
</div> </div>
<p style="line-height: 27px;height: 27px"><span id="member_notice" class="color-orange-tip ml73 none"></span></p> <p style="line-height: 27px;height: 27px"><span id="member_notice" class="color-orange-tip ml73 none"></span></p>
<% end %>
<div class="bor-grey-e ml20 mr20 mt5" id="member_block"> <div class="bor-grey-e ml20 mr20 mt5" id="member_block">
<p class="pt10 pb10 clearfix bor-bottom-greyE personListLine"> <p class="pt10 pb10 clearfix bor-bottom-greyE personListLine">
@ -57,25 +66,30 @@
<span class="t-c-5">操作</span> <span class="t-c-5">操作</span>
</p> </p>
<% if @team.try(:id).present? %> <% if @team.try(:id).present? %>
<p class="personListLine clearfix pt5 pb5 personListMember" id="create_li"> <% creator_teacher = @team.user.user_extensions.identity == 0 %>
<p class="personListLine clearfix pt5 pb5 personListMember <%= creator_teacher ? 'team-teacher' : 'team-member' %>" id="create_li">
<span class="t-c-1"><%= @team.user.show_name %></span> <span class="t-c-1"><%= @team.user.show_name %></span>
<span class="t-c-2"><%= @team.user.user_extensions.identity == 0 ? "导师/创建者" : "创建者" %></span> <span class="t-c-2"><%= @team.user.user_extensions.identity == 0 ? "导师/创建者" : "创建者" %></span>
<span class="t-c-3"><%= @team.user.school_name %></span> <span class="t-c-3"><%= @team.user.school_name %></span>
<span class="t-c-4"><%= @team.user.user_extensions.identity == 0 ? "职称：#{@team.user.identity}" : "学号：#{@team.user.user_extensions.student_id.present? ? @team.user.user_extensions.student_id : "--"}" %></span> <span class="t-c-4"><%= @team.user.user_extensions.identity == 0 ? "职称：#{@team.user.identity}" : "学号：#{@team.user.user_extensions.student_id.present? ? @team.user.user_extensions.student_id : "--"}" %></span>
<span class="t-c-5"></span> <span class="t-c-5"></span>
</p> </p>
<% if @team.teacher.present? && @team.teacher != @team.user %>
<p class="personListLine clearfix pt5 pb5 personListMember"> <% @team.teachers.includes(user: :user_extensions).each do |teacher| %>
<input type="hidden" name="teacher" value="<%= @team.teacher_id %>"> <% next if teacher.user_id == @team.user_id %>
<span class="t-c-1"><%= @team.teacher.show_name %></span> <p class="personListLine clearfix pt5 pb5 personListMember team-teacher team-teacher-<%= teacher.user.id %>">
<input type="hidden" name="teacher_ids[]" value="<%= teacher.user.id %>">
<span class="t-c-1"><%= teacher.user.show_name %></span>
<span class="t-c-2">导师</span> <span class="t-c-2">导师</span>
<span class="t-c-3"><%= @team.teacher.school_name %></span> <span class="t-c-3"><%= teacher.user.school_name %></span>
<span class="t-c-4">职称：<%= @team.teacher.identity %></span> <span class="t-c-4">职称：<%= teacher.user.identity %></span>
<span class="t-c-5"><span class="delete_member" data-tip-down="删除"><i class="iconfont icon-guanbi font-14 color-grey-c"></i></span></span> <span class="t-c-5"><span class="delete_member" data-tip-down="删除"><i class="iconfont icon-guanbi font-14 color-grey-c"></i></span></span>
</p> </p>
<% end %> <% end %>
<% @team.team_members.where(:role => 2, :is_teacher => 0).each do |team_user| %>
<p class="personListLine clearfix pt3 pb3 personListMember"> <% @team.members.includes(user: :user_extensions).each do |team_user| %>
<% next if team_user.user_id == @team.user_id %>
<p class="personListLine clearfix pt3 pb3 personListMember team-member">
<input type="hidden" name="member_ids[]" value="<%= team_user.user_id %>"> <input type="hidden" name="member_ids[]" value="<%= team_user.user_id %>">
<span class="t-c-1"><%= team_user.user.show_name %></span> <span class="t-c-1"><%= team_user.user.show_name %></span>
<span class="t-c-2">成员</span> <span class="t-c-2">成员</span>
@ -89,7 +103,8 @@
</p> </p>
<% end %> <% end %>
<% else %> <% else %>
<p class="personListLine clearfix pt5 pb5 personListMember" id="create_li"> <% creator_teacher = @team_user.user_extensions.identity == 0 %>
<p class="personListLine clearfix pt5 pb5 personListMember <%= creator_teacher ? 'team-teacher' : 'team-member' %>" id="create_li">
<span class="t-c-1"><%= @team_user.show_name %></span> <span class="t-c-1"><%= @team_user.show_name %></span>
<span class="t-c-2"><%= @team_user.user_extensions.identity == 0 ? "导师/创建者" : "创建者" %></span> <span class="t-c-2"><%= @team_user.user_extensions.identity == 0 ? "导师/创建者" : "创建者" %></span>
<span class="t-c-3"><%= @team_user.school_name %></span> <span class="t-c-3"><%= @team_user.school_name %></span>
@ -112,33 +127,46 @@
function submit_competition_team_form(){ function submit_competition_team_form(){
if($("input[name='name']").val().trim() == ""){ if($("input[name='name']").val().trim() == ""){
$("#team_name_notice").html("请输入战队名").show(); $("#team_name_notice").html("请输入战队名").show();
} else{ return;
var max_num = parseInt($("#max_num").val()); }
var min_num = parseInt($("#min_num").val());
if($("#member_block .personListMember").length > max_num || $("#member_block .personListMember").length < min_num){ var teacherMaximum = parseInt($("#teacher_maximum").val());
$("#competition_team_form_notice").html("战队成员需为"+min_num+"-"+max_num+"人").show(); var teacherMinimum = parseInt($("#teacher_minimum").val());
} else{ var memberMaximum = parseInt($("#member_maximum").val());
var memberMinimum = parseInt($("#member_minimum").val());
var teacherCount = $("#member_block .personListMember.team-teacher").length;
if (teacherMaximum != 0 && teacherCount > teacherMaximum || teacherMinimum != 0 && teacherCount < teacherMinimum) {
$("#competition_team_form_notice").html("战队导师需为"+teacherMinimum+"-"+teacherMaximum+"人，现为" + teacherCount + '人').show();
return;
}
var memberCount = $("#member_block .personListMember.team-member").length;
if (memberMaximum != 0 && memberCount > memberMaximum || memberMinimum != 0 && memberCount < memberMinimum) {
$("#competition_team_form_notice").html("战队成员需为"+memberMinimum+"-"+memberMaximum+"人，现为" + memberCount + '人').show();
return;
}
$("#team_name_notice").hide(); $("#team_name_notice").hide();
$("#competition_team_form_notice").hide(); $("#competition_team_form_notice").hide();
$("#competition_team_form").submit(); $("#competition_team_form").submit();
hideModal(); hideModal();
} }
}
}
function add_teacher(){ function add_teacher(){
if($("#teacher_search_input").attr("disabled") != "disabled"){ if($("#teacher_search_input").attr("disabled") != "disabled"){
if($("#teacher_name").val() == "" || $("#teacher_name").val() != $("#teacher_search_input").val()){ if($("#teacher_name").val() == "" || $("#teacher_name").val() != $("#teacher_search_input").val()){
$("#teacher_id").attr("data-select", 0); $("#teacher_id").attr("data-select", 0);
$("#teacher_notice").html("指导老师需从搜索下拉列表中选择").show(); $("#teacher_notice").html("指导老师需从搜索下拉列表中选择").show();
} else{ return;
if($("#teacher_id").attr("data-select") == 1){ }
if($("#teacher_id").attr("data-select") == 1 || $(".team-teacher.team-teacher-" + $("#teacher_id").val()).length != 0){
$("#teacher_notice").html("该老师已添加").show(); $("#teacher_notice").html("该老师已添加").show();
} else{ return;
}
$("#teacher_notice").hide(); $("#teacher_notice").hide();
$("input[name='teacher']").parent().remove(); var li = '<p class="personListLine clearfix pt3 pb3 personListMember team-teacher team-teacher-' + $("#teacher_id").val() + '">' +
var li = '<p class="personListLine clearfix pt3 pb3 personListMember">' + ' <input type="hidden" name="teacher_ids[]" value="'+$("#teacher_id").val()+'">' +
' <input type="hidden" name="teacher" value="'+$("#teacher_id").val()+'">' +
' <span class="t-c-1">'+$("#teacher_name").val()+'</span>' + ' <span class="t-c-1">'+$("#teacher_name").val()+'</span>' +
' <span class="t-c-2">导师</span>' + ' <span class="t-c-2">导师</span>' +
' <span class="t-c-3">'+$("#teacher_school").val()+'</span>' + ' <span class="t-c-3">'+$("#teacher_school").val()+'</span>' +
@ -149,20 +177,21 @@
$("#teacher_id").attr("data-select", 1); $("#teacher_id").attr("data-select", 1);
} }
} }
}
}
function add_member(){ function add_member(){
$("#member_notice").hide(); $("#member_notice").hide();
if($("#member_name").val() == "" || $("#member_name").val() != $("#user_search_input").val()){ if($("#member_name").val() == "" || $("#member_name").val() != $("#user_search_input").val()){
$("#member_id").attr("data-select", 0); $("#member_id").attr("data-select", 0);
$("#member_notice").html("队员需从搜索下拉列表中选择").show(); $("#member_notice").html("队员需从搜索下拉列表中选择").show();
} else{ return;
if($("#member_id").attr("data-select") == 1){ }
if($("#member_id").attr("data-select") == 1 || $(".team-member.team-member-" + $("#member_id").val()).length != 0){
$("#member_notice").html("该队员已添加").show(); $("#member_notice").html("该队员已添加").show();
} else{ return;
}
$("#member_notice").hide(); $("#member_notice").hide();
var li = '<p class="personListLine clearfix pt3 pb3 personListMember">' + var li = '<p class="personListLine clearfix pt3 pb3 personListMember team-member team-member-' + $("#member_id").val() + '">' +
' <input type="hidden" name="member_ids[]" value="'+$("#member_id").val()+'">' + ' <input type="hidden" name="member_ids[]" value="'+$("#member_id").val()+'">' +
' <span class="t-c-1">'+$("#member_name").val()+'</span>' + ' <span class="t-c-1">'+$("#member_name").val()+'</span>' +
' <span class="t-c-2">成员</span>' + ' <span class="t-c-2">成员</span>' +
@ -173,8 +202,6 @@
$("#member_block").append(li); $("#member_block").append(li);
$("#member_id").attr("data-select", 1); $("#member_id").attr("data-select", 1);
} }
}
}
$("#user_search_input").on("keydown", function(event){ $("#user_search_input").on("keydown", function(event){
var code; var code;

2
app/views/competition_teams/_search_teacher_list.html.erb
Unescape View File

@ -1,4 +1,4 @@
<p class="pl30 color-orange-tip mt5 pb5 bor-bottom-greyE">只能指定1名指导老师，允许修改</p> <p class="pl30 color-orange-tip mt5 pb5 bor-bottom-greyE">请选择指导老师，允许修改</p>
<% @teachers.each do |teacher| %> <% @teachers.each do |teacher| %>
<li class="clearfix"> <li class="clearfix">
<input type="hidden" value="<%= teacher.id %>"> <input type="hidden" value="<%= teacher.id %>">

8
app/views/competition_teams/create.js.erb
Unescape View File

@ -1,7 +1,5 @@
<% if @status == 0 %> <% if @status == -1 %>
notice_box("<%= @message %>");
<% else %>
notice_box_redirect("<%= enroll_competition_path(@competition) %>", "创建成功"); notice_box_redirect("<%= enroll_competition_path(@competition) %>", "创建成功");
<% elsif @status == 2 %>
notice_box_redirect("<%= enroll_competition_path(@competition) %>", "创建成功，请尽快填写指导老师");
<% elsif @status == 1 %>
notice_box("您已创建过战队，不能重复创建");
<% end %> <% end %>

14
app/views/competition_teams/join_team.js.erb
Unescape View File

@ -1,13 +1,5 @@
<% if @status == 0 %> <% if @status != -1 %>
notice_box_redirect("<%= enroll_competition_path(@competition) %>", "加入成功"); notice_box_redirect("<%= enroll_competition_path(@competition) %>", "加入成功");
<% elsif @status == 1 %> <% else %>
notice_box("战队邀请码错误"); notice_box('<%= @message %>')
<% elsif @status == 2 %>
notice_box("您已加入战队，不能重复加");
<% elsif @status == 3 %>
notice_box("战队成员已满，无法加入");
<% elsif @status == 4 %>
notice_box("战队已有指导老师，无法加入");
<% elsif @status == 5 %>
notice_box("非老师/学生身份无法加入战队");
<% end %> <% end %>

4
app/views/competition_teams/update.js.erb
Unescape View File

@ -1 +1,5 @@
<% if @status != -1 %>
notice_box_redirect("<%= enroll_competition_path(@competition) %>", "更新成功"); notice_box_redirect("<%= enroll_competition_path(@competition) %>", "更新成功");
<% else %>
notice_box("<%= @message %>")
<% end %>

2
app/views/competitions/enroll.html.erb
Unescape View File

@ -83,7 +83,7 @@
</span> </span>
<span class="fl mr40 mt13 font-16">邀请码：<label class="color-orange"><%= team.invite_code %></label></span> <span class="fl mr40 mt13 font-16">邀请码：<label class="color-orange"><%= team.invite_code %></label></span>
<% if @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %> <% if @competition.enroll_end_time.present? && @competition.enroll_end_time < Time.now %>
<% if (User.current.admin? || User.current == team.user) && team.user_id != team.teacher_id %> <% if User.current.admin? || User.current == team.user %>
<a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr20" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a> <a href="<%= edit_competition_team_path(team) %>" data-remote="true" class="fl mt13 mr20" data-tip-down="编辑"><i class="iconfont icon-bianjidaibeijing color-blue fl"></i></a>
<% end %> <% end %>
<% else %> <% else %>

2
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -698,7 +698,7 @@ a.enterLink{cursor: pointer;color: #418CCD!important;background: none!important;
.personListLine > span{float: left;text-align: center;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .personListLine > span{float: left;text-align: center;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
.t-c-1{width: 120px;} .t-c-1{width: 120px;}
.t-c-2{width: 150px;text-align: left!important;} .t-c-2{width: 150px;text-align: left!important;}
.t-c-3{width: 210px;} .t-c-3{width: 210px;min-height:20px;}
.t-c-4{width: 200px;} .t-c-4{width: 200px;}
.t-c-5{width: 80px;} .t-c-5{width: 80px;}
/*东北赛区*/ /*东北赛区*/

Write Preview
Loading…
Cancel
Save