m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
chromesetting
杨树林 5 years ago
parent 8624aaf95a d5d21a7e7a
commit 76d149ec18
14 changed files with 444 additions and 227 deletions
Show Stats Download Patch File Download Diff File

8
app/controllers/application_controller.rb
Unescape View File

@ -465,9 +465,9 @@ class ApplicationController < ActionController::Base
# 实训主类别列表，自带描述
def shixun_main_type
list = []
mirrors = MirrorRepository.select([:id, :type_name, :description]).published_main_mirror
mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror
mirrors.try(:each) do |mirror|
list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description)}
list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name}
end
list
end
@ -475,9 +475,9 @@ class ApplicationController < ActionController::Base
# 小类别列表
def shixun_small_type
list = []
mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror
mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror
mirrors.try(:each) do |mirror|
list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description}
list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name}
end
list
end

7
app/controllers/shixuns_controller.rb
Unescape View File

@ -400,13 +400,14 @@ class ShixunsController < ApplicationController
@shixun.shixun_info.update_attributes(shixun_info_params)
# 镜像变动
@shixun.shixun_mirror_repositories.where.not(mirror_repository_id: old_mirror_ids).destroy_all
@shixun.shixun_mirror_repositories.create!(new_mirror_id)
@shixun.shixun_mirror_repositories.create!(new_mirror_id) if new_mirror_id.present?
# 镜像变动要更换服务配置
@shixun.shixun_service_configs.where.not(mirror_repository_id: old_mirror_ids).destroy_all
@shixun.shixun_service_configs.create!(service_create_params)
@shixun.shixun_service_configs.create!(service_create_params) if service_create_params.present?
service_update_params&.map do |service|
smr = @shixun.shixun_service_configs.find_by(mirror_repository_id: service[:mirror_repository_id])
smr.update_attributes(service)
logger.info("########smr: #{smr}")
smr.update_attributes(service) if smr.present?
end
# 添加第二仓库（管理员权限）
if params[:is_secret_repository]

9
app/controllers/weapps/courses_controller.rb
Unescape View File

@ -167,6 +167,15 @@ class Weapps::CoursesController < Weapps::BaseController
normal_status(0, "修改成功")
end
# 分班列表
def course_groups
@course_groups = @course.course_groups
@course_groups = @course_groups.where("name like ?", "%#{params[:search]}%") unless params[:search].blank?
@all_group_count = @course_groups.size
@teachers = @course.teachers.includes(:user, :teacher_course_groups) if @user_course_identity < Course::NORMAL
@current_group_id = @course.students.where(user_id: current_user.id).take&.course_group_id if @user_course_identity == Course::STUDENT
end
private
def course_params

8
app/views/admins/myshixuns/shared/_list.html.erb
Unescape View File

@ -21,10 +21,18 @@
<td><%= myshixun.id %></td>
<td><%= myshixun.identifier %></td>
<td class="text-left">
<% if myshixun.shixun.is_jupyter? %>
<%= link_to "/tasks/#{myshixun.identifier}/jupyter", target: '_blank' do %>
<%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
<% end %>
<% else %>
<% current_task = myshixun.last_executable_task || myshixun.last_task %>
<% if current_task %>
<%= link_to "/tasks/#{current_task.identifier}", target: '_blank' do %>
<%= overflow_hidden_span myshixun.shixun.name, width: 280 %>
<% end %>
<% end %>
<% end %>
</td>
<td><%= myshixun.shixun.user.real_name %></td>
<td><%= finish_game_count.fetch(myshixun.id, 0) %>/<%= myshixun.shixun.challenges_count %></td>

1
app/views/homework_commons/index.json.jbuilder
Unescape View File

@ -38,6 +38,7 @@ json.homeworks @homework_commons.each do |homework|
current_myshixun = homework.user_work(@user.id).try(:myshixun)
myshixun = current_myshixun ? current_myshixun : shixun.myshixuns.find_by(user_id: @user.id)
# json.game_count current_myshixun ? current_myshixun.exec_count : 0
json.shixun_status shixun.try(:status).to_i
json.task_operation task_operation_url(myshixun, shixun)
else
work = homework.user_work(@user.id)

