From b8ba0da2b8ea4bbf4d6926da54ee81cc65b37037 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 19 Apr 2017 21:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AB=E6=AD=A3=E6=8E=A5=E5=8F=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb                | 7 ++++---
 app/controllers/myshixuns_controller.rb            | 4 ++--
 app/views/games/_game_results.html.erb             | 2 +-
 db/migrate/20170419132939_add_result_to_outputs.rb | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20170419132939_add_result_to_outputs.rb

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index dcef4c35c..6fe167d93 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -71,8 +71,8 @@ class GamesController < ApplicationController
     end
 
     logger.info("#################################{@public_test_sets}")
-    error_position = test_sets.where(:result => false).order("position desc").first
-    @error_position = error_position.blank? ? 0 : error_position.try(:position).to_i
+    error_position = Output.where(:game_id => @game.id, :result => false).first
+    @error_position = error_position.blank? ? 0 : error_position.try(:test_set_id).to_i
     @passed_teststest = test_sets.where(:result => true).count
     @test_sets_count = test_sets.count
     (@myshixun.games.count == @game_challenge.position && @game.status ==2) ? @had_done = 1 : @had_done = 0
@@ -163,7 +163,8 @@ class GamesController < ApplicationController
       @private_test_sets = test_set_static_data(private_test_sets).blank?  ? [] : test_set_static_data(private_test_sets)
     end
     latest_output = @game.latest_output.try(:out_put)
-    error_position = test_sets.where(:result => false).order("position desc").first.blank? ? 0 : error_position.try(:position).to_i
+    error_position = Output.where(:game_id => @game.id, :result => false).first
+    error_position = error_position.blank? ? 0 : error_position.try(:test_set_id).to_i
     passed_teststest = test_sets.where(:result => true).count
     test_sets_count = test_sets.count
     test_sets_hidden_count = private_test_sets.count
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index b32071a26..ec3ed5486 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -22,14 +22,14 @@ class MyshixunsController < ApplicationController
     # test_sets = challenge.test_sets
     unless jenkins_testsets.blank?
       jenkins_testsets.each do |j_test_set|
-        game_outputs = Output.create(:code => status, :game_id => game_id, :out_put => outPut, :test_set_id => j_test_set['caseId'], :expect_output => j_test_set['expectedOutput'])
+        expect_output = Base64.decode64(j_test_set['output']) unless j_test_set['output'].blank?
+        game_outputs = Output.create(:code => status, :game_id => game_id, :out_put => outPut, :test_set_id => j_test_set['caseId'], :expect_output => expect_output, :result => j_test_set['passed'].to_i)
       end
     end
     if status == "0"
       game.update_attribute(:status, 2)
       game.update_attribute(:final_score, challenge.score)
     else
-
       game.update_attribute(:status, 0)
     end
     render :json => {:data => "success"}
diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb
index 69db227e3..b0a8a9109 100644
--- a/app/views/games/_game_results.html.erb
+++ b/app/views/games/_game_results.html.erb
@@ -89,7 +89,7 @@
             <div class="-task-ces-box mb10 clearfix">
               <div class="-task-ces-info">
                 <ul>
-                  <li><span class="-task-ces-info-left ">通过情况：</span><span class="color-light-green"><!= passed_teststest !>/<!= test_sets_count !></span></li>
+                  <!--<li><span class="-task-ces-info-left ">通过情况：</span><span class="color-light-green"><!= passed_teststest !>/<!= test_sets_count !></span></li>-->
                   <li><span class="-task-ces-info-left">隐藏测试：</span><span class="color-light-green"><!= test_sets_hidden_count !>/<!= test_sets_count !></span></li>
                   <li><span class="-task-ces-info-left">经验值：</span><span class="color-light-green">+ <!= final_score !></span></li>
                 </ul>
diff --git a/db/migrate/20170419132939_add_result_to_outputs.rb b/db/migrate/20170419132939_add_result_to_outputs.rb
new file mode 100644
index 000000000..9345f1462
--- /dev/null
+++ b/db/migrate/20170419132939_add_result_to_outputs.rb
@@ -0,0 +1,5 @@
+class AddResultToOutputs < ActiveRecord::Migration
+  def change
+    add_column :outputs, :result, :boolean
+  end
+end