From 6479ace5e16e70b5fd87b1ff281416784e7404c6 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 16:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86=E7=9A=84?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=E7=9A=84=E5=AD=A6=E7=94=9F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=8E=BB=E6=8E=89=E6=9C=AA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E3=80=81=E5=BC=B9=E6=A1=86=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 2 +-
 app/views/courses/_show_member_score.html.erb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 374e26431..17f62f18c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -341,7 +341,7 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
-    @homeworks = @course.homework_commons.order("created_at asc")
+    @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at asc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
 
     respond_to do |format|
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 27b3863b0..80c2ef5cc 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -8,19 +8,19 @@
 
 
     .tscore_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  text-align: center; padding-top:5px;}
-    .tscore_box{ width:350px; margin:15px auto;}
+    .tscore_box{ width:370px; margin:15px auto;}
     .tscore_box li{ height:25px;}
 </style>
 
 
   <div class="tscore_con" id="user_score">
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
-    <ul class="tscore_box">
+    <ul class="tscore_box" style="max-height: 400px; overflow: auto;">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
-      <% @member_score.homework_common_list.each do |homework_common| %>
+      <% @member_score.homework_common_list.each_with_index do |homework_common, index| %>
             <li>
               <span class="c_grey02 w280 hiddent">
-                <%= homework_common.name %>
+                作业<%=index + 1 %>：<%= homework_common.name %>
               </span>
               <span class="c_red w70">
                 <% final_score = @member_score.homework_common_score(homework_common).first%>