6
app/views/weapps/courses/course_groups.json.jbuilder
Unescape View File

@ -0,0 +1,6 @@
json.course_groups @course_groups.each do |group|
json.(group, :id, :course_members_count, :name)
end
json.none_group_member_count @course.none_group_count
json.group_count @all_group_count

5
db/migrate/20191216071931_modify_task_pass_for_shixuns.rb
Unescape View File

@ -0,0 +1,5 @@
class ModifyTaskPassForShixuns < ActiveRecord::Migration[5.2]
def change
change_column :shixuns, :task_pass, :boolean, :default => true
end
end

1
public/react/src/AppConfig.js
Unescape View File

@ -52,6 +52,7 @@ export function initAxiosInterceptors(props) {
//proxy="http://47.96.87.25:48080"
proxy="https://pre-newweb.educoder.net"
proxy="https://test-newweb.educoder.net"
//proxy="https://test-jupyterweb.educoder.net"
//proxy="http://192.168.2.63:3001"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

58
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -893,7 +893,6 @@ class PollNew extends Component {
//保存并继续
//保存并继续，即提交本题的新建并继续创建一个相同的题（该新题处于编辑模式，题目和选项不要清空）
Deleteadddomtwo = (indexo, object,bool) => {
debugger
var thiss = this;
@ -1038,7 +1037,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
this.props.showNotification(`可选的最大限制不能小于最小限制`);
return;
}
}
@ -1258,7 +1257,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
this.props.showNotification(`可选的最大限制不能小于最小限制`);
return;
}
}
@ -1449,9 +1448,7 @@ class PollNew extends Component {
// indexo 第几个数组
//object 单个数组数据
Deleteadddomthree = (indexo, object,bool) => {
this.setState({
newoption: false,
})
// console.log("deleteadddom 349")
var thiss = this;
let arr = this.state.adddom;
@ -1477,9 +1474,14 @@ class PollNew extends Component {
}
if (newarr[indexo].question.question_title === "") {
this.props.showNotification('题目不能为空！');
return
}
if (newarr[indexo].question.question_title.match(/^[ ]*$/)) {
this.props.showNotification('题目不能为空！');
return
}
if (max > 0) {
if (object.question.question_type === 1) {
this.props.showNotification('选项内容不能为空！');
@ -1579,7 +1581,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
this.props.showNotification(`可选的最大限制不能小于最小限制`);
return;
}
}
@ -1790,7 +1792,7 @@ class PollNew extends Component {
if(object.question.max_choices){
if(object.question.max_choices>0){
if (object.question.max_choices < object.question.min_choices) {
this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`);
this.props.showNotification(`可选的最大限制不能小于最小限制`);
return;
}
}
@ -1867,7 +1869,6 @@ class PollNew extends Component {
};
question = {"question": questiontwo};
//插入多选题
if (uuk !== -1) {
// console.log("修改")
this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices,object.question.answers.length);
@ -2016,10 +2017,11 @@ class PollNew extends Component {
if (result !== undefined) {
if (result.data.status === 0) {
this.props.showNotification(`已完成`);
thiss.thisinitializationdatanew();
this.setState({
Newdisplay:false,
newoption: false,
})
// console.log("确认创建问题")
// console.log(result)
@ -2032,11 +2034,24 @@ class PollNew extends Component {
//
// }
}
}else{
this.setState({
Newdisplay:true,
newoption: false,
})
}
// } catch (e) {
//
// }
}).catch((error) => {
console.log(error)
this.setState({
Newdisplay:true,
newoption: false,
})
})
@ -2096,11 +2111,24 @@ class PollNew extends Component {
if (result.data.status === 0) {
this.props.showNotification(`编辑题目成功`);
thiss.thisinitializationdatanew();
this.setState({
Newdisplay:false,
newoption: false,
})
}
} catch (e) {
// console.log("调用了edittotheserver")
console.log(e)
this.setState({
Newdisplay:true,
newoption: false,
})
}
}).catch((error) => {
console.log(error)
this.setState({
Newdisplay:true,
newoption: false,
})
})
}
@ -2685,7 +2713,8 @@ class PollNew extends Component {
// console.log("2301");
// console.log(newr);
// window.history.pushState('','',newUrl+'?tab='+e);
window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`;
// window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`;
})
} else {
@ -2773,6 +2802,7 @@ class PollNew extends Component {
height: '30px',
lineHeight: '30px',
};
const hejiine=this.state.mysingles + this.state.mydoubles + this.state.mymainsint;
// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
var displaymysave = (mysave === true) ? "" : "display:none;";
@ -2942,7 +2972,7 @@ class PollNew extends Component {
{
this.state.mysingles + this.state.mydoubles + this.state.mymainsint === 0 ? "" :
hejiine=== 0 ? "" :
<div>
<span className="fl">
{this.state.mysingles === 0 ? "" : <span
@ -2959,7 +2989,7 @@ class PollNew extends Component {
</span>
<span className="fr">合计 <span
className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : this.state.mysingles + this.state.mydoubles + this.state.mymainsint}</span> 题</span>
className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : hejiine}</span> 题</span>
</div>
}

362
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -46,6 +46,7 @@ const {Option} = Select;
//作品列表(学生)
let allow_lates=false;
let answer_open_evaluation=false;
// Curcomlevel
class Listofworksstudentone extends Component {
//unifiedsetting 统一设置
//allowreplenishment 允许补交
@ -60,6 +61,9 @@ class Listofworksstudentone extends Component {
//要提交的分班状态checkedValuesineinfo
//searchtext 输入的姓名和学号
//order 排序时间
//当前成绩work_score
//关卡得分final_score
this.state = {
jobsettingsdata: undefined,
endTime: "2018/11/10 17:10:00",
@ -269,7 +273,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '提交状态',
title: '作品状态',
dataIndex: 'submitstate',
key: 'submitstate',
align: "center",
@ -277,11 +281,13 @@ class Listofworksstudentone extends Component {
width: '98px',
render: (text, record) => (
<span style={{width: '98px',}}>
<span style={record.submitstate === "延时完成" ? {
<span style={record.submitstate === "迟交通关" ? {
color: '#DD1717',
textAlign: "center",
width: '98px',
} : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center", width: '98px',} : {
} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center", width: '98px',}
: record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px',}
: {
color: '#747A7F',
textAlign: "center",
width: '98px',
@ -340,7 +346,26 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '完成情况',
title: '当前完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{
width: '99px',
}}>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.Curcomlevel + "/" + this.state.challenges_count}</span>
</span>
),
},
{
title: '截止前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: "center",
@ -359,9 +384,12 @@ class Listofworksstudentone extends Component {
),
},
{
title: '关卡得分',
dataIndex: 'levelscore',
key: 'levelscore',
title:<span>关卡得分<Tooltip placement="top" title={<pre>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
width: '99px',
@ -369,19 +397,19 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
color: '#747A7F',
textAlign: "center",
width: '99px',
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -435,26 +463,26 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{width: '99px',}}>
{
record.levelscore && record.levelscore === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
record.work_score && record.work_score === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
:
<span style={parseInt(record.levelscore) >= 90 ? {
<span style={parseInt(record.work_score) >= 90 ? {
color: '#DD1717',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) <= 60 ? {
} : parseInt(record.work_score) <= 60 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
}
</span>
@ -638,7 +666,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '提交状态',
title: '作品状态',
dataIndex: 'submitstate',
key: 'submitstate',
align: "center",
@ -646,11 +674,13 @@ class Listofworksstudentone extends Component {
width: '98px',
render: (text, record) => (
<span style={{width: '98px',}}>
<span style={record.submitstate === "延时完成" ? {
<span style={record.submitstate === "迟交通关" ? {
color: '#DD1717',
textAlign: "center",
width: '98px',
} : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center", width: '98px',} : {
} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center", width: '98px',}
: record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px',}
: {
color: '#747A7F',
textAlign: "center",
width: '98px',
@ -709,7 +739,26 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '完成情况',
title: '当前完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{
width: '99px',
}}>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.Curcomlevel + "/" + this.state.challenges_count}</span>
</span>
),
},
{
title: '截止前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: "center",
@ -728,9 +777,12 @@ class Listofworksstudentone extends Component {
),
},
{
title: '关卡得分',
dataIndex: 'levelscore',
key: 'levelscore',
title:<span>关卡得分<Tooltip placement="top" title={<pre>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
width: '99px',
@ -738,19 +790,19 @@ class Listofworksstudentone extends Component {
<span style={{
width: '99px',
}}>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : {
color: '#747A7F',
textAlign: "center",
width: '99px',
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -804,26 +856,26 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'levelscore',
key: 'levelscore',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{width: '99px',}}>
{
record.levelscore && record.levelscore === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
record.work_score && record.work_score === "--" ?
<span style={{color: '#9A9A9A', textAlign: "center", width: '99px',}}>{record.work_score}</span>
:
<span style={parseInt(record.levelscore) >= 90 ? {
<span style={parseInt(record.work_score) >= 90 ? {
color: '#DD1717',
textAlign: "center",
width: '99px',
} : parseInt(record.levelscore) <= 60 ? {
} : parseInt(record.work_score) <= 60 ? {
color: '#FF6800',
textAlign: "center",
width: '99px',
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore}</span>
} : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score}</span>
}
</span>
@ -967,16 +1019,18 @@ class Listofworksstudentone extends Component {
)
},
{
title: '提交状态',
title: '作品状态',
dataIndex: 'submitstate',
key: 'submitstate',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span style={record.submitstate === "延时完成" ? {
<span style={record.submitstate === "迟交通关" ? {
color: '#DD1717',
textAlign: "center"
} : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center"} : {
} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"}
: record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px'}
: {
color: '#747A7F',
textAlign: "center"
}}>{record.submitstate}
@ -1036,7 +1090,26 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '完成情况',
title: '当前完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{
width: '99px',
}}>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.Curcomlevel + "/" + this.state.challenges_count}</span>
</span>
),
},
{
title: '截止前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: 'center',
@ -1051,23 +1124,26 @@ class Listofworksstudentone extends Component {
)
},
{
title: '关卡得分',
dataIndex: 'levelscore',
key: 'levelscore',
title:<span>关卡得分<Tooltip placement="top" title={<pre>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -1125,8 +1201,8 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
className: 'font-14',
sorter: true,
@ -1138,35 +1214,35 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.final_score}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
@ -1176,27 +1252,27 @@ class Listofworksstudentone extends Component {
{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
"text-align": "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
"text-align": "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : {
color: '#747A7F',
"text-align": "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
@ -1315,16 +1391,18 @@ class Listofworksstudentone extends Component {
)
},
{
title: '提交状态',
title: '作品状态',
dataIndex: 'submitstate',
key: 'submitstate',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span style={record.submitstate === "延时完成" ? {
<span style={record.submitstate === "迟交通关" ? {
color: '#DD1717',
textAlign: "center"
} : record.submitstate === "按时完成" ? {color: '#29BD8B', textAlign: "center"} : {
} : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"}
: record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px'}
: {
color: '#747A7F',
textAlign: "center"
}}>{record.submitstate}
@ -1373,7 +1451,26 @@ class Listofworksstudentone extends Component {
)
},
{
title: '完成情况',
title: '当前完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
className: 'font-14',
width: '99px',
render: (text, record) => (
<span style={{
width: '99px',
}}>
<span style={{
color: '#07111B',
textAlign: "center",
width: '99px'
}}>{record.Curcomlevel + "/" + this.state.challenges_count}</span>
</span>
),
},
{
title: '截止前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: 'center',
@ -1388,23 +1485,26 @@ class Listofworksstudentone extends Component {
)
},
{
title: '关卡得分',
dataIndex: 'levelscore',
key: 'levelscore',
title:<span>关卡得分<Tooltip placement="top" title={<pre>
计算规则:<br/>
截止前学员完成的关卡才有成绩<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'final_score',
key: 'final_score',
align: 'center',
className: 'font-14',
render: (text, record) => (
<span>
<span style={parseInt(record.levelscore) <= 60 ? {
<span style={parseInt(record.final_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.levelscore) < 90 ? {
} : parseInt(record.final_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.levelscore}</span>
}}>{record.final_score}</span>
</span>
)
},
@ -1462,8 +1562,8 @@ class Listofworksstudentone extends Component {
},
{
title: '当前成绩',
dataIndex: 'finalscore',
key: 'finalscore',
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
className: 'font-14',
sorter: true,
@ -1475,35 +1575,35 @@ class Listofworksstudentone extends Component {
record.ultimate_score === true ?
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.finalscore === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终调整成绩：0分</span> :
<span>最终调整成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
:
<Tooltip placement="bottom" title={<div>
{/*<div>{record.user_name}{record.user_login}</div>*/}
<div>{record.levelscore === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.levelscore}分</span>}</div>
<div>{record.final_score === "--" ? <span>关卡得分：0分</span> :
<span>关卡得分：{record.final_score}分</span>}</div>
<div>{record.efficiencyscore === "--" ? <span>效率评分：0分</span> :
<span>效率评分：{record.efficiencyscore}分</span>}</div>
@ -1513,27 +1613,27 @@ class Listofworksstudentone extends Component {
{answer_open_evaluation===true?"":<div>查看参考答案：{record.view_answer_count}关</div>}
<div>{record.finalscore === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.finalscore}分</span>}</div>
<div>{record.work_score === "--" ? <span>最终成绩：0分</span> :
<span>最终成绩：{record.work_score}分</span>}</div>
</div>}>
{
record.finalscore && record.finalscore === "--" ?
record.work_score && record.work_score === "--" ?
<span style=
{{
color: '#9A9A9A',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
:
<span style={parseInt(record.finalscore) <= 60 ? {
<span style={parseInt(record.work_score) <= 60 ? {
color: '#747A7F',
textAlign: "center"
} : parseInt(record.finalscore) < 90 ? {
} : parseInt(record.work_score) < 90 ? {
color: '#FF6800',
textAlign: "center"
} : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
} : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
color: '#747A7F',
textAlign: "center"
}}>{record.finalscore}</span>
}}>{record.work_score}</span>
}
</Tooltip>
@ -1977,7 +2077,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time,
submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交",
submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -1985,12 +2085,14 @@ class Listofworksstudentone extends Component {
levelscore: teacherdata.final_score,
view_answer_count: teacherdata.view_answer_count,
efficiencyscore: teacherdata.eff_score,
finalscore: teacherdata.work_score,
final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
work_score: teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
operating: "查看",
late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
ultimate_score: teacherdata.ultimate_score,
user_name: teacherdata.user_name,
user_login: teacherdata.user_login,
Curcomlevel: teacherdata.current_complete_count===undefined||teacherdata.current_complete_count===null||teacherdata.current_complete_count===""?0:teacherdata.current_complete_count,
})
// }
@ -2019,20 +2121,22 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time,
submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" : student_works[i].work_status === 2 ? "延时完成" : "未提交",
submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count,
levelscore: student_works[i].final_score,
final_score: student_works[i].final_score=== null ||student_works[i].final_score=== undefined||student_works[i].final_score=== ""?"--":student_works[i].final_score,
work_score: student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score,
efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score,
finalscore: student_works[i].work_score,
view_answer_count: student_works[i].view_answer_count,
operating: "查看",
late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,
ultimate_score: student_works[i].ultimate_score,
user_name: student_works[i].user_name,
user_login: student_works[i].user_login,
Curcomlevel:student_works[i].current_complete_count===null||student_works[i].current_complete_count===null||student_works[i].current_complete_count===""?0:student_works[i].current_complete_count,
})
}
@ -2178,7 +2282,7 @@ class Listofworksstudentone extends Component {
stduynumber: teacherdata.student_id,
classroom: teacherdata.group_name,
cost_time: teacherdata.cost_time,
submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交",
submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
@ -2186,12 +2290,15 @@ class Listofworksstudentone extends Component {
levelscore: teacherdata.final_score,
efficiencyscore: teacherdata.eff_score,
view_answer_count: teacherdata.view_answer_count,
finalscore: teacherdata.work_score,
final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score,
work_score:teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score,
operating: "查看",
late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty,
ultimate_score: teacherdata.ultimate_score,
user_name: teacherdata.user_name,
user_login: teacherdata.user_login,
Curcomlevel: teacherdata.current_complete_count===null|| teacherdata.current_complete_count===undefined|| teacherdata.current_complete_count===""?0: teacherdata.current_complete_count,
})
// }
@ -2537,20 +2644,22 @@ class Listofworksstudentone extends Component {
stduynumber: student_works[i].student_id,
classroom: student_works[i].group_name,
cost_time: student_works[i].cost_time,
submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" : student_works[i].work_status === 2 ? "延时完成" : "未提交",
submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关",
// updatetime:this.state.teacherdata.student_works[i].update_time,
// updatetime:"",
updatetime: timedata === "Invalid date" ? "--" : timedata,
completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count,
levelscore: student_works[i].final_score,
efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score,
finalscore: student_works[i].work_score,
final_score: student_works[i].final_score===null||student_works[i].final_score===undefined||student_works[i].final_score===""?"--":student_works[i].final_score,
work_score:student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score,
view_answer_count: student_works[i].view_answer_count,
operating: "查看",
late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,
ultimate_score: student_works[i].ultimate_score,
user_name: student_works[i].user_name,
user_login: student_works[i].user_login,
Curcomlevel: student_works[i].current_complete_count===undefined||student_works[i].current_complete_count===null||student_works[i].current_complete_count===""?0:student_works[i].current_complete_count,
})
}
@ -3356,13 +3465,42 @@ class Listofworksstudentone extends Component {
}
render() {
let {columns, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state;
let {columns,columnss, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state;
const antIcon = <Icon type="loading" style={{fontSize: 24}} spin/>;
let course_is_end = this.props.current_user && this.props.current_user.course_is_end;
// console.log("Listofworksstudentone.js");
// console.log(orders);
let homewrok=false;
if(homework_status && homework_status.length > 0){
for(var i=0;i<homework_status.length;i++){
if(homework_status[i]==="已截止"){
homewrok=true;
}
}
if(homewrok===false){
for(var i=0;i<columnsstu.length;i++){
if (columnsstu[i].title === "当前完成关卡"){//item.id==122
columnsstu.splice(i,1)
}
}
for(var i=0;i<columnsstu2.length;i++){
if (columnsstu2[i].title === "当前完成关卡"){//item.id==122
columnsstu2.splice(i,1)
}
}
for(var i=0;i<columns.length;i++){
if (columns[i].title === "当前完成关卡"){//item.id==122
columns.splice(i,1)
}
}
for(var i=0;i<columnss.length;i++){
if (columnss[i].title === "当前完成关卡"){//item.id==122
columnss.splice(i,1)
}
}
}
}
return (
this.props.isAdmin() === true ?
@ -3675,7 +3813,7 @@ class Listofworksstudentone extends Component {
height: 58px;
}
.ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
padding: 0px;
}
`}</style>
<div className="edu-table edu-back-white ant-tables ysltableo table1">
@ -3901,7 +4039,7 @@ class Listofworksstudentone extends Component {
height: 58px;
}
.ysltableow .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
padding: 0px;
}
`}</style>
<div className="edu-table edu-back-white ysltableow table2">
@ -4005,7 +4143,7 @@ class Listofworksstudentone extends Component {
height: 58px;
}
.ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
padding: 0px;
}
`
}
@ -4134,7 +4272,7 @@ class Listofworksstudentone extends Component {
height: 58px;
}
.ysltableowss .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
padding: 0px;
}
`}</style>
<div className="edu-table edu-back-white ysltableowss table4">

8
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -232,9 +232,11 @@ class ShixunHomeworkPage extends Component {
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/>
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
{teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:""}
target={"_blank"}>实训详情</a>: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:"":"":""}
</div>
@ -336,7 +338,7 @@ class ShixunHomeworkPage extends Component {
<a className="fr color-blue font-16"
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
}
{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1?<Startshixuntask
{teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1&&teacherdatapage&&teacherdatapage.time_status<5?<Startshixuntask
{...this.props}
data={teacherdatapage}
/>:""}

3
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -371,6 +371,7 @@ class ShixunhomeWorkItem extends Component{
{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
discussMessage.time_status<5?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt10">
{startbtn===false?
(discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ?
@ -381,7 +382,7 @@ class ShixunhomeWorkItem extends Component{
<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
{discussMessage.task_operation[0]}
</a>):<a className="btn colorblue" >开启中</a>}
</WordsBtn>:"":"":""
</WordsBtn>:"":"":"":""
}
</h6>

2
public/react/src/modules/courses/shixunHomework/shixunHomework.js
Unescape View File

@ -1208,7 +1208,7 @@ class ShixunHomework extends Component{
{this.props.isAdmin()?<Menu.Item key="0">未发布</Menu.Item>:""}
<Menu.Item key="1">提交中</Menu.Item>
<Menu.Item key="2">补交中</Menu.Item>
<Menu.Item key="5">评阅中</Menu.Item>
<Menu.Item key="5">已截止</Menu.Item>
</Menu>
</div>
<div className="fr mt16 mb16 searchView">

21
public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
Unescape View File

@ -418,12 +418,21 @@ class Shixuninformation extends Component {
selectscripts:response.data[0].id
})
this.get_mirror_script(response.data[0].id)
if(e.props.mirror_name===null){
this.setState({
choice_main_type: value,
standard_scripts: response.data,
})
}else{
this.setState({
choice_main_type: value,
standard_scripts: response.data,
shixun_service_configs: newshixun_service_configsagin,
shixun_service_configlist: newshixun_service_configsagin,
})
}
}
}).catch((error) => {
@ -476,6 +485,7 @@ class Shixuninformation extends Component {
})
}
littleClass = (value,e) => {
let newshixun_service_configs = this.state.shixun_service_configs;
let newchoice_small_type = this.state.choice_small_type;
let list = []
@ -510,13 +520,18 @@ class Shixuninformation extends Component {
)
newchoice_small_type.push(value)
if(e.props.mirror_name===null){
this.setState({
choice_small_type: newchoice_small_type,
})
}else{
this.setState({
choice_small_type: newchoice_small_type,
shixun_service_configs: newshixun_service_configsagin,
shixun_service_configlist: newshixun_service_configsagin,
})
}
}
SelectScput = (value, e) => {
this.setState({
@ -845,7 +860,7 @@ class Shixuninformation extends Component {
let itemtype=item.type_name.toLowerCase().indexOf('jupyter'.toLowerCase())
if(itemtype>-1) {
return (
<Option value={item.id} key={key} name={item.description}>
<Option value={item.id} key={key} name={item.description} mirror_name={item.mirror_name}>
<Tooltip placement="right" title={item.description === "" ? "无描述" : item.description}>
{item.type_name}
</Tooltip>
@ -899,7 +914,7 @@ class Shixuninformation extends Component {
{
this.props.data === undefined ? "" : this.props.data.shixun&&this.props.data.shixun.small_type.map((item, key) => {
return (
<Option value={item.id} key={key} name={item.description}>
<Option value={item.id} key={key} name={item.description} mirror_name={item.mirror_name}>
<Tooltip placement="right" title={item.description === "" ? "无描述" : item.description}>
{item.type_name}
</Tooltip>

Write Preview
Loading…
Cancel
Save