Merge branches 'dev_aliyun' and 'newopenshixun0316' of https://bdgit.educoder.net/Hjqreturn/educoder into newopenshixun0316

courseware
杨树明 5 years ago
commit 038b967950

@ -937,8 +937,14 @@ class HomeworkCommonsController < ApplicationController
publish_groups = charge_group_ids & group_ids if group_ids
# ActiveRecord::Base.transaction do
messages = []
homeworks.each do |homework|
# 作业未发布时
max_end_time = params[:detail] ? group_end_times.max : params[:end_time]
if homework.allow_late && max_end_time.to_time >= homework.late_time
messages << "#{homework.name}"
next
end
if homework.homework_detail_manual.try(:comment_status) == 0
if !params[:group_ids].blank?
@ -1018,7 +1024,14 @@ class HomeworkCommonsController < ApplicationController
# 更新学生状态及成绩(手动点击计算)
# HomeworkPublishUpdateWorkStatusJob.perform_later(tiding_group_ids, homework.id)
end
normal_status(0, "发布成功")
unless messages.blank?
return_message = messages.join("")
return_message += messages.size == 1 ? "" : ""
return_message += "作业发布失败,原因:截止时间必须早于补交结束时间"
else
return_message = "发布成功"
end
normal_status(0, return_message)
# end
end

@ -4,9 +4,11 @@ json.course_modules do
json.id course_module.id
json.module_name course_module.module_name
json.course_second_categories course_module.first_categories do |category|
json.(category, :id, :name)
json.course_third_categories category.children do |child|
json.(child, :id, :name)
json.title category.name
json.value category.id
json.children category.children do |child|
json.title child.name
json.value child.id
end
end
end

@ -295,7 +295,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: '最终成绩',
title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -587,7 +590,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: '最终成绩',
title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -871,7 +877,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: '最终成绩',
title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -1095,7 +1104,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
title: '最终成绩',
title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',

@ -461,7 +461,7 @@ class Listofworksstudentone extends Component {
)
},
{
title: '当前成绩',
title:'当前成绩',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
@ -856,7 +856,7 @@ class Listofworksstudentone extends Component {
)
},
{
title: '当前成绩',
title:'当前成绩',
dataIndex: 'work_score',
key: 'work_score',
align: "center",
@ -1204,7 +1204,10 @@ class Listofworksstudentone extends Component {
)
},
{
title: '当前成绩',
title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
@ -1569,7 +1572,10 @@ class Listofworksstudentone extends Component {
)
},
{
title: '当前成绩',
title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
</pre>}></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',

Loading…
Cancel
Save