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

Merge branch 'develop' into educoder

Browse Source
dev_haigong
cxt 6 years ago
parent 1603c34128 1de495dc92
commit f9ca4795b7
16 changed files with 224 additions and 161 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/account_controller.rb
Unescape View File

@ -891,7 +891,7 @@ class AccountController < ApplicationController
@user = User.current
@se = @user.extensions
# 已授权的用户修改单位名称，需要重新授权
if @se.school_id != params[:occupation].to_i && @user.certification == 1
if (@se.school_id != params[:occupation].to_i || @se.identity != params[:identity].to_i) && @user.certification == 1
@user.certification = 0
apply_user = ApplyAction.where(:user_id => @user.id, :container_type => "TrialAuthorization")
apply_user.update_all(:status => 2) unless apply_user.blank?
@ -1038,7 +1038,7 @@ class AccountController < ApplicationController
apply_action = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization", :status => 0).first
school_ids = School.where(:auto_users_trial => 1).map(&:id)
user_ex = User.current.user_extensions
if (user_ex.identity == 0 || (user_ex.identity == 1 && user_ex.student_id.present?)) && !user_ex.school.nil? && school_ids.include?(user_ex.school_id)
if user_ex.identity == 1 && user_ex.student_id.present? && !user_ex.school.nil? && school_ids.include?(user_ex.school_id)
User.current.update_attributes(:certification => 1)
logger.warn("apply_trail #######{User.current.login} ****#{User.current.user_extensions.school_id}")
@tip = "申请已提交，我们将在1分钟内完成审核"

2
app/controllers/ecloud_controller.rb
Unescape View File

@ -43,7 +43,7 @@ class EcloudController < ApplicationController
CLIENT_ID = '1056'
CLIENT_SECRET = '2e84256a-3de4-4713-9e02-10ee88a14592'
SERVER_URL = "https://221.176.53.130:44390/services/"
q
## 签名

60
app/controllers/managements_controller.rb
Unescape View File

@ -2104,25 +2104,36 @@ end
condition = (params[:research_condition].nil? || params[:research_condition] == "name") ? "concat(lastname, firstname)" : params[:research_condition]
if 0 == status
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.order("#{@order_key} #{@us_order}")
@users = User.where(nil)
else
@users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}")
@users = User.where("#{condition} like '%#{params[:research_contents]}%'")
end
else
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.where(:status => status).order("#{@order_key} #{@us_order}")
@users = User.where(:status => status)
else
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}")
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'")
end
end
if params[:identity] && params[:identity].to_i != -1
@users = @users.includes(:user_extensions).where("user_extensions.identity = ?", params[:identity].to_i)
end
if params[:auto_school] && params[:auto_school].to_i != 0
@users = @users.includes(:user_extensions => [:school]).where("schools.auto_users_trial = ?", params[:auto_school].to_i == 1 ? 1 : 0)
end
if params[:school] && params[:school] != ''
school_name = params[:school]
school = School.where("name like '%#{school_name}%'")
school_id = school.map(&:id)
user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
@users = @users.where(:id => user_id).order("#{@order_key} #{@us_order}")
@users = @users.where(:id => user_id)
end
@users = @users.order("#{@order_key} #{@us_order}")
@page = (params['page'] || 1).to_i
@users_count = @users.count
@limit = 20
@ -3183,28 +3194,49 @@ end
def trial_authorization
@menu_type =10
@sub_type = 2
search = params[:search]
name_search = params[:search]
@status = trial_authorization_status(params[:status])
# @status = (params[:status].blank? || params[:status] == "0") ? 0 : [1,2]
if search.blank?
@authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => @status).includes(:user)
else
user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{search}%'")
@authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => @status, :user_id => user_id).includes(:user)
user_id = []
search = false
@authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => @status)
unless name_search.blank?
new_user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{name_search}%'").map(&:id)
user_id = user_id.size == 0 ? new_user_id : user_id & new_user_id
search = true
end
if params[:sname] && params[:sname] != ''
if params[:sname] && params[:sname].strip != ''
school_id = School.where("name like '%#{params[:sname]}%'")
user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
@authorizations = @authorizations.where(:user_id => user_id).order("updated_at desc")
new_user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
user_id = user_id.size == 0 ? new_user_id : user_id & new_user_id
search = true
end
if params[:identity] && params[:identity].to_i != -1
new_user_id = UserExtensions.where(:identity => params[:identity].to_i).map(&:user_id)
user_id = user_id.size == 0 ? new_user_id : user_id & new_user_id
search = true
end
if params[:auto_school] && params[:auto_school].to_i != 0
school_id = School.where(auto_users_trial: params[:auto_school].to_i == 1 ? 1 : 0)
new_user_id = UserExtensions.where(:school_id => school_id).map(&:user_id)
user_id = user_id.size == 0 ? new_user_id : user_id & new_user_id
search = true
end
@authorizations = user_id.size == 0 && !search ? @authorizations.order("updated_at desc") : @authorizations.where(:user_id => user_id.uniq).order("updated_at desc")
@autu_count = @authorizations.count
@limit = 15
@is_remote = true
@autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
@offset ||= @autu_pages.offset
@authorizations = paginateHelper @authorizations, @limit
@authorizations = @authorizations.includes(:user)
respond_to do |format|
format.js
format.html

