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

Merge branch 'cxt_course' into 'develop' 

作业的bug修复



See merge request !42
This commit is contained in:
陈晓婷 2016-12-02 17:48:45 +08:00
parent dd0c202f8c 28444e0af7
commit 54a7965a3e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/student_work_controller.rb
View File

@ -987,7 +987,7 @@ class StudentWorkController < ApplicationController
end end
end end
no_anon_penalty = params[:no_anon_penalty] ? 1 : 0 no_anon_penalty = params[:no_anon_penalty] ? 0 : 1
if no_anon_penalty != homework_detail_manual.no_anon_penalty if no_anon_penalty != homework_detail_manual.no_anon_penalty
homework_detail_manual.no_anon_penalty = no_anon_penalty homework_detail_manual.no_anon_penalty = no_anon_penalty
if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值 if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值

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

@ -17,8 +17,8 @@
<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 issues_calendar_input" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
</li> </li>
<li class="mb10 clear"> <li class="mb10 clear">
<input type="checkbox" class="fl ml100" name="no_anon_penalty" <%=homework.homework_detail_manual.no_anon_penalty == 1 ? 'checked' : '' %> value="<%=homework.homework_detail_manual.no_anon_penalty%>"/> <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" style="text-align: left">不参加匿评扣分</label> <label class="pop_box_label fl ml10" for="no_anon_penalty" style="text-align: left; width: 120px;">扣分（不参加匿评）</label>
</li> </li>
<li class="mb10 clear mt30"> <li class="mb10 clear mt30">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label> <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>

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

@ -17,8 +17,8 @@
<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')"/> <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>
<li class="mb10 clear"> <li class="mb10 clear">
<input type="checkbox" class="fl ml100" name="no_anon_penalty" <%=homework.homework_detail_manual.no_anon_penalty == 1 ? 'checked' : '' %> value="<%=homework.homework_detail_manual.no_anon_penalty%>"/> <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" style="text-align: left">不参加匿评扣分</label> <label class="pop_box_label fl ml10" for="no_anon_penalty" style="text-align: left; width: 120px;">扣分（不参加匿评）</label>
</li> </li>
<li class="mb10 clear mt30"> <li class="mb10 clear mt30">
<label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label> <label class="pop_box_label fl">最终得分&nbsp;&nbsp;:&nbsp;</label>

2
app/views/student_work/_evaluation_un_group_member_work.html.erb
View File

@ -48,7 +48,7 @@
<% elsif @homework.homework_detail_manual.comment_status == 2 && work.student_works_evaluation_distributions.count != 0 %> <% elsif @homework.homework_detail_manual.comment_status == 2 && work.student_works_evaluation_distributions.count != 0 %>
<span title="匿评期间，尚未获得他人匿评">待匿评</span> <span title="匿评期间，尚未获得他人匿评">待匿评</span>
<% elsif @homework.homework_detail_manual.comment_status == 3 && work.student_works_evaluation_distributions.count != 0 %> <% elsif @homework.homework_detail_manual.comment_status == 3 && work.student_works_evaluation_distributions.count != 0 %>
<span title="匿评已截止，未获得他人匿评">未评分</span> <span title="匿评已截止，未获得他人匿评">无评分</span>
<% else %> <% else %>
<span title="匿评开启后提交的作品，不参加匿评">迟交</span> <span title="匿评开启后提交的作品，不参加匿评">迟交</span>
<% end %> <% end %>

2
app/views/student_work/_evaluation_un_work.html.erb
View File

@ -79,7 +79,7 @@
<% elsif @homework.homework_detail_manual.comment_status == 2 && student_work.student_works_evaluation_distributions.count != 0 %> <% elsif @homework.homework_detail_manual.comment_status == 2 && student_work.student_works_evaluation_distributions.count != 0 %>
<span title="匿评期间，尚未获得他人匿评">待匿评</span> <span title="匿评期间，尚未获得他人匿评">待匿评</span>
<% elsif @homework.homework_detail_manual.comment_status == 3 && student_work.student_works_evaluation_distributions.count != 0 %> <% elsif @homework.homework_detail_manual.comment_status == 3 && student_work.student_works_evaluation_distributions.count != 0 %>
<span title="匿评已截止，未获得他人匿评">未评分</span> <span title="匿评已截止，未获得他人匿评">无评分</span>
<% end %> <% end %>
<% else %> <% else %>
<span title="">--</span> <span title="">--</span>