From e43a84ab4b4af728cb0774589c75085f0eccd3ac Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Jun 2014 17:00:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A=E6=97=A0?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=98=AF=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=BC=E8=AF=84=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=BC=9A=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 3 +++
 app/views/homework_attach/addjours.js.erb     | 2 +-
 app/views/homework_attach/edit.html.erb       | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 20ae4c54e..ef3d683b7 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -276,6 +276,9 @@ class HomeworkAttachController < ApplicationController
     @offset ||= @feedback_pages.offset
     @jour = @jours[@offset, @limit]
     @comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation is not null").order("created_on DESC")
+
+    @totle_score = score_for_homework @homework
+    @teaher_score = teacher_score_for_homework @homework
     respond_to do |format|
       format.js
     end
diff --git a/app/views/homework_attach/addjours.js.erb b/app/views/homework_attach/addjours.js.erb
index ed5887a7f..e16609b68 100644
--- a/app/views/homework_attach/addjours.js.erb
+++ b/app/views/homework_attach/addjours.js.erb
@@ -1,6 +1,6 @@
 <% if @add_jour.is_comprehensive_evaluation == 1 %>
     $('#comprehensive_evaluation').html('<%= escape_javascript(render(:partial => 'comprehensive_evaluation',
-    :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework} )) %>');
+    :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
 <% else %>
     $('#message').html('<%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>');
     $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb
index bfcf1f646..7467ca1a4 100644
--- a/app/views/homework_attach/edit.html.erb
+++ b/app/views/homework_attach/edit.html.erb
@@ -47,7 +47,12 @@
     </p>
     <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
         <strong>提交项目：</strong>
-        <%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),:name => "project_id", :required => true%>
+        <% if @homework.project.nil? %>
+          <%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true%>
+        <% else %>
+          <%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),:name => "project_id", :required => true%>
+        <% end %>
+
         <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
       <p class="font_lighter" style="padding-left:120px;clear:left;">提交项目可以为空</p>
     </p>