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

Merge branch 'develop' into dev_aliyun

Browse Source
dev_tj
daiao 6 years ago
parent 51aa5ea566 1e3ee8b13f
commit 74f44671f5
2 changed files with 84 additions and 57 deletions
Show Stats Download Patch File Download Diff File

104
lib/tasks/statistic_subject_info.rake
Unescape View File

@ -16,15 +16,20 @@ namespace :subjects do
passed_count = (study_count == sr.study_count ? sr.passed_count : data.passed_count) passed_count = (study_count == sr.study_count ? sr.passed_count : data.passed_count)
course_used_count = (study_count == sr.study_count ? sr.course_used_count : data.course_used_count) course_used_count = (study_count == sr.study_count ? sr.course_used_count : data.course_used_count)
school_used_count = (study_count == sr.study_count ? sr.school_used_count : data.school_used_count) school_used_count = (study_count == sr.study_count ? sr.school_used_count : data.school_used_count)
update_params = { unless course_study_count == sr.course_study_count &&
study_count: study_count, passed_count == sr.passed_count &&
course_study_count: course_study_count, course_used_count == sr.course_used_count &&
initiative_study: (study_count - course_study_count), school_used_count == sr.school_used_count
passed_count: passed_count, update_params = {
course_used_count: course_used_count, study_count: study_count,
school_used_count: school_used_count course_study_count: course_study_count,
} initiative_study: (study_count - course_study_count),
sr.update_attributes!(update_params) passed_count: passed_count,
course_used_count: course_used_count,
school_used_count: school_used_count
}
sr.update_attributes!(update_params)
end
end end
puts("---------------------data_statistic_end") puts("---------------------data_statistic_end")
Rails.logger.info("---------------------data_statistic_end") Rails.logger.info("---------------------data_statistic_end")
@ -40,14 +45,20 @@ namespace :subjects do
data = Subjects::CourseUsedInfoService.call(subject) data = Subjects::CourseUsedInfoService.call(subject)
data.each do |key| data.each do |key|
scr = SubjectCourseRecord.find_or_create_by!(school_id: key[:school_id], subject_id: subject.id) scr = SubjectCourseRecord.find_or_create_by!(school_id: key[:school_id], subject_id: subject.id)
update_params = { unless key[:school_name] == scr.school_name &&
school_name: key[:school_name], key[:course_count] == scr.course_count &&
course_count: key[:course_count], key[:student_count] == scr.student_count &&
student_count: key[:student_count], key[:choice_shixun_num] == scr.choice_shixun_num &&
choice_shixun_num: key[:choice_shixun_num], key[:choice_shixun_frequency] == scr.choice_shixun_frequency
choice_shixun_frequency: key[:choice_shixun_frequency] update_params = {
} school_name: key[:school_name],
scr.update_attributes(update_params) course_count: key[:course_count],
student_count: key[:student_count],
choice_shixun_num: key[:choice_shixun_num],
choice_shixun_frequency: key[:choice_shixun_frequency]
}
scr.update_attributes(update_params)
end
end end
end end
puts("---------------------course_info_statistic_end") puts("---------------------course_info_statistic_end")
@ -64,18 +75,26 @@ namespace :subjects do
data = Subjects::ShixunUsedInfoService.call(subject) data = Subjects::ShixunUsedInfoService.call(subject)
data.each do |key| data.each do |key|
ssi = SubjectShixunInfo.find_or_create_by!(shixun_id: key[:shixun_id], subject_id: subject.id) ssi = SubjectShixunInfo.find_or_create_by!(shixun_id: key[:shixun_id], subject_id: subject.id)
update_params = { unless key[:challenge_count] == ssi.challenge_count &&
stage: key[:stage], key[:course_count] == ssi.course_count &&
shixun_name: key[:name], key[:school_count] == ssi.school_count &&
challenge_count: key[:challenge_count], key[:used_count] == ssi.used_count &&
course_count: key[:course_count], key[:passed_count] == ssi.passed_count &&
school_count: key[:school_count], key[:evaluate_count] == ssi.evaluate_count &&
used_count: key[:used_count], key[:passed_ave_time] == ssi.passed_ave_time
passed_count: key[:passed_count], update_params = {
evaluate_count: key[:evaluate_count], stage: key[:stage],
passed_ave_time: key[:passed_ave_time] shixun_name: key[:name],
} challenge_count: key[:challenge_count],
ssi.update_attributes(update_params) course_count: key[:course_count],
school_count: key[:school_count],
used_count: key[:used_count],
passed_count: key[:passed_count],
evaluate_count: key[:evaluate_count],
passed_ave_time: key[:passed_ave_time]
}
ssi.update_attributes(update_params)
end
end end
end end
puts("---------------------shixun_info_statistic_end") puts("---------------------shixun_info_statistic_end")
@ -83,7 +102,7 @@ namespace :subjects do
end end
task user_info_statistic: :environment do task user_info_statistic: :environment do
puts("---------------------user_info_statistic_begin") puts("---------------------vim ./")
Rails.logger.info("---------------------user_info_statistic_begin") Rails.logger.info("---------------------user_info_statistic_begin")
subjects = Subject.where(status: 2) subjects = Subject.where(status: 2)
subjects.find_each(batch_size: 100) do |subject| subjects.find_each(batch_size: 100) do |subject|
@ -91,15 +110,22 @@ namespace :subjects do
data = Subjects::UserUsedInfoService.call(subject) data = Subjects::UserUsedInfoService.call(subject)
data.each do |key| data.each do |key|
sui = SubjectUserInfo.find_or_create_by!(user_id: key[:user_id], subject_id: subject.id) sui = SubjectUserInfo.find_or_create_by!(user_id: key[:user_id], subject_id: subject.id)
update_params = { unless key[:passed_myshixun_count] == sui.passed_myshixun_count &&
username: key[:name], key[:passed_games_count] == sui.passed_games_count &&
passed_myshixun_count: key[:passed_myshixun_count], key[:code_line_count] == sui.code_line_count &&
passed_games_count: key[:passed_games_count], key[:evaluate_count] == sui.evaluate_count &&
code_line_count: key[:code_line_count], key[:cost_time] == sui.cost_time
evaluate_count: key[:evaluate_count], update_params = {
cost_time: key[:cost_time] username: key[:name],
} passed_myshixun_count: key[:passed_myshixun_count],
sui.update_attributes(update_params) passed_games_count: key[:passed_games_count],
code_line_count: key[:code_line_count],
evaluate_count: key[:evaluate_count],
cost_time: key[:cost_time]
}
sui.update_attributes(update_params)
end
end end
end end
puts("---------------------user_info_statistic_end") puts("---------------------user_info_statistic_end")