38
app/models/user.rb
Unescape View File

@ -1693,31 +1693,37 @@ class User < Principal
end
def self.create_with_ecoder!(info)
user = User.new
user.admin = false
user.login = "ecoder_" + info["mobile"]
user = User.find_by_phone(info["mobile"])
user.phone = info["mobile"]
# 如果手机号存在，则直接绑定用户
# 因为手机号可以取回密码，所以可以视为同一用户
unless user
user = User.new
user.admin = false
user.login = "ecoder_" + info["mobile"]
unless User.find_by_mail(info["email"])
user.mail = info["email"]
end
user.nickname = info["username"]
user.phone = info["mobile"]
unless User.find_by_mail(info["email"])
user.mail = info["email"]
end
user.nickname = info["username"]
user.activate
user.last_login_on = Time.now
user.activate
user.last_login_on = Time.now
user.ecoder_user_id = info["userid"]
user.ecoder_user_id = info["userid"]
user.save!(:validate => false)
user.save!(:validate => false)
UserStatus.create!(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
UserStatus.create!(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
ue = user.user_extensions ||= UserExtensions.new
ue.user_id = user.id
ue.save!
ue = user.user_extensions ||= UserExtensions.new
ue.user_id = user.id
ue.save!
end
user
end

3
app/views/account/_pro_certification_form.html.erb
Unescape View File

@ -10,6 +10,9 @@
<ul class="abouttable clearfix">
<li class="clearfix">
<label class="second-label fl"><span class="color-orange">* </span>职业：</label>
<% if @user.certification == 1 %>
<input type="hidden" id="user_certi_identity" value="<%= @user.user_extensions.identity %>">
<% end %>
<select id="userIdentity" name="identity" class="fl winput-240-40">
<option value="-1" style="display:none">请选择职业</option>
<option value="0">教师</option>

3
app/views/account/professional_certification.html.erb
Unescape View File

@ -28,6 +28,9 @@
<ul class="abouttable clearfix">
<li class="clearfix">
<label class="second-label fl"><span class="color-orange">* </span>职业：</label>
<% if @user.certification == 1 %>
<input type="hidden" id="user_certi_identity" value="<%= @user.user_extensions.identity %>">
<% end %>
<select id="userIdentity" name="identity" class="fl winput-240-40">
<option value="-1" style="display:none">请选择职业</option>
<option value="0">教师</option>

50
app/views/managements/_user_list.html.erb
Unescape View File

@ -65,15 +65,9 @@
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "created_on", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
$("input[name='us_order']").val(order);
$("input[name='order_key']").val("created_on");
$("#managements_users_search").submit();
});
// 按最后登录时间排序
$("#user_last_order").on("click", function(){
@ -83,15 +77,9 @@
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "last_login_on", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
$("input[name='us_order']").val(order);
$("input[name='order_key']").val("last_login_on");
$("#managements_users_search").submit();
});
// 按经验值排序
$("#user_experience_order").on("click", function(){
@ -101,16 +89,10 @@
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "experience", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
})
$("input[name='us_order']").val(order);
$("input[name='order_key']").val("experience");
$("#managements_users_search").submit();
});
// 按金币排序
$("#user_grade_order").on("click", function(){
@ -120,14 +102,8 @@
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "grade", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
$("input[name='us_order']").val(order);
$("input[name='order_key']").val("grade");
$("#managements_users_search").submit();
})
</script>

