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

Merge branch 'dev_aliyun' into dev_tj

Browse Source 
merge aliyun
dev_new_shixunsrepository
tangjiang 5 years ago
parent ceeabea7a3 95254ce52f
commit f5b2da094b
8 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File

11
app/controllers/graduation_topics_controller.rb
Unescape View File

@ -170,11 +170,12 @@ class GraduationTopicsController < ApplicationController
teacher_group = @course.teacher_course_groups.where(:user_id => @graduation_topic.tea_id, :id => params[:group_id]).first
unless teacher_group.present?
member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first
tip_exception("分班名称不能为空") if params[:course_group_name].blank?
course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id)
teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id),
:user_id => @graduation_topic.tea_id,
:course_group_id => course_group.try(:id))
if params[:course_group_name].present?
course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id)
teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id),
:user_id => @graduation_topic.tea_id,
:course_group_id => course_group.try(:id))
end
end
student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
student_member.update_attributes(:course_group_id => teacher_group.course_group_id) if student_member.present?

2
app/controllers/homework_commons_controller.rb
Unescape View File

@ -194,7 +194,7 @@ class HomeworkCommonsController < ApplicationController
# TODO user_extension 如果修改 请调整
unless params[:search].blank?
@student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
or student_id like ?", "%#{params[:search].strip}%", "%#{params[:search].strip}%")
end
@work_count = @student_works.size

21
app/services/homeworks_service.rb
Unescape View File

@ -305,13 +305,20 @@ class HomeworksService
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
is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
# if work.work_status == 0
# 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 !homework.allow_late || is_complete
work.work_status = 1
elsif myshixun.created_at < homework.late_time
work.work_status = 2
end
if work.work_status != 0

6
app/views/homework_commons/works_list.json.jbuilder
Unescape View File

@ -43,7 +43,8 @@ elsif @user_course_identity == Course::STUDENT
json.efficiency work_score_format(@work.efficiency, true, @score_open)
json.eff_score work_score_format(@work.eff_score, true, @score_open)
json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time)
end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(@work.user_id)&.end_time
json.complete_count @work.myshixun&.time_passed_count(end_time)
json.view_answer_count @work.myshixun.try(:view_answer_count).to_i
json.work_status @work.compelete_status
else
@ -101,7 +102,8 @@ if @homework.homework_type == "practice"
json.cost_time work.myshixun.try(:total_spend_time)
json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time)
end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(work.user_id)&.end_time
json.complete_count work.myshixun&.time_passed_count(end_time)
json.view_answer_count work.myshixun.try(:view_answer_count).to_i
json.user_login work.user.try(:login)
json.user_name work.user.try(:real_name)

2
lib/tasks/homework_publishtime.rake
Unescape View File

@ -81,7 +81,7 @@ namespace :homework_publishtime do
end
end
student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if student_works.present?
student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty, work_status: 2) if student_works.present?
else
HomeworkEndUpdateScoreJob.perform_later(homework.id)

17
public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
Unescape View File

@ -79,16 +79,15 @@ class GraduateTopicDetailTable extends Component{
})
}
sureAgreeTopic=(count)=>{
if(count > 0){
let{tableData}=this.props;
let{operationId,classesId}=this.state
let courseId=this.props.match.params.course_id;
let{tableData}=this.props;
let{operationId,classesId}=this.state
let courseId=this.props.match.params.course_id;
if(classesId!=undefined){
let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
this.agreeChoose(courseId,operationId,classesId,name);
}else{
this.setState({
un_choose_notice:"请先添加分班"
})
this.agreeChoose(courseId,operationId,classesId);
}
}
@ -205,7 +204,7 @@ class GraduateTopicDetailTable extends Component{
>
<div className="newupload_conbox">
<p className="color-grey-9 mb15 edu-txt-center">确认同意学生的选题，将学生加入我的分班</p>
<div className="df">
{ tableData.group_list && tableData.group_list.length===0?"":<div className="df">
<span className="lineh-40 mr10">选择：</span>
<div className="flex1">
<Select placeholder="请选择分班" style={{"width":"100%"}} value={classesId} onChange={this.changeClasses}>
@ -220,7 +219,7 @@ class GraduateTopicDetailTable extends Component{
</Select>
<p style={{height:"20px",lineHeight:"20px"}}><span className="color-orange-tip">{un_choose_notice}</span></p>
</div>
</div>
</div>}
<div className="mt20 clearfix edu-txt-center">
<a onClick={this.hideAgreeTopic} className="pop_close task-btn mr30">取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.sureAgreeTopic(tableData.group_list.length)}>确定</a>

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

@ -363,7 +363,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '截止前完成关卡',
title: '结束前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: "center",
@ -757,7 +757,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '截止前完成关卡',
title: '结束前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: "center",
@ -1110,7 +1110,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '截止前完成关卡',
title: '结束前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: 'center',
@ -1473,7 +1473,7 @@ class Listofworksstudentone extends Component {
),
},
{
title: '截止前完成关卡',
title: '结束前完成关卡',
dataIndex: 'completion',
key: 'completion',
align: 'center',

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

@ -278,7 +278,7 @@ class Challengesjupyter extends Component {
this.setState({
showtime:false
})
}, 500)
}, 800)
}else{
this.setState({
@ -292,7 +292,7 @@ class Challengesjupyter extends Component {
})
this.props.showNotification('实训保存失败!');
})
}, 500)
}, 800)
}

Write Preview
Loading…
Cancel
Save