From cade029fc14df0157e91ffc20c53f84d8fec29e6 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 10 Jul 2019 11:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=B0=83=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/homework_commons_helper.rb           | 16 ++++++++++++++++
 app/models/homework_common.rb                    |  4 ++++
 .../shixun_work_report.json.jbuilder             | 11 ++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb
index c77ae5937..10e20ec0c 100644
--- a/app/helpers/homework_commons_helper.rb
+++ b/app/helpers/homework_commons_helper.rb
@@ -1,5 +1,21 @@
 module HomeworkCommonsHelper
 
+  # 实训作品的单个关卡得分
+  def work_challenge_score student_work, game, score, homework
+    result = 0
+    adjust_score = student_work.challenge_work_scores.where(challenge_id: game.challenge_id).last
+    if adjust_score.present?
+      result = adjust_score.score
+    else
+      setting = homework.homework_group_setting student_work.user_id
+      if game.status == 2 && ((game.end_time && game.end_time < setting.end_time) || (homework.allow_late && game.end_time && game.end_time < homework.late_time))
+        answer_open_evaluation = homework.homework_detail_manual.answer_open_evaluation
+        result = answer_open_evaluation ? score : (game.final_score > 0 ? game.real_score(score) : 0)
+      end
+    end
+    result
+  end
+
   # 未发布时非老师角色不能访问，发布后非课堂成员不能访问未公开的作业，学生需要考虑分班设置的作业是否已发布
   def homework_publish
     if (@user_course_identity >= Course::STUDENT && (@homework.publish_time.nil? || @homework.publish_time > Time.now)) ||
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 335b898fb..ac64b92c1 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -260,4 +260,8 @@ class HomeworkCommon < ApplicationRecord
     self.homework_group_settings.where("end_time is not null").pluck(:end_time).max
 
   end
+
+  def challenge_score challenge_id
+    homework_challenge_settings.find_by(challenge_id: challenge_id)&.score.to_f
+  end
 end
diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index f0aa8119e..103ead73f 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -8,9 +8,15 @@ if @shixun
   json.myself_experience @work.myshixun.try(:total_score)
   json.total_experience @shixun.all_score
   json.work_score number_with_precision @work.work_score, precision: 1
-  json.all_work_score 100
+  json.all_work_score number_with_precision 100, precision: 1
   json.time_consuming @work.myshixun_consume
   json.evaluate_count @user_evaluate_count.to_i
+  if @homework.work_efficiency
+    json.eff_score_full number_with_precision @homework.eff_score, precision: 1
+    json.eff_score @work.eff_score
+    json.challenge_score_full number_with_precision (100 - @homework.eff_score), precision: 1
+    json.challenge_score @work.final_score
+  end
 
 # 阶段成绩
   json.stage_list do
@@ -25,6 +31,9 @@ if @shixun
       json.experience game.challenge.all_score
       json.complete_status game_status(game, @homework)
       json.challenge_id game.challenge_id
+      challenge_score = @homework.challenge_score game.challenge_id
+      json.game_score_full challenge_score
+      json.game_score work_challenge_score @work, game, challenge_score, @homework
     end
   end