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

Merge branch 'develop' into 'develop' 

评分设置无反应、“我收到的作业”列表成绩显示不准确



See merge request !101
This commit is contained in:
黄井泉 2017-01-03 16:23:41 +08:00
parent 1f22fe8392 64fd365414
commit 0e7baab7b4
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/contests/_contest_member.html.erb
View File

@ -12,7 +12,7 @@
<tr> <tr>
<td><%= index + 1 %></td> <td><%= index + 1 %></td>
<td> <td>
<%= link_to member.user.show_name, user_path(member.user), :class => "pro_new_idname", :title => "#{member.user.show_name}" %> <%= link_to member.user.show_name, user_path(member.user), :class => "pro_new_idname ml10", :title => "#{member.user.show_name}" %>
</td> </td>
<td style="width: 200px"> <td style="width: 200px">
<span id="member_role_<%=member.id %>"><%= zh_contest_role(h member.roles.sort.collect(&:to_s).join(', ')) %></span> <span id="member_role_<%=member.id %>"><%= zh_contest_role(h member.roles.sort.collect(&:to_s).join(', ')) %></span>

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

@ -19,10 +19,10 @@ function set_score_rule_submit() {
if($("#late_penalty_num").val().trim() == ""){ if($("#late_penalty_num").val().trim() == ""){
$("#late_penalty_num").val("0"); $("#late_penalty_num").val("0");
} }
if($("#absence_penalty_num").val().trim() == ""){ if($("#absence_penalty_num").length > 0 && $("#absence_penalty_num").val().trim() == ""){
$("#absence_penalty_num").val("0"); $("#absence_penalty_num").val("0");
} }
if($("#appeal_penalty").val().trim() == ""){ if($("#absence_penalty_num").length > 0 && $("#appeal_penalty").val().trim() == ""){
$("#appeal_penalty").val("0"); $("#appeal_penalty").val("0");
} }
$('#muban_popup_box').find('form').submit(); $('#muban_popup_box').find('form').submit();

2
app/views/users/_receive_homework_list.html.erb
View File

@ -17,7 +17,7 @@
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey' %> <%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey' %>
</span> </span>
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span> <span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
<% my_work = cur_user_works_for_homework(homework) %> <% my_work = homework.student_works.where("user_id = ? && work_status != 0",User.current).first %>
<span class="fl">状态：</span><span class="<%= my_work ? '' : 'hw_cir_nomal hw_cir_lorange' %> fl mr15"><%= my_work ? '已提交' : '未提交' %></span> <span class="fl">状态：</span><span class="<%= my_work ? '' : 'hw_cir_nomal hw_cir_lorange' %> fl mr15"><%= my_work ? '已提交' : '未提交' %></span>
<span class="fl">作品：</span><span class="sy_corange hw_w20 fl mr15"><%=homework.student_works.has_committed.count %></span> <span class="fl">作品：</span><span class="sy_corange hw_w20 fl mr15"><%=homework.student_works.has_committed.count %></span>
<span class="fl">成绩：</span> <span class="fl">成绩：</span>

15
app/views/works/score_rule_set.js.erb
View File

@ -11,17 +11,4 @@ $(function() {
$("#no_limit").attr('disabled', 'disabled'); $("#no_limit").attr('disabled', 'disabled');
$("#evaluation_num").attr('disabled', 'disabled'); $("#evaluation_num").attr('disabled', 'disabled');
<% end %> <% end %>
}); });
function set_score_rule_submit() {
if($("#late_penalty_num").val().trim() == ""){
$("#late_penalty_num").val("0");
}
if($("#absence_penalty_num").val().trim() == ""){
$("#absence_penalty_num").val("0");
}
if($("#appeal_penalty").val().trim() == ""){
$("#appeal_penalty").val("0");
}
$('#muban_popup_box').find('form').submit();
hideModal();
}