From 463edeee71094c6945155cc2a3a08c7d8c67b471 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Jun 2014 17:49:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=BA=92=E8=AF=84=E5=8A=9F=E8=83=BD=E4=BD=9C=E4=B8=9A=E6=80=BB?=
 =?UTF-8?q?=E8=AF=84=E5=BE=97=E5=88=86=E8=AE=A1=E7=AE=97=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=9C=89=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 20 +++++++++++++++++--
 app/helpers/courses_helper.rb                 |  6 +++++-
 app/views/bids/_homework_list.html.erb        |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index ef3d683b7..b11bf0dc5 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -78,7 +78,15 @@ class HomeworkAttachController < ApplicationController
       if bid.homeworks.where("user_id = ?",User.current).count == 0
         user_id = params[:user_id]
         bid_id = params[:bid_id]
-        project_id = params[:new_form][:project_id]
+        if params[:homework_attach]
+          if params[:homework_attach][:project_id]
+            project_id = params[:homework_attach][:project_id]
+          else
+            project_id = 0
+          end
+        else
+          project_id = 0
+        end
         sta = 0
         name = params[:new_form][:name]
         description = params[:new_form][:description]
@@ -180,7 +188,15 @@ class HomeworkAttachController < ApplicationController
     if User.current.admin? || User.current.member_of?(course)
       name = params[:homework_name]
       description = params[:homework_description]
-      project_id = params[:homework_attach][:project_id]
+      if params[:homework_attach]
+        if params[:homework_attach][:project_id]
+          project_id = params[:homework_attach][:project_id]
+        else
+          project_id = 0
+        end
+      else
+        project_id = 0
+      end
       @homework.name = name
       @homework.description = description
       @homework.project_id = project_id
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 96ea4e28c..90bbe101b 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -186,7 +186,11 @@ module CoursesHelper
   #获取指定作业的最终评分
   #最终评分 = 学生评分的平均分 * 0.4 +教师评分 * 0.6
   def score_for_homework homework
-    return format("%.2f",(teacher_score_for_homework(homework).to_f * 0.6 + student_score_for_homework(homework).to_f * 0.4))
+    if  homework.bid.is_evaluation == 1 || homework.bid.is_evaluation == nil
+      return format("%.2f",(teacher_score_for_homework(homework).to_f * 0.6 + student_score_for_homework(homework).to_f * 0.4))
+    else
+      return teacher_score_for_homework homework
+    end
   end
 
   #获取作业的互评得分
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index e1ca9e0fd..b52ac6933 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -114,7 +114,7 @@
                     <tr>
                       <td>
                         <strong>提交文件:&nbsp;
-                          <% if is_evaluation %>
+                          <% if is_evaluation  || is_teacher%>
                             <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
                           <% else %>
                               <span class="required">未开启互评功能作业不允许下载</span>