1、为开启匿评作业,附件下载提示框显示位置不正确

2、导出列表成绩是最终评分而不是最终成绩
This commit is contained in:
sw 2015-07-04 15:26:32 +08:00
parent e46ccda8e6
commit 4b2f2680fd
2 changed files with 2 additions and 2 deletions

View File

@ -365,7 +365,7 @@ class StudentWorkController < ApplicationController
sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score) sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score) sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score) sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
sheet1[count_row,9] = homework.final_score.nil? ? l(:label_without_score) : format("%.2f",homework.final_score) sheet1[count_row,9] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
sheet1[count_row,10] = format_time(homework.created_at) sheet1[count_row,10] = format_time(homework.created_at)
count_row += 1 count_row += 1
end end

View File

@ -60,7 +60,7 @@
<%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json), <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %> remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %>
<% end%> <% end%>
<div class="info_ni_download"> <div class="info_ni_download" style="<%= @homework.homework_type == 1 ? '' : 'margin-left: 130px;'%>">
使用 使用
<span class="c_red">winzip</span> <span class="c_red">winzip</span>
工具进行解压可能会导致 工具进行解压可能会导致