From c8c4dc03597562c045865d8f47b2ccdee0e80b4c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 5 Sep 2019 14:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=84=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_works_controller.rb   | 25 +++++++++++++++++--
 app/models/student_works_score.rb             |  3 +++
 .../shixun_work_report.json.jbuilder          | 10 ++++++++
 config/routes.rb                              |  2 ++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index 99a02106c..7eef670fc 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -8,12 +8,15 @@ class StudentWorksController < ApplicationController
   before_action :find_work, only: [:shixun_work_report, :adjust_review_score, :shixun_work, :commit_des, :update_des,
                                    :adjust_score, :show, :adjust_score, :supply_attachments, :revise_attachment,
                                    :comment_list, :add_score, :add_score_reply, :destroy_score, :appeal_anonymous_score,
-                                   :deal_appeal_score, :cancel_appeal, :edit, :update, :export_shixun_work_report]
+                                   :deal_appeal_score, :cancel_appeal, :edit, :update, :export_shixun_work_report,
+                                   :shixun_work_comment, :destroy_work_comment]
   before_action :user_course_identity
   before_action :allow_add_score, only: [:add_score]
   before_action :homework_publish
 
-  before_action :teacher_allowed, only: [:adjust_score, :adjust_review_score, :deal_appeal_score]
+  before_action :teacher_allowed, only: [:adjust_score, :adjust_review_score, :deal_appeal_score, :shixun_work_comment,
+                                         :destroy_work_comment]
+
   before_action :course_student, only: [:new, :commit_des, :update_des, :create, :edit, :update, :search_member_list, :relate_project,
                                         :cancel_relate_project, :relate_project, :delete_work]
 
@@ -455,6 +458,7 @@ class StudentWorksController < ApplicationController
     @shixun = @homework.shixuns.take
     # 提示： 这里如果includes outputs表的话： sum(:evaluate_count)会出现错误
     @games = @work.myshixun.games.joins(:challenge).reorder("challenges.position asc") if @work.myshixun
+    @comment = @work.student_works_scores.shixun_comment.first
 
     # 用户最大评测次数
     if @games
@@ -468,6 +472,23 @@ class StudentWorksController < ApplicationController
     @echart_data = student_efficiency(@homework, @work)
   end
 
+  # 实训作品的评阅
+  def shixun_work_comment
+    tip_exception("评阅不能为空") if params[:comment].blank?
+    tip_exception("缺少is_hidden参数") if params[:is_hidden].blank? || ![true, false].include?(params[:is_hidden])
+    comment = @work.student_works_scores.shixun_comment.first || StudentWorksScore.new(student_work_id: @work.id, user_id: current_user.id)
+    comment.comment = params[:comment]
+    comment.is_hidden = params[:is_hidden]
+    comment.save!
+    normal_status("评阅成功")
+  end
+
+  # 删除实训作品评阅
+  def destroy_work_comment
+    @work.student_works_scores.shixun_comment.first.destroy! if @work.student_works_scores.shixun_comment.first.present?
+    normal_status("删除成功")
+  end
+
   def export_shixun_work_report
     @user = @work.user
     @shixun = @homework.shixuns.take
diff --git a/app/models/student_works_score.rb b/app/models/student_works_score.rb
index 19043f7f8..86d393f93 100644
--- a/app/models/student_works_score.rb
+++ b/app/models/student_works_score.rb
@@ -9,6 +9,9 @@ belongs_to :student_work
 
   validates :comment, length: { maximum: 2000 }
 
+  scope :shixun_comment, lambda { where(is_ultimate: 0) }
+
+
   def show_name identity, user
     identity < Course::STUDENT || self.user == user || self.reviewer_role != 3
   end
diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index 0ba6bfa5b..0b5e4da45 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -46,6 +46,16 @@ if @shixun
   json.user_id @user.id
   json.username @user.real_name
   json.student_id @user.student_id
+  json.image_url url_to_avatar(@user)
+  json.complete_count @work.myshixun&.passed_count
+  json.challenges_count @shixun.challenges_count
+  json.efficiency @homework.work_efficiency ? number_with_precision(@work.efficiency, precision: 2) : nil
+  json.max_efficiency @homework.work_efficiency ? number_with_precision(@homework.max_efficiency, precision: 2) : nil
+  json.passed_time @work.myshixun&.passed_time
+
+  # 评阅信息
+  json.work_comment @user_course_identity < Course::STUDENT ? @comment&.comment : nil
+  json.work_comment_hidden @comment&.is_hidden
 
 # 图形统计
 # 1： 效率
diff --git a/config/routes.rb b/config/routes.rb
index 3b15f05fe..55eab26b2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -438,6 +438,8 @@ Rails.application.routes.draw do
             post :deal_appeal_score
             post :cancel_appeal
             get :export_shixun_work_report
+            post :shixun_work_comment
+            delete :destroy_work_comment
           end
 
           collection do