Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

dev_local
jingquan huang 6 years ago
commit ef0ffc1295

@ -508,7 +508,7 @@ class StudentWorkController < ApplicationController
end end
@tab = params[:tab].nil? ? 1 : params[:tab].to_i @tab = params[:tab].nil? ? 1 : params[:tab].to_i
if User.current.member_of_course?(@homework.course) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil? if (User.current.member_of_course?(@homework.course) || User.current.admin?) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil?
if !@course.is_end && @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late)) if !@course.is_end && @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late))
update_shixun_work_status @homework update_shixun_work_status @homework
end end

@ -4340,7 +4340,7 @@ module ApplicationHelper
candown = (attachment.is_public == 1 || attachment.is_public == true) candown = (attachment.is_public == 1 || attachment.is_public == true)
end end
else else
if attachment.container_type == "MarkDown" || attachment.container_type == "Shixun" || attachment.container_type == "Memo" || attachment.container_type == "Career" || attachment.container_type == "Exercise" || attachment.container_type == "ExerciseBank" if attachment.container_type == "MarkDown" || attachment.container_type.nil? || attachment.container_type == 'Subject' || attachment.container_type == "Shixun" || attachment.container_type == "Memo" || attachment.container_type == "Career" || attachment.container_type == "Exercise" || attachment.container_type == "ExerciseBank"
candown = true candown = true
end end
end end

@ -78,7 +78,7 @@
placeholder: "请在此输入实训课程的简介", placeholder: "请在此输入实训课程的简介",
imageUpload : true, imageUpload : true,
imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => @subject.class) %>" //url imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => 'MarkDown') %>" //url
}); });
md_elocalStorage(shixun_editormd, "subject_desc_<%= User.current.id %>", "desc"); md_elocalStorage(shixun_editormd, "subject_desc_<%= User.current.id %>", "desc");
/* --------------------------------- 学习须知 -------------------------------------- */ /* --------------------------------- 学习须知 -------------------------------------- */
@ -106,7 +106,7 @@
placeholder: "请在此输入实训课程的学习须知", placeholder: "请在此输入实训课程的学习须知",
imageUpload : true, imageUpload : true,
imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"], imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => @subject.class) %>" //url imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => 'MarkDown') %>" //url
}); });
md_elocalStorage(shixun_propaedeutics, "subject_notes_<%= User.current.id %>", "notes"); md_elocalStorage(shixun_propaedeutics, "subject_notes_<%= User.current.id %>", "notes");

@ -25,49 +25,52 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
begin begin
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
if shixun.present? && user.present? if shixun.present? && user.present?
# 创建新的myshixun和games myshixun = Myshixun.where(:user_id => user.id, :shixun_id => shixun.id).first
# fork版本库如果用户没有同步则先同步用户 if myshixun.blank?
g = Gitlab.client # 创建新的myshixun和games
if user.gid.nil? # fork版本库如果用户没有同步则先同步用户
s = Trustie::Gitlab::Sync.new g = Gitlab.client
s.sync_user(user) if user.gid.nil?
end s = Trustie::Gitlab::Sync.new
gshixun = g.fork(shixun.gpid, user.gid) s.sync_user(user)
shixun_tomcat = Redmine::Configuration['shixun_tomcat'] end
gshixun = g.fork(shixun.gpid, user.gid)
shixun_tomcat = Redmine::Configuration['shixun_tomcat']
code = down_generate_identifier("myshixun") code = down_generate_identifier("myshixun")
# 一般通过默认分支是否存在来判断一个项目是否fork成功 # 一般通过默认分支是否存在来判断一个项目是否fork成功
if gshixun.try(:id).present? if gshixun.try(:id).present?
commit_id = g.commits(shixun.gpid).first.try(:id) commit_id = g.commits(shixun.gpid).first.try(:id)
# educoder 加入到myshixun中 # educoder 加入到myshixun中
myshixun_admin_gid = User.where(:login => "educoder").first.try(:gid) myshixun_admin_gid = User.where(:login => "educoder").first.try(:gid)
g.add_team_member(gshixun.id, myshixun_admin_gid, 40) # 40代表角色master g.add_team_member(gshixun.id, myshixun_admin_gid, 40) # 40代表角色master
myshixun = Myshixun.create!(:shixun_id => shixun.id, :user_id => user.id, :identifier => code, myshixun = Myshixun.create!(:shixun_id => shixun.id, :user_id => user.id, :identifier => code,
:modify_time => shixun.modify_time, :reset_time => shixun.reset_time, :modify_time => shixun.modify_time, :reset_time => shixun.reset_time,
:onclick_time => Time.now, :gpid => gshixun.id, :onclick_time => Time.now, :gpid => gshixun.id,
:git_url => gshixun.try(:path_with_namespace), :commit_id => commit_id) :git_url => gshixun.try(:path_with_namespace), :commit_id => commit_id)
url = "#{Redmine::Configuration['gitlab_address_ip']}/#{g.project(shixun.try(:gpid)).try(:path_with_namespace)}.git" url = "#{Redmine::Configuration['gitlab_address_ip']}/#{g.project(shixun.try(:gpid)).try(:path_with_namespace)}.git"
rep_url = Base64.urlsafe_encode64(url) # 注意educoder为默认给实训创建版本库的用户如果换成别的用户名字要相应的修改 rep_url = Base64.urlsafe_encode64(url) # 注意educoder为默认给实训创建版本库的用户如果换成别的用户名字要相应的修改
uri = "#{shixun_tomcat}/bridge/game/openGameInstance" uri = "#{shixun_tomcat}/bridge/game/openGameInstance"
params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)} params = {tpiID: "#{myshixun.id}", tpmGitURL:rep_url, tpiRepoName: gshixun.try(:name)}
logger.info("openGameInstance params is #{params}") logger.info("openGameInstance params is #{params}")
uri = URI.parse(URI.encode(uri.strip)) uri = URI.parse(URI.encode(uri.strip))
res = Net::HTTP.post_form(uri, params).body res = Net::HTTP.post_form(uri, params).body
res = JSON.parse(res) res = JSON.parse(res)
if (res && res['code'].to_i != 0) if (res && res['code'].to_i != 0)
raise("实训云平台繁忙繁忙等级83") raise("实训云平台繁忙繁忙等级83")
end end
# 其它创建关卡等操作 # 其它创建关卡等操作
challenges = shixun.challenges challenges = shixun.challenges
# 之所以增加user_id是为了方便统计查询性能 # 之所以增加user_id是为了方便统计查询性能
challenges.each_with_index do |challenge, index| challenges.each_with_index do |challenge, index|
status = (index == 0 ? 0 : 3) status = (index == 0 ? 0 : 3)
code = down_generate_identifier("game") code = down_generate_identifier("game")
Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id, Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
:open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time) :open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time)
end
end end
work_score = work.final_score work_score = work.final_score
work.homework_common.homework_challenge_settings.each do |setting| work.homework_common.homework_challenge_settings.each do |setting|
@ -78,6 +81,8 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
end end
end end
work.update_column("myshixun_id", myshixun.id) work.update_column("myshixun_id", myshixun.id)
else
work.update_attributes(:myshixun_id => 0, :work_status => 0)
end end
end end
end end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 293 KiB

Loading…
Cancel
Save