85
app/views/managements/trial_authorization.html.erb
Unescape View File

@ -28,11 +28,22 @@
<div id="edu-tab-con-2" class="undis">
<div class="mt10">
<p class="fl task-form-40 mt8 ml15 clearfix">
<p class="fl task-form-20 mt8 ml15 clearfix">
<a href="javascript:void(0);" class="edu-filter-cir-grey mr5 fl font-12 active" id="audit_all_authentication">全部</a>
<a href="javascript:void(0);" class="edu-filter-cir-grey mr5 fl font-12" id="audit_agree_authentication">同意</a>
<a href="javascript:void(0);" class="edu-filter-cir-grey mr5 fl font-12" id="audit_reject_authentication" >拒绝</a>
</p>
<select id="user_identity" name="identity" class="fl winput-120-40 ml15 mt5">
<option value="-1">请选择职业</option>
<option value="0">教师</option>
<option value="1">学生</option>
<option value="2">专业人士</option>
</select>
<select id="auto_school" name="auto_school" class="fl winput-120-40 ml15 mt5">
<option value="0">全部</option>
<option value="1">自动授权</option>
<option value="2">非自动授权</option>
</select>
<div class="edu-position fr task-form-30 mb10 fr mr15">
<input class="task-form-100 panel-box-sizing " placeholder="输入真实姓名进行检索" type="text" id="audit_search_name">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt10" id="audit_search"><i class="fa fa-search"></i></a>
@ -91,59 +102,55 @@
});
/* ----------------------- 已审批（全部） ------------------------- */
$("#audit_all_authentication").on("click", function(){
var iName = $("#audit_search_name").val();
var sName = $("#school_search_name").val();
$.ajax({
url: "<%= trial_authorization_managements_path %>" + ".js",
data: { name: iName, status: [1, 2], sname: sName }
});
});
$("#audit_all_authentication").on("click", function(){search_func([1, 2]);});
/* ----------------------- 已审批（同意） ------------------------- */
$("#audit_agree_authentication").live("click", function(){
var iName = $("#audit_search_name").val();
var sName = $("#school_search_name").val();
$.ajax({
url: "<%= trial_authorization_managements_path %>" +".js",
data: { name: iName, status: 1, sname: sName}
});
});
$("#audit_agree_authentication").live("click", function(){search_func(1);});
/* ----------------------- 已审批（拒绝） ------------------------- */
$("#audit_reject_authentication").live("click", function(){
var iName = $("#audit_search_name").val();
var sName = $("#school_search_name").val();
$("#audit_reject_authentication").live("click", function(){search_func(2);});
$.ajax({
url: "<%= trial_authorization_managements_path %>" +".js",
data: { name: iName, status: 2, sname: sName }
});
/* ------------------- 按名字进行搜索（已审批）-------------------- */
$("#audit_search").live("click", function(){search_func(0);});
$("#user_identity").on("change", function(){search_func(0);});
$("#auto_school").on("change", function(){search_func(0);});
$("#audit_search_name, #school_search_name").on("keydown", function(e){
// 兼容FF和IE和Opera
var theEvent = e || window.event;
var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
if (code == 13) {
//回车执行查询
search_func(0);
}
});
/* ------------------- 按名字进行搜索（已审批）-------------------- */
$("#audit_search").live("click", function(){
function search_func(status){
var iName = $("#audit_search_name").val();
var sName = $("#school_search_name").val();
var identity = $("#user_identity").val();
var auto_school = $("#auto_school").val();
var type = status;
var id = $("#audit_all_authentication").parent().find(".active").attr("id");
var type = 0;
if(type == 0){
var id = $("#audit_all_authentication").parent().find(".active").attr("id");
if(id == "audit_all_authentication"){
type = [1, 2];
}else if(id=="audit_agree_authentication"){
type = 1;
}else{
type = 2;
if(id == "audit_all_authentication"){
type = [1, 2];
}else if(id=="audit_agree_authentication"){
type = 1;
}else{
type = 2;
}
}
// alert(type);
$.ajax({
url: "<%= trial_authorization_managements_path %>" +".js",
data: { search: iName, status: type, sname: sName}
data: { search: iName, status: type, sname: sName, identity: identity, auto_school: auto_school}
});
});
}
// $(document).keyup(function(event){
// if(event.keyCode == 13){

89
app/views/managements/users.html.erb
Unescape View File

@ -1,40 +1,56 @@
<div class="edu-class-top mt15 clearfix bor-grey-e">
<%= form_tag(url_for(users_managements_path), :id => "managements_users_search", :method => "post", :remote => true) do %>
<div class=" edu-position edu-admin-select fl mr10" style="width:140px;" >
<p>全部状态<i class="fa fa-caret-down ml10" ></i></p>
<input type="hidden" name="user_status" value="0">
<ul class="edu-admin-option">
<li data-val="0">全部状态</li>
<li data-val="1">活动的（<%= query_user_status_num 1 %>）</li>
<li data-val="2">未激活（<%= query_user_status_num 2 %>）</li>
<li data-val="3">已锁定（<%= query_user_status_num 3 %>）</li>
</ul>
</div>
<div class="edu-position edu-admin-select fl mr10" style="width:150px;">
<p>真实姓名搜索<i class="fa fa-caret-down ml10"></i></p>
<input type="hidden" name="research_condition" value="name">
<ul class="edu-admin-option">
<li data-val="name">真实姓名搜索</li>
<li data-val="login">用户id搜索</li>
<li data-val="mail">邮箱地址搜索</li>
<li data-val="phone">手机号码搜索</li>
</ul>
</div>
<div class="fl with20">
<input type="text" class="fl task-form-100 task-height-40 panel-box-sizing" name="research_contents" placeholder="输入关键字进行搜索">
</div>
<li class="fl task-height-30 ml10" style="display: inline-block">
<input nhname="tag" autocomplete="off" maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text" placeholder="请输入单位名称关键字进行搜索" style="width: 260px" />
<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
<div class="cl"></div>
</li>
<div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
</div>
<div class=" edu-position edu-admin-select fl mr10" style="width:140px;">
<p>全部状态<i class="fa fa-caret-down ml10"></i></p>
<input type="hidden" name="user_status" value="0">
<ul class="edu-admin-option">
<li data-val="0">全部状态</li>
<li data-val="1">活动的（<%= query_user_status_num 1 %>）</li>
<li data-val="2">未激活（<%= query_user_status_num 2 %>）</li>
<li data-val="3">已锁定（<%= query_user_status_num 3 %>）</li>
</ul>
</div>
<div class="edu-position edu-admin-select fl mr10" style="width:120px;">
<p>真实姓名搜索<i class="fa fa-caret-down ml10"></i></p>
<input type="hidden" name="research_condition" value="name">
<ul class="edu-admin-option">
<li data-val="name">真实姓名搜索</li>
<li data-val="login">用户id搜索</li>
<li data-val="mail">邮箱地址搜索</li>
<li data-val="phone">手机号码搜索</li>
</ul>
</div>
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
<select id="user_identity" name="identity" class="fl winput-100-40 ml10">
<option value="-1">请选择职业</option>
<option value="0">教师</option>
<option value="1">学生</option>
<option value="2">专业人士</option>
</select>
<select id="auto_school" name="auto_school" class="fl winput-100-40 ml10">
<option value="0">全部</option>
<option value="1">自动授权</option>
<option value="2">非自动授权</option>
</select>
<!-- <a href="javascript:void(0);" class="fr task-btn task-btn-green mt5"> 新建用户</a>-->
<div class="fl with15 ml10">
<input type="text" class="fl task-form-100 task-height-40 panel-box-sizing" name="research_contents" placeholder="输入关键字进行搜索">
</div>
<li class="fl task-height-30 ml10" style="display: inline-block">
<input nhname="tag" autocomplete="off" maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="school" class="task-height-40 panel-box-sizing fl" type="text" placeholder="请输入单位名称关键字进行搜索" style="width: 200px"/>
<input nhname="tag" nh_tag_5="true" class="fl" id="school_id" name="school_id" style="display:none;" type="text"/> <!-- 单位名称的test框选中下拉列表框的id -->
<div class="cl"></div>
</li>
<div id="search_school_result_list" style="width: 330px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display:none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
</div>
<input type="hidden" name="us_order" value="">
<input type="hidden" name="order_key" value="">
<a href="javascript:void(0);" class="fl task-btn task-btn-orange ml5 mt5" onclick="$('#managements_users_search').submit();">搜索</a>
<a href="javascript:void(0);" class="fl task-btn ml5 mt5" id="clear_contents">清除</a>
<!-- <a href="javascript:void(0);" class="fr task-btn task-btn-green mt5"> 新建用户</a>-->
<a href="javascript:void(0);" onclick="import_course_members();" class="fr task-btn task-btn-orange mt5">课堂添加成员</a>
<% end %>
</div>
@ -42,7 +58,7 @@
<%= render :partial => "managements/user_list" %>
</div>
<script>
function import_course_members(){
function import_course_members() {
var htmlvalue = '<%= escape_javascript(render :partial => 'student_work/import_excel_score') %>';
pop_box_new(htmlvalue, 452, 163);
$("#submit_url").val('<%= import_course_members_managements_path() %>');
@ -56,7 +72,7 @@
var d_count = 0; //查询结果的总量
var d_maxPage = 0;//最大页面值
function department_search_fn(e) {
if($(e.target).val().trim() == ''){
if ($(e.target).val().trim() == '') {
$("#search_school_result_list").hide();
$("input[name='school_id']").val("");
return;
@ -94,9 +110,10 @@
}
});
}
//修改部门
function changeSchoolValue(value, data) {
console.log(value+","+data)
console.log(value + "," + data)
$("input[name='school']").val(value);
$("input[name='school_id']").val(data);
$("#search_school_result_list").hide();

2
app/views/shixuns/_shixun_top.html.erb
Unescape View File

@ -15,7 +15,7 @@
<% if @shixun.myshixuns.count > 0 %>
<li>
<span>学习人数</span>
<span><%= @shixun.myshixuns.count %></span>
<span><%= @shixun.myshixuns_count %></span>
</li>
<% end %>
<li>

2
app/views/student_work/shixun_work_report.html.erb
Unescape View File

@ -76,7 +76,7 @@
<span class="delay ml10">延时</span>
<% end %>
</td>
<td><%= game.try(:open_time).nil? ? "--" : format_time(game.open_time) %></td>
<td><%= game.try(:open_time).nil? || game.status == 3 ? "--" : format_time(game.open_time) %></td>
<% user_query = @game_user_query.select{|user_query| user_query[0] == game.id} %>
<td><%= user_query.blank? ? "--" : user_query.first[1] %></td>
<td><%= game.try(:end_time).nil? ? "--" : format_time(game.end_time) %></td>

15
public/javascripts/educoder/edu_account.js
Unescape View File

@ -1032,9 +1032,10 @@ function submit_pro_certification(type){
}
}
else if (data.result == 1){
if($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()){
if(($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()) ||
($("#user_certi_identity").length == 1 && $("#user_certi_identity").val() != $("select[name='identity']").val().trim())){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="cancel_submit_pro('+type+');" class="task-btn fl">取消</a>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称/职业后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="cancel_submit_pro('+type+');" class="task-btn fl">取消</a>'+
'<a href="javascript:void(0);" class="task-btn task-btn-orange fr pop_close" onclick="$(\'#my_pro_certification_form\').submit();">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 160);
} else{
@ -1054,9 +1055,10 @@ function submit_pro_certification(type){
}
});
} else{
if($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()){
if(($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()) ||
($("#user_certi_identity").length == 1 && $("#user_certi_identity").val() != $("select[name='identity']").val().trim())){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="cancel_submit_pro('+type+');" class="task-btn fl">取消</a>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称/职业后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="cancel_submit_pro('+type+');" class="task-btn fl">取消</a>'+
'<a href="javascript:void(0);" class="task-btn task-btn-orange fr pop_close" onclick="$(\'#my_pro_certification_form\').submit();">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 160);
} else{
@ -1610,9 +1612,10 @@ function my_account_form_submit() {
notice_box("该学号已被另一个账号（" + data.account + "）使用");
}
else if (data.result == 1){
if($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()){
if(($("#user_certi_school_id").length == 1 && $("#user_certi_school_id").val() != $("input[name='occupation']").val().trim()) ||
($("#user_certi_identity").length == 1 && $("#user_certi_identity").val() != $("select[name='identity']").val().trim())){
var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
'<div class="task-popup-content"><p class="task-popup-text-center font-16">修改单位名称/职业后需要重新申请试用授权</p></div><div class="task-popup-submit clearfix"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
'<a href="javascript:void(0);" class="task-btn task-btn-orange fr pop_close" onclick="$(\'#my_account_form\').submit();">确定</a></div></div>';
pop_box_new(htmlvalue, 480, 160);
} else{

21
public/react/src/modules/page/MainContentContainer.js
Unescape View File

@ -587,7 +587,7 @@ class MainContentContainer extends Component {
// var timeOut = parseInt(<%= @myshixun.main_mirror.try(:time_limit) %>); // 超时参数
this.setEvaluateMiddleStatusText('')
this.setState({
gameBuilding: true
})
@ -611,6 +611,9 @@ class MainContentContainer extends Component {
this.setGameBuildFalse()
});
}
setEvaluateMiddleStatusText = (msg) => {
window.$('#evaluateMiddleStatusText').html(msg)
}
// 之前的task_commit方法
gameBuild(fileUpdateResponse, first) {
const { st, challenge, output_sets, onRunCodeTestFinish, resetTestSetsExpandedArray, showSnackbar, time_limit } = this.props
@ -641,14 +644,18 @@ class MainContentContainer extends Component {
axios.get(game_status_url, {
withCredentials: true,
}).then((gameStatusResponse) => {
requestTimes++;
if(!gameStatusResponse.data) {
if(requestTimes >= timeOut - 1){ // 最后一次参数改为true
timeOutFlag = true;
}
requestTimes++;
const { status, running_code_message } = gameStatusResponse.data;
if(!gameStatusResponse.data || !status && status !== 0 ) {
if(requestTimes >= timeOut - 1) { // 最后一次参数改为true
timeOutFlag = true;
}
if (running_code_message) {
this.setEvaluateMiddleStatusText(running_code_message)
}
return;
}
const { status } = gameStatusResponse.data;
if (timeOutFlag === false && (status === 2 || status === 0)) {
// 网络太慢或服务处理较慢的情况下，可能这里会执行第二次

2
public/react/src/modules/page/component/UpdateDrawer.js
Unescape View File

@ -127,7 +127,7 @@ class UpdateDrawer extends Component {
const { path, status } = response.data;
if (status === -1) {
showSnackbar('更新失败，服务端错误')
showSnackbar(response.data.message || '更新失败，服务端错误')
} else if (status === 1) {
if (path) {
updateChallengePath(path);

8
public/react/src/modules/page/main/CodeEvaluateView.js
Unescape View File

@ -307,6 +307,14 @@ class CodeEvaluateView extends Component {
<CircularProgress size={40} thickness={3}
style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '10%', display: gameBuilding ? 'block': 'none' }}/>
<div id="evaluateMiddleStatusText" style={{
marginTop: "4px",
textAlign: "center",
color: "#4CACFF",
display: gameBuilding ? 'block': 'none'
}}
></div>
{/* 正在编译代码。。。 */}
<div id="game_test_set_results" className="-flex -relative blacktab-inner"
style={{ display: gameBuilding ? 'none': 'block' }}>

1
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -284,6 +284,7 @@ a.color-red-dd:hover{color: #C61616!important;}
.winput-120-35{width: 120px;height: 35px;padding: 5px;box-sizing: border-box;}
.winput-120-30{width: 120px;height: 30px;padding: 5px;box-sizing: border-box;}
.winput-115-40{width: 115px;height: 40px;padding: 5px;box-sizing: border-box;}
.winput-100-40{width: 100px;height: 40px;padding: 5px;box-sizing: border-box;}
.winput-90-40{width: 90px;height: 40px;padding: 5px;box-sizing: border-box;}
.winput-90-35{width: 90px;height: 35px;padding: 5px;box-sizing: border-box;}
.winput-240-100{width: 240px;height: 100px;padding: 5px;box-sizing: border-box;}

Write Preview
Loading…
Cancel
Save