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
competitions
hjm 5 years ago
parent 71b6c85d09 589155e144
commit 202cb23888
4 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/exercises_controller.rb
Unescape View File

@ -1103,6 +1103,7 @@ class ExercisesController < ApplicationController
ActiveRecord::Base.transaction do
begin
can_commit_exercise = false
user_left_time = nil
if @user_course_identity > Course::ASSISTANT_PROFESSOR #为学生时
if params[:commit_method].to_i == 2 #自动提交时
user_left_time = get_exercise_left_time(@exercise,current_user)
@ -1131,7 +1132,7 @@ class ExercisesController < ApplicationController
CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
normal_status(0,"试卷提交成功！")
else
normal_status(-1,"提交失败，未到截止时间!")
normal_status(-2,"#{user_left_time.to_i}")
end
else
normal_status(-1,"提交失败，当前用户不为课堂学生!")

30
public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
Unescape View File

@ -96,8 +96,8 @@ class ExerciseReviewAndAnswer extends Component{
//window.addEventListener('scroll', this.handleScroll);
}
remainTime=()=>{
let { time } = this.state;
remainTime=(time)=>{
// let { time } = this.state;
let h=moment(parseInt(time)*1000).hour()-8;
let m=moment(parseInt(time)*1000).minutes();
let s=moment(parseInt(time)*1000).seconds();
@ -133,15 +133,21 @@ class ExerciseReviewAndAnswer extends Component{
commit_method:2
}).then((result)=>{
if(result){
this.setState({
Modalstype:true,
Modalstopval:'答题结束了，系统已自动提交试卷',
modalsBottomval:"不能再修改答题",
ModalCancel:undefined,
ModalSave:this.sureCommit,
Loadtype:true
})
this.props.showNotification(`${result.data.message}`);
if(result.data.status===0){
this.setState({
Modalstype:true,
Modalstopval:'答题结束了，系统已自动提交试卷',
modalsBottomval:"不能再修改答题",
ModalCancel:undefined,
ModalSave:this.sureCommit,
Loadtype:true
})
this.props.showNotification(`${result.data.message}`);
}
if(result.data.status===-2){
this.remainTime(parseInt(result.data.message))
}
}
}).catch((error)=>{
console.log(error);
@ -238,7 +244,7 @@ class ExerciseReviewAndAnswer extends Component{
isSpin:false
})
if(result.data.exercise.left_time != null){
this.remainTime();
this.remainTime(result.data.exercise.left_time);
}
}
}).catch((error)=>{

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

@ -354,8 +354,8 @@ class ShixunhomeWorkItem extends Component{
<span className="mr50 df">
{/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
{ discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}</span>}
{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}</span>}
{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}人</span>}
{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
{/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
{
@ -381,7 +381,7 @@ class ShixunhomeWorkItem extends Component{
{
discussMessage && discussMessage.upper_category_name &&
<ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
{ <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4?{"maxWidth":"111px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
{ <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5?{"maxWidth":"85px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
</ConditionToolTip>
}

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

@ -1722,20 +1722,20 @@ class Trainingjobsetting extends Component {
flagPageEditstwo:releasetime,
flagPageEditsthrees:deadline,
flagPageEditsfor:endtime,
completionefficiencyscore:true,
completionefficiencyscore:false,
work_efficiencys:this.state.work_efficiencys,
unifiedsetting:this.state.unifiedsetting,
latedeductiontwo:20,
latedeductiontwo:0,
});
//均分比例
try {
if(this.state.proportion==="均分比例"){
this.Equalproportion(20);
}else if(this.state.proportion==="经验值比例"){
this.Empiricalvalueratio(20);
}
// if(this.state.proportion==="均分比例"){
// this.Equalproportion(20);
//
// }else if(this.state.proportion==="经验值比例"){
// this.Empiricalvalueratio(20);
//
// }
}catch (e) {
}
@ -1838,21 +1838,21 @@ class Trainingjobsetting extends Component {
flagPageEditstwo:releasetime,
flagPageEditsthrees:deadline,
flagPageEditsfor:endtime,
completionefficiencyscore:true,
completionefficiencyscore:false,
work_efficiencys:datas.data.work_efficiency,
unifiedsetting:datas.data.unified_setting,
latedeductiontwo:20,
latedeductiontwo:0,
});
//均分比例
// result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ?
try {
if(datas.data.shixun_evaluation === 0){
this.Equalproportion(20);
}else if(datas.data.shixun_evaluation === 1){
this.Empiricalvalueratio(20);
}
// if(datas.data.shixun_evaluation === 0){
// this.Equalproportion(20);
//
// }else if(datas.data.shixun_evaluation === 1){
// this.Empiricalvalueratio(20);
//
// }
}catch (e) {
console.log(1);
console.log(e);

Write Preview
Loading…
Cancel
Save