From 47c8ffd22a4d254f0ee43792112e0c1e7c9354e4 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 2 Nov 2014 17:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/homework_attach_helper.rb    |  6 ++++++
 app/views/homework_attach/_jour.html.erb |  6 +++++-
 app/views/homework_attach/_show.html.erb | 10 ++++++++--
 app/views/homework_attach/show.js.erb    |  2 +-
 db/schema.rb                             | 15 +++++++++++++++
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/helpers/homework_attach_helper.rb b/app/helpers/homework_attach_helper.rb
index c3bd240a3..8ba02136e 100644
--- a/app/helpers/homework_attach_helper.rb
+++ b/app/helpers/homework_attach_helper.rb
@@ -84,4 +84,10 @@ module HomeworkAttachHelper
   def praise_homework_count obj_id
     PraiseTread.where("praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'HomeworkAttach'").count
   end
+
+  #获取用户对作业的评分
+  def get_homework_score user, homework
+    seems_rateable_rate = HomeworkAttach.find_by_sql("SELECT * FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = #{homework.id} AND rater_id = #{user.id}")
+    seems_rateable_rate.nil? || seems_rateable_rate.count == 0 ? 0:seems_rateable_rate[0].stars
+  end
 end
\ No newline at end of file
diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index 7e2bf8eee..06800084c 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -2,7 +2,11 @@
   <div class="ping_dispic"><a target="_blank" href="#"><%= image_tag(url_to_avatar(jour.user))  %></a></div>
   <div class="ping_discon">
     <div class="ping_distop">
-      <span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span><span style="font-weight:bold; color:#a6a6a6; ">评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
+      <span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span>
+      <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span><span style="font-weight:bold; color:#a6a6a6; ">
+        <%= l(:label_work_rating) %>：
+        <%= render :partial => 'show_score', locals: {:stars => get_homework_score(jour.user,@homework ) }  %>
+      </span>
       <div class="cl"></div>
       <p><%= textilizable jour.notes%></p>
     </div>
diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb
index b23c98823..22b33fbec 100644
--- a/app/views/homework_attach/_show.html.erb
+++ b/app/views/homework_attach/_show.html.erb
@@ -52,10 +52,16 @@
 
     <div class="ping_star">
       <% if @is_comprehensive_evaluation == 3 %>
-
+          <%= l(:label_work_rating) %>：
+          <%= render :partial => 'show_score', locals: {:stars => @totle_score}  %>
       <% elsif  @is_comprehensive_evaluation == 2 %>
           <%= l(:label_work_rating) %>：
-          <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
+          <% if @has_evaluation || !can_anonymous_comments %>
+              <%= render :partial => 'show_score', locals: {:stars => @totle_score}  %>
+          <% else %>
+              <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
+          <% end %>
+
       <% elsif @is_comprehensive_evaluation == 1%>
           <%= l(:label_work_rating) %>：
           <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
diff --git a/app/views/homework_attach/show.js.erb b/app/views/homework_attach/show.js.erb
index 66ed277f2..5db0f1505 100644
--- a/app/views/homework_attach/show.js.erb
+++ b/app/views/homework_attach/show.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score,:can_anonymous_comments => false}) %>');
 showModal('ajax-modal', '503px');
 $('#ajax-modal').css('height','569px');
 
diff --git a/db/schema.rb b/db/schema.rb
index 4585e20d6..aceb82069 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -178,6 +178,13 @@ ActiveRecord::Schema.define(:version => 20141102054414) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "class_members", :force => true do |t|
+    t.integer  "member_id"
+    t.integer  "course_class_id"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "code_review_assignments", :force => true do |t|
     t.integer "issue_id"
     t.integer "change_id"
@@ -310,6 +317,14 @@ ActiveRecord::Schema.define(:version => 20141102054414) do
     t.integer  "container_id",   :default => 0
   end
 
+  create_table "course_classes", :force => true do |t|
+    t.string   "name"
+    t.text     "explain"
+    t.integer  "course_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "course_infos", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"