37
public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
Unescape View File

@ -77,20 +77,20 @@ class Challengesjupyter extends Component {
}else{ }else{
if(boxoffsetHeigh>=300){ if(boxoffsetHeigh>=300){
if(this.props&&this.props.is_jupyter===true&&this.props&&this.props.user.user_identity==="学生"){ // if(this.state.enlarge===false){
this.setState({ // this.setState({
opentitletype:false, // opentitletype:false,
isopentitletype:"greater", // isopentitletype:"greater",
boxoffsetHeigh:boxoffsetHeigh // boxoffsetHeigh:boxoffsetHeigh
}) // })
}else{ // }else{
this.setState({ //
opentitletype:true, // }
isopentitletype:"greater", this.setState({
boxoffsetHeigh:boxoffsetHeigh opentitletype:true,
}) isopentitletype:"greater",
} boxoffsetHeigh:boxoffsetHeigh
})
}else{ }else{
this.setState({ this.setState({
isopentitletype:"Less", isopentitletype:"Less",
@ -284,7 +284,7 @@ class Challengesjupyter extends Component {
.then((result) => { .then((result) => {
if (result.data.status === 0) { if (result.data.status === 0) {
// this.props.showNotification(`应用成功`); // this.props.showNotification(`应用成功`);
console.log("应用成功了"); // console.log("应用成功了");
this.props.showNotification('保存成功!'); this.props.showNotification('保存成功!');
setTimeout(() => { setTimeout(() => {
this.setState({ this.setState({
@ -645,8 +645,8 @@ class Challengesjupyter extends Component {
` `
} }
</style> </style>
{/*this.state.enlarge===false?"":*/}
{this.props&&this.props.is_jupyter===true&&this.props&&this.props.user.user_identity==="学生"?"":this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}> {this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
<a className={"font-14 color-grey-9"}>阅读全文 <i className={"iconfont icon-jiantou9 font-14"}></i></a> <a className={"font-14 color-grey-9"}>阅读全文 <i className={"iconfont icon-jiantou9 font-14"}></i></a>
</Divider>:<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}> </Divider>:<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
<a className={"font-14 color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a> <a className={"font-14 color-grey-9"}>收起全文 <i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-14"}></i></a>
@ -725,10 +725,11 @@ class Challengesjupyter extends Component {
</div> </div>
</div> </div>
:"" : ""
: :
( (
admin===true||business===true||mysidentity===true? admin===true||business===true||mysidentity===true?
<div style={{ <div style={{
height: '63px', height: '63px',
}} className={enlarge?"shixunjianjiecballenges edu-back-white intermediatecenter fangdaone":"shixunjianjiecballenges edu-back-white mt20"}> }} className={enlarge?"shixunjianjiecballenges edu-back-white intermediatecenter fangdaone":"shixunjianjiecballenges edu-back-white mt20"}>

Write Preview
Loading…
Cancel
Save