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

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

Browse Source
dev_forum
hjm 5 years ago
parent 1320b05bfb 3ca4437ad6
commit 07fed8980c
9 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File

8
app/controllers/homework_commons_controller.rb
Unescape View File

@ -246,13 +246,15 @@ class HomeworkCommonsController < ApplicationController
student_works = @homework.student_works.where(user_id: user_ids)
end
myshixuns = Myshixun.where(shixun_id: @homework.homework_commons_shixun&.shixun_id, user_id: user_ids).
includes(:games).where(games: {challenge_id: @homework.homework_challenge_settings.pluck(:challenge_id)})
student_works = student_works.includes(:challenge_work_scores)
challenge_settings = @homework.homework_challenge_settings
challenge_setting_ids = challenge_settings.pluck(:challenge_id)
myshixuns = Myshixun.where(shixun_id: @homework.homework_commons_shixun&.shixun_id, user_id: user_ids).includes(:games)
myshixuns.find_each(batch_size: 100) do |myshixun|
work = student_works.select{|work| work.user_id == myshixun.user_id}.first
if work && myshixun
games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
games = myshixun.games.select{|game| challenge_setting_ids.include?(game.challenge_id)}
HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
end
end

23
app/services/homeworks_service.rb
Unescape View File

@ -286,7 +286,7 @@ class HomeworksService
challenge_setting = challenge_settings.select{|setting| setting.challenge_id == game.challenge_id}.first
pass_consume_time += (game.cost_time / 60.0).to_f
user_total_score += game.final_score.to_i < 0 ? 0 : game.challenge.score.to_i
adjust_score = work.challenge_work_scores.where(:challenge_id => game.challenge_id).last
adjust_score = work.challenge_work_scores.select{|work_score| work_score.challenge_id == game.challenge_id}.last
final_score += if adjust_score.present?
adjust_score.score
elsif homework.homework_detail_manual.answer_open_evaluation
@ -300,6 +300,17 @@ class HomeworksService
end
myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil
if work.work_status == 0
is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now))
work.work_status = 1
elsif homework.allow_late && myshixun.created_at < homework.late_time
work.work_status = 2
end
end
if work.work_status != 0
if myshixun_endtime.present?
work.cost_time = myshixun_endtime.to_i - setting_time.publish_time.to_i
@ -314,18 +325,9 @@ class HomeworksService
end
end
if work.work_status == 0
is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now))
work.work_status = 1
elsif homework.allow_late && myshixun.created_at < homework.late_time
work.work_status = 2
end
work.late_penalty = work.work_status == 2 ? homework.late_penalty : 0
work.commit_time = myshixun.created_at > setting_time.publish_time ? setting_time.publish_time : myshixun.created_at
work.myshixun_id = myshixun.id
end
work.update_time = myshixun.updated_at
work.final_score = final_score
@ -336,3 +338,4 @@ class HomeworksService
work.save!
end
end
end

BIN
dump.rdb
View File

Binary file not shown.

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

@ -10,6 +10,7 @@ broadcastChannelOnmessage('refreshPage', () => {
})
function locationurl(list){
debugger
if (window.location.port === "3007") {
} else {
@ -141,10 +142,7 @@ export function initAxiosInterceptors(props) {
// if(response.data.status === 401){
// console.log("401401401")
// }
if (response.data.status === 403) {
// props.history.replace('/403')
// 这里会分2个情况，1、刚进入页面发请求返回的403；2、进入页面后，其他用户操作触发请求返回的403；
// TODO 这里做一个403弹框比较好？
if (response.data.status === 403||response.data.status === "403") {
locationurl('/403');
}

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

@ -997,10 +997,10 @@ class Listofworksstudentone extends Component {
if(result === undefined){
return
}
if(result.data.message!==undefined){
return;
}
// if(result.data.message!==undefined){
//
// return;
// }
this.setState({
teacherdata: result.data,
@ -1059,9 +1059,6 @@ class Listofworksstudentone extends Component {
}
axios.post(urll, data).then((result) => {
if (result) {
if(result.data.message!==undefined){
return;
}
// console.log("学生未截至未公开的作品列表")
// console.log(JSON.stringify(result))
this.setState({
@ -1491,11 +1488,14 @@ class Listofworksstudentone extends Component {
let url = "/homework_commons/"+homeworkid+"/update_student_score.json?shixun_id="+teacherdata.shixun_id;
axios.get(url).then((response) => {
if(response){
if(response.data.status===0) {
this.props.showNotification(`${response.data.message}`);
// var homeworkid = this.props.match.params.homeworkid;
this.Getalistofworks(homeworkid);
this.props.history.replace( matchurl );
// this.props.history.replace(matchurl);
}
}
// this.Getalistofworkstwo("", "", "", "", 1, 20);
}).catch((error) => {
console.log(error)
@ -2160,15 +2160,17 @@ class Listofworksstudentone extends Component {
axios.get(url).then((response) => {
if(response){
if(response.data.message!==undefined){
return;
}
if(response.data.status===0){
// if(response.data.message!==undefined){
// return;
// }
this.setState({
loadingstate: true
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Getalistofworks(homeworkid);
this.props.showNotification(`${response.data.message}`);
this.props.history.replace( matchurl );
}
// this.props.history.replace( matchurl );
}
}).catch((error) => {
console.log(error)
@ -2214,9 +2216,6 @@ class Listofworksstudentone extends Component {
if(response === undefined){
return
}
if(response.data.message!==undefined){
return;
}
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){

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

@ -479,8 +479,8 @@ class Trainingjobsetting extends Component {
return;
}
if (this.state.latededuction <= 0) {
this.props.showNotification(`迟交扣分数不能小于等于零`);
if (this.state.latededuction <0) {
this.props.showNotification(`迟交扣分数不能小于零`);
return;
}

6
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -146,7 +146,7 @@ class PathDetailIndex extends Component{
if (result.data.status === 403) {
debugger
window.location.href = "/403";
// window.location.href = "/403";
return;
}
@ -173,7 +173,7 @@ class PathDetailIndex extends Component{
}
if (result.data.status === 403 ) {
debugger
window.location.href = "/403";
// window.location.href = "/403";
return;
}
@ -343,9 +343,11 @@ class PathDetailIndex extends Component{
<p className="clearfix mb20">
<span className="fl font-18 font-bd">简介</span>
{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
<Tooltip placement="bottom" title={"编辑"}>
<Link className="fr" to={"/paths/"+this.props.match.params.pathId+"/edit"}>
<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
</Link>
</Tooltip>
:""
}
</p>

14
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -179,7 +179,7 @@ class LoginRegisterComponent extends Component {
}
//找回密码
Retrievepassword = () => {
if (this.state.Phonenumberisnotcobool === false) {
if (this.state.Phonenumberisnotcobool === false&&this.state.Phonenumberisnotco!==undefined) {
this.openNotification(this.state.Phonenumberisnotco);
this.setState({
Whethertoverify:this.state.Whethertoverify===true?false:true,
@ -189,6 +189,9 @@ class LoginRegisterComponent extends Component {
if (this.state.login === undefined|| this.state.login.length ===0 || this.state.login === "") {
this.setState({
Phonenumberisnotco:"账号不能为空",
Phonenumberisnotcobool: false,
dragOk: false,
Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
@ -197,6 +200,8 @@ class LoginRegisterComponent extends Component {
// this.openNotification(`请拖动滑块完成验证`,2);
this.setState({
Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
dragOk: false,
Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
@ -479,12 +484,15 @@ class LoginRegisterComponent extends Component {
//是否验证通过
dragOkCallback = () => {
console.log(this.state.login);
this.setState({
Phonenumberisnotcosytdhk:undefined,
})
if (this.state.login === "" || this.state.login.length === 0) {
this.setState({
Phonenumberisnotco: "账号不能为空",
Phonenumberisnotcobool: false,
Phonenumberisnotcosytdhk:undefined,
dragOk: false,
Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
@ -502,6 +510,7 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotco: stringdata,
Phonenumberisnotcobool: false,
Phonenumberisnotcosytdhk:undefined,
dragOk:false,
Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
@ -509,6 +518,7 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: true,
Phonenumberisnotcosytdhk:undefined,
dragOk: true,
});

32
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -207,12 +207,15 @@ class LoginRegisterComponent extends Component {
//是否验证通过
dragOkCallback = () => {
debugger
this.setState({
Phonenumberisnotcosytdhk:undefined,
})
if (this.state.logins.length === 0) {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
dragOk:true,
Phonenumberisnotcos:"账号不能为空",
Phonenumberisnotcobool: true,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
return;
}
@ -373,21 +376,28 @@ class LoginRegisterComponent extends Component {
// this.openNotification(`请同意服务协议条款`,2);
// return;
// }
if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
this.setState({
Phonenumberisnotcos:"账号不能为空",
Phonenumberisnotcobool: true,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
return
}
if(this.state.pciphone===true){
if (this.state.dragOk === false) {
// this.openNotification(`请拖动滑块完成验证`,2);
this.setState({
Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
return
}
}
if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
this.setState({
Phonenumberisnotcos:"账号不能为空",
})
return
} else if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
// this.openNotification(`请输入验证码`,2);
this.setState({
Phonenumberisnotcosyzm:"验证码不能为空",
@ -898,7 +908,7 @@ class LoginRegisterComponent extends Component {
<div>
<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
<Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item>
<Menu.Item key="1" className={tab===1?"active font-18":"font-18"} >注册</Menu.Item>
<Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}} >注册</Menu.Item>
</Menu>
{

Write Preview
Loading…
Cancel
Save