From 53d85136a3df36b4cd041695d7b4679397f548ff Mon Sep 17 00:00:00 2001
From: = <huang.jingquan@163.com>
Date: Thu, 18 Dec 2014 14:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=8C=BF=E8=AF=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb |  3 +--
 app/services/homework_service.rb      | 31 ++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 2b0e51722..519afb6a8 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -265,8 +265,7 @@ class CoursesController < ApplicationController
     @members = cs.course_teacher_or_student_list(params,@course,User.current)
     @members = paginateHelper @members
     render :layout => 'base_courses'
-
-  rescue Exception => e
+    end
     if e.message == '403'
       render_403
     end
diff --git a/app/services/homework_service.rb b/app/services/homework_service.rb
index f40c4f0ef..f11e859d1 100644
--- a/app/services/homework_service.rb
+++ b/app/services/homework_service.rb
@@ -8,7 +8,7 @@ class HomeworkService
   def show_homework params
     @bid = Bid.find(params[:id])
     course  = @bid.courses.first
-    is_teacher = is_course_teacher(User.current,course)
+    is_teacher = is_course_teacher(User.current, course)
     author = @bid.author.firstname + @bid.author.lastname
     many_times = course.homeworks.index(@bid) + 1
     name = @bid.name
@@ -53,11 +53,32 @@ class HomeworkService
    
   #匿评作品详情
   def anonymous_works_show params
-    @homework = HomeworkAttach.find(params[:id])
-    if User.current.admin? || User.current.member_of_course?(@homework.bid.courses.first)
-      
+    @homework = HomeworkAttach.find(params[:homework_id])
+    name  = @homework.name
+    desc = @homework.description
+    datetime = @homework.created_at
+    unless @homework.attachments.empty?
+      attachs = @homework.attachments
+      attachs.each do |attach|
+        filename = attach.name
+        filedesc = attach.description unless attachment.description.blank?
+      end
+    end   
+  end
+  
+  #作品打分
+  def add_score_and_jour
+    @is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
+    @cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
+    @homework = HomeworkAttach.find(params[:homework_id])
+    #保存评分
+    @homework.rate(@m_score.to_i,User.current.id,:quality) if @m_score
+    #保存评论
+    @is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论？匿评？留言
+    if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""  #有没有留言
+      @homework.addjours User.current.id, params[:new_form][:user_message],0,@is_comprehensive_evaluation
     end
   end
   
-  #
+  
 end
\ No newline at end of file