From 4b2f2680fd3d601658306d3cc582d886f121ce15 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 4 Jul 2015 15:26:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BA=E5=BC=80=E5=90=AF=E5=8C=BF?=
 =?UTF-8?q?=E8=AF=84=E4=BD=9C=E4=B8=9A=EF=BC=8C=E9=99=84=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=8F=90=E7=A4=BA=E6=A1=86=E6=98=BE=E7=A4=BA=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=202=E3=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=88=97=E8=A1=A8=E6=88=90=E7=BB=A9=E6=98=AF=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E8=AF=84=E5=88=86=E8=80=8C=E4=B8=8D=E6=98=AF=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E6=88=90=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 app/views/student_work/index.html.erb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 63d25acbd..cc858cc19 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -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,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,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)
       count_row += 1
     end
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index e65b067d6..76ae71459 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -60,7 +60,7 @@
                 <%= 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" %>
             <% 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>
               工具进行解压可能会导致