From 8a3a0af20f897710454077d2729f2e3aaa1eac13 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Jun 2015 10:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=A7=AF=E5=88=86=E5=BC=B9=E6=A1=86=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/member.rb                          | 10 ++++++++++
 app/views/courses/_show_member_score.html.erb |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/models/member.rb b/app/models/member.rb
index 5b1e277d7..057ea9570 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -129,6 +129,16 @@ class Member < ActiveRecord::Base
     StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}")
   end
 
+  #当前课程的作业列表
+  def homework_common_list
+    HomeworkCommon.where(:course_id => self.course_id)
+  end
+
+  #当前学生在指定作业内的得分
+  def homework_common_score homework_common
+    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+  end
+
   def student_work_score_avg
     StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
   end
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 0fd1248c6..b471bc17f 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -17,13 +17,14 @@
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
-      <% @member_score.student_work_score.each do |homework_score| %>
+      <% @member_score.homework_common_list.each do |homework_common| %>
             <li>
               <span class="c_grey02 w280">
-                <%= homework_score.name %>
+                <%= homework_common.name %>
               </span>
               <span class="c_red w70">
-                <%= format("%0.2f",homework_score.final_score.nil? ? 0 : homework_score.final_score) %>
+                <% final_score = @member_score.homework_common_score(homework_common).first%>
+                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score) %>
               </span>
             </li>
        <% end %>