jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

班级作业的评分设置，增加助教评分模式的配置选项

This commit is contained in:
cxt 2017-01-05 18:20:18 +08:00
parent 63d29b38ca
commit c976053297
8 changed files with 319 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/student_work_controller.rb
View File

@ -868,8 +868,12 @@ class StudentWorkController < ApplicationController
end
when 2 #教辅评分 教辅评分显示平均分
#@work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
if @homework.homework_detail_manual.ta_mode == 1
ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
@work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f
else
@work.teaching_asistant_score = @new_score.score
end
if @is_group_leader && params[:same_score]
add_score_to_member @work, @homework, @new_score
end
@ -1072,6 +1076,24 @@ class StudentWorkController < ApplicationController
homework_detail_manual.save if homework_detail_manual
end
if params[:ta_mode] && homework_detail_manual.ta_mode.to_i != params[:ta_mode].to_i
homework_detail_manual.ta_mode = params[:ta_mode].to_i
homework_detail_manual.save
if homework_detail_manual.ta_mode == 1
@homework.student_works.where("work_status != 0").each do |student_work|
ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{student_work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a")
student_work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f
student_work.save
end
else
@homework.student_works.where("work_status != 0").each do |student_work|
ts_score = StudentWorksScore.where("student_work_id = #{student_work.id} AND reviewer_role = 2 AND score IS NOT NULL").order("created_at DESC")
student_work.teaching_asistant_score = ts_score.first.nil? ? nil : ts_score.first.score
student_work.save
end
end
end
teacher_priority = params[:teacher_priority].to_i
if homework_detail_manual.ta_proportion.to_s != params[:ta_proportion].to_s || @homework.teacher_priority.to_s != teacher_priority.to_s || (homework_detail_programing && homework_detail_programing.ta_proportion.to_s != params[:sy_proportion].to_s)
homework_detail_manual.ta_proportion = params[:ta_proportion]

141
app/views/homework_common/_set_score_rule_non_pro.html.erb
View File

@ -1,4 +1,4 @@
<div id="muban_popup_box" style="width:600px;">
<div id="muban_popup_box" style="width:630px;">
<div class="muban_popup_top">
<h3 class="fl">评分设置</h3>
<a href="javascript:void(0);" class="muban_icons_close fr"></a>
@ -8,40 +8,109 @@
<div class="muban_popup_con clear">
<div class="clear mt15 ml20">
<ul class="pro_newsetting_con fl">
<li class="mb10 clear">
<li class="mb10 fl">
<label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl issues_calendar_input" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl w180" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w230">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mb10 mt10 fl">
<label class="pop_box_label fl">缺评扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="fl issues_calendar_input" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
<input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="fl w180" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<li class="mb10 fl">
<input type="checkbox" class="fl ml100" id="no_anon_penalty" name="no_anon_penalty" <%=homework.homework_detail_manual.no_anon_penalty == 0 ? 'checked' : '' %> value="<%=homework.homework_detail_manual.no_anon_penalty%>"/>
<label class="pop_box_label fl ml10" for="no_anon_penalty" style="text-align: left; width: 120px;">扣分（不参加匿评）</label>
</li>
<li class="mb10 clear mt30">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 64px;">
<em></em>
<span></span>
<p>匿评开启后提交的作品，未能参加匿评，<br/>按照全部缺评扣分</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="fl mt10">
<label class="pop_box_label fl">匿评申诉&nbsp;&nbsp;:&nbsp;</label>
<ul class="fl">
<li class="clear">
<li class="fl">
<input type="radio" class="fl" id="anonymous_appeal" value="1" name="anonymous_appeal"/>
<label for="anonymous_appeal" class="fl ml5">启用</label>
</li>
<li class="clear" style="margin-top: 27px;">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 165px; line-height: 1.5">
<em></em>
<span></span>
<p>学生可对匿评成绩发起申诉<br/>您可以接受或者拒绝申诉<br/></p>
</div>
<div class="cl"></div>
<li class="fl">
<label class="pop_box_label fl">违规匿评扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" style="width: 75px; padding-left: 10px;" id="appeal_penalty" name="appeal_penalty" placeholder="0-50" value="<%=homework.homework_detail_manual.appeal_penalty %>" class="fl">
</li>
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w230" style="line-height: 1.5">
<em></em>
<span></span>
<p>请输入数值0-50<br/>若匿评时评出不合理的成绩被申诉成功，<br/>扣违规匿评分<br/></p>
</div>
</ul>
</li>
<li class="mb10 clear" style="margin-top: 45px;">
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" value="0" id="no_anonymous_appeal" name="anonymous_appeal"/><label for="no_anonymous_appeal" class="fl ml5">禁用</label>
</li>
<li class="mb10 clear">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 165px;">
<em></em>
<span></span>
<p>学生不能对匿评成绩发起申诉</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mt10">
<label class="pop_box_label fl">助教评分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="ta_normal_mode" name="ta_mode"/>
<label for="ta_normal_mode" class=" fl ml5">普通模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 mt5 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p >助教评分 = 各助教最新评分的平均分</p>
</div>
<div class="cl"></div>
<li class="">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="ta_re_mode" value="2" name="ta_mode"/>
<label for="ta_re_mode" class="fl ml5">复审模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p >助教评分 = 最新的助教评分</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mb10 mt10 fl">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/><label for="teacher_score" class=" fl ml5">教师评分</label>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p>教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
</div>
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<ul class="fl">
<li class="clear">
@ -57,54 +126,17 @@
<span class="fl ml5">学生匿评</span>
</li>
</ul>
</li>
</ul>
<ul class="fl ml20">
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>匿评开启后提交的作品，未能参加<br/>匿评，按照全部缺评扣分</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>学生可对匿评成绩发起申诉<br/>您可以接受或者拒绝申诉<br/></p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>请输入数值0-50<br/>若匿评时评出不合理的成绩被申诉成功，<br/>扣违规匿评分<br/></p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>学生不能对匿评成绩发起申诉</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p >教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
</div>
<div class="popup_tip_box fontGrey2">
<div class="fl clear popup_tip_box fontGrey2 w230" style="margin-left: 78px;">
<em></em>
<span></span>
<p >助教评分*其百分比+ <br/>
学生匿评平均分*其百分比- <br/>
( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
</div>
</li>
</ul>
<div class="cl"></div>
<a href="javascript:void(0);" class="fr sy_btn_blue mr80" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_blue mr50" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取消</a>
</div>
</div>
@ -122,6 +154,11 @@
<% else %>
$("#other_score").attr("checked", "checked");
<% end %>
<% if homework.homework_detail_manual.ta_mode == 1 %>
$("#ta_normal_mode").attr("checked", "checked");
<% else %>
$("#ta_re_mode").attr("checked", "checked");
<% end %>
$("#teacher_score").change(function(){
if($("#teacher_score").attr("checked")){
$("#late_penalty_num").val("0");

63
app/views/homework_common/_set_score_rule_none_pro_anon.html.erb
View File

@ -1,4 +1,4 @@
<div id="muban_popup_box" style="width:500px;">
<div id="muban_popup_box" style="width:530px;">
<div class="muban_popup_top">
<h3 class="fl">评分设置</h3>
<a href="javascript:void(0);" class="muban_icons_close fr"></a>
@ -8,40 +8,62 @@
<div class="muban_popup_con clear">
<div class="clear mt15 ml20">
<ul class="pro_newsetting_con fl">
<li class="mb10 clear">
<li class="mb10 fl">
<label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl issues_calendar_input" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
</li>
<li class="mb10 clear">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>
<label for="teacher_score" class=" fl ml5">教师评分</label>
</li>
<li class="mb10 clear">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/>
<label for="other_score" class="fl ml5">助教评分</label>
</li>
</ul>
<ul class="fl ml20" >
<div class="popup_tip_box fontGrey2 mb10">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w190">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<div class="cl"></div>
<span class="separator_short"></span>
<li class="mb10">
<label class="pop_box_label fl">助教评分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="ta_normal_mode" name="ta_mode"/>
<label for="ta_normal_mode" class=" fl ml5">普通模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >助教评分 = 各助教最新评分的平均分</p>
</div>
<li class="mb10">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="ta_re_mode" value="2" name="ta_mode"/>
<label for="ta_re_mode" class="fl ml5">复审模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >助教评分 = 最新的助教评分</p>
</div>
<div class="cl"></div>
<span class="separator_short"></span>
<li class="mb10">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>
<label for="teacher_score" class=" fl ml5">教师评分</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >教师评分 - 迟交扣分 </p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<li class="mb10">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="other_score" value="0" name="teacher_priority"/>
<label for="other_score" class="fl ml5">助教评分</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >助教评分 - 迟交扣分 </p>
</div>
</ul>
<div class="cl"></div>
<a href="javascript:void(0);" class="fr sy_btn_blue mr90" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_blue mr40" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取消</a>
</div>
</div>
@ -55,6 +77,11 @@
<% else %>
$("#other_score").attr("checked", "checked");
<% end %>
<% if homework.homework_detail_manual.ta_mode == 1 %>
$("#ta_normal_mode").attr("checked", "checked");
<% else %>
$("#ta_re_mode").attr("checked", "checked");
<% end %>
$("#teacher_score").change(function(){
if($("#teacher_score").attr("checked")){
$("#late_penalty_num").val("0");

137
app/views/homework_common/_set_score_rule_pro.html.erb
View File

@ -1,4 +1,4 @@
<div id="muban_popup_box" style="width:600px;">
<div id="muban_popup_box" style="width:630px;">
<div class="muban_popup_top">
<h3 class="fl">评分设置</h3>
<a href="javascript:void(0);" class="muban_icons_close fr"></a>
@ -8,40 +8,109 @@
<div class="muban_popup_con clear">
<div class="clear mt15 ml20">
<ul class="pro_newsetting_con fl">
<li class="mb10 clear">
<li class="mb10 fl">
<label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl w180" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w230">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mb10 mt10 fl">
<label class="pop_box_label fl">缺评扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="0-50" class="fl w180" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<li class="mb10 fl">
<input type="checkbox" class="fl ml100" id="no_anon_penalty" name="no_anon_penalty" <%=homework.homework_detail_manual.no_anon_penalty == 0 ? 'checked' : '' %> value="<%=homework.homework_detail_manual.no_anon_penalty%>"/>
<label class="pop_box_label fl ml10" for="no_anon_penalty" style="text-align: left; width: 120px;">扣分（不参加匿评）</label>
</li>
<li class="mb10 clear mt30">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 64px;">
<em></em>
<span></span>
<p>匿评开启后提交的作品，未能参加匿评，<br/>按照全部缺评扣分</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="fl mt10">
<label class="pop_box_label fl">匿评申诉&nbsp;&nbsp;:&nbsp;</label>
<ul class="fl">
<li class="clear">
<li class="fl">
<input type="radio" class="fl" id="anonymous_appeal" value="1" name="anonymous_appeal"/>
<label for="anonymous_appeal" class="fl ml5">启用</label>
</li>
<li class="clear" style="margin-top: 27px;">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 165px; line-height: 1.5">
<em></em>
<span></span>
<p>学生可对匿评成绩发起申诉<br/>您可以接受或者拒绝申诉<br/></p>
</div>
<div class="cl"></div>
<li class="fl">
<label class="pop_box_label fl">违规匿评扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" style="width: 75px; padding-left: 10px;" id="appeal_penalty" name="appeal_penalty" placeholder="0-50" value="<%=homework.homework_detail_manual.appeal_penalty %>" class="fl" onkeyup="check_late_penalty('appeal_penalty')">
</li>
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w230" style="line-height: 1.5">
<em></em>
<span></span>
<p>请输入数值0-50<br/>若匿评时评出不合理的成绩被申诉成功，<br/>扣违规匿评分<br/></p>
</div>
</ul>
</li>
<li class="mb10 clear" style="margin-top: 45px;">
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" value="0" id="no_anonymous_appeal" name="anonymous_appeal"/><label for="no_anonymous_appeal" class="fl ml5">禁用</label>
</li>
<li class="mb10 clear">
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 165px;">
<em></em>
<span></span>
<p>学生不能对匿评成绩发起申诉</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mt10">
<label class="pop_box_label fl">助教评分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="ta_normal_mode" name="ta_mode"/>
<label for="ta_normal_mode" class=" fl ml5">普通模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 mt5 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p >助教评分 = 各助教最新评分的平均分</p>
</div>
<div class="cl"></div>
<li class="">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="ta_re_mode" value="2" name="ta_mode"/>
<label for="ta_re_mode" class="fl ml5">复审模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p >助教评分 = 最新的助教评分</p>
</div>
<div class="cl"></div>
<span class="separator_long"></span>
<li class="mb10 mt10 fl">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/><label for="teacher_score" class=" fl ml5">教师评分</label>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 mt10 w230" style="margin-left: 141px;">
<em></em>
<span></span>
<p>教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
</div>
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<ul class="fl">
<li class="clear">
@ -61,45 +130,7 @@
<span class="fl ml5">学生匿评</span>
</li>
</ul>
</li>
</ul>
<ul class="fl ml20">
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p id="late_penalty_notice" class="">请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p id="absence_penalty_notice" class="">请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>匿评开启后提交的作品，未能参加匿评，<br/>按照全部缺评扣分</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>学生可对匿评成绩发起申诉<br/>您可以接受或者拒绝申诉<br/></p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>请输入数值0-50<br/>若匿评时评出不合理的成绩被申诉成功，<br/>扣违规匿评分<br/></p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>学生不能对匿评成绩发起申诉</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p>教师评分-迟交扣分-缺评扣分-违规匿评扣分</p>
</div>
<div class="popup_tip_box fontGrey2">
<div class="fl clear popup_tip_box fontGrey2 w230" style="margin-left: 27px;">
<em></em>
<span></span>
<p>系统评分*其百分比+ <br/>
@ -107,9 +138,10 @@
学生匿评平均分*其百分比 - <br/>
( 迟交扣分+缺评扣分+违规匿评扣分 )</p>
</div>
</li>
</ul>
<div class="cl"></div>
<a href="javascript:void(0);" class="fr sy_btn_blue mr70" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_blue mr50" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取消</a>
</div>
@ -132,6 +164,11 @@
<% else %>
$("#other_score").attr("checked", "checked");
<% end %>
<% if homework.homework_detail_manual.ta_mode == 1 %>
$("#ta_normal_mode").attr("checked", "checked");
<% else %>
$("#ta_re_mode").attr("checked", "checked");
<% end %>
$("#teacher_score").change(function(){
if($("#teacher_score").attr("checked")){
$("#late_penalty_num").val("0");

65
app/views/homework_common/_set_score_rule_pro_anon.html.erb
View File

@ -1,4 +1,4 @@
<div id="muban_popup_box" style="width:500px;">
<div id="muban_popup_box" style="width:530px;">
<div class="muban_popup_top">
<h3 class="fl">评分设置</h3>
<a href="javascript:void(0);" class="muban_icons_close fr"></a>
@ -8,16 +8,50 @@
<div class="muban_popup_con clear">
<div class="clear mt15 ml20">
<ul class="pro_newsetting_con fl">
<li class="mb10 clear">
<li class="mb10 fl">
<label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
<input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl issues_calendar_input" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
</li>
<li class="mb10 clear">
<div class="fl ml20 clear popup_tip_box fontGrey2 mb10 w190">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="cl"></div>
<span class="separator_short"></span>
<li class="mb10 fl">
<label class="pop_box_label fl">助教评分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="ta_normal_mode" name="ta_mode"/>
<label for="ta_normal_mode" class=" fl ml5">普通模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >助教评分 = 各助教最新评分的平均分</p>
</div>
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<input type="radio" class="fl" id="ta_re_mode" value="2" name="ta_mode"/>
<label for="ta_re_mode" class="fl ml5">复审模式</label>
</li>
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >助教评分 = 最新的助教评分</p>
</div>
<div class="cl"></div>
<span class="separator_short"></span>
<li class="mb10 fl">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>
<input type="radio" class="fl" value="1" id="teacher_score" name="teacher_priority"/>
<label for="teacher_score" class=" fl ml5">教师评分</label>
</li>
<li class="mb10 clear">
<div class="fl clear popup_tip_box fontGrey2 mb10 w190" style="margin-left: 92px;">
<em></em>
<span></span>
<p >教师评分 - 迟交扣分 </p>
</div>
<li class="mb10 fl">
<label class="pop_box_label fl">&nbsp;&nbsp;</label>
<ul class="fl">
<li class="clear">
@ -32,29 +66,17 @@
<span class="fl ml5">助教评分</span>
</li>
</ul>
</li>
</ul>
<ul class="fl ml20">
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p >请输入数值0-50</p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<em></em>
<span></span>
<p >教师评分 - 迟交扣分 </p>
</div>
<div class="popup_tip_box fontGrey2 mb10">
<div class="fl clear popup_tip_box fontGrey2 mb10 w190 ml30">
<em></em>
<span></span>
<p >系统评分 * 其百分比 + <br/>
助教评分 * 其百分比 - <br/>
迟交扣分 </p>
</div>
</li>
</ul>
<div class="cl"></div>
<a href="javascript:void(0);" class="fr sy_btn_blue mr75" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_blue mr40" onclick="set_score_rule_submit();">确定</a>
<a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取消</a>
</div>
@ -77,6 +99,11 @@
<% else %>
$("#other_score").attr("checked", "checked");
<% end %>
<% if homework.homework_detail_manual.ta_mode == 1 %>
$("#ta_normal_mode").attr("checked", "checked");
<% else %>
$("#ta_re_mode").attr("checked", "checked");
<% end %>
$("#teacher_score").change(function(){
if($("#teacher_score").attr("checked")){
$("#late_penalty_num").val("0");

8
app/views/homework_common/score_rule_set.js.erb
View File

@ -1,18 +1,18 @@
<% if @homework.homework_type == 2 %>
<% if @homework.anonymous_comment == 0 %>
var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
pop_box_new(htmlvalue, 600, 580);
pop_box_new(htmlvalue, 630, 758);
<% else %>
var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
pop_box_new(htmlvalue, 500, 285);
pop_box_new(htmlvalue, 530, 404);
<% end %>
<% else %>
<% if @homework.anonymous_comment == 0 %>
var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_non_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
pop_box_new(htmlvalue, 600, 550);
pop_box_new(htmlvalue, 630, 758);
<% else %>
var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_none_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
pop_box_new(htmlvalue, 500, 225);
pop_box_new(htmlvalue, 530, 332);
<% end %>
<% end %>
function set_score_rule_submit() {

5
db/migrate/20170105024224_add_ta_mode_to_homework.rb Normal file
View File

@ -0,0 +1,5 @@
class AddTaModeToHomework < ActiveRecord::Migration
def change
add_column :homework_detail_manuals, :ta_mode, :integer, :default => 1
end
end

3
public/stylesheets/css/common.css
View File

@ -878,3 +878,6 @@ input.btn-blue{background: #3b94d6; color: #fff; cursor:pointer;}
input:hover.btn-blue{background: #2788d0; color: #fff;}
input.btn-grey{background: #d9d9d9; color: #656565; cursor:default;}
input.btn-grey:hover{background: #717171; color: #fff; cursor:default;}
.separator_short{margin-top: 5px; margin-bottom: 5px; margin-left: 37px; width: 433px; display: block; border-bottom: 1px solid #d9d9d9;}
.separator_long{margin-top: 5px; margin-bottom: 5px; margin-left: 37px; width: 522px; display: block; border-bottom: 1px solid #d9d9d9;}