Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

矫正接口数据

This commit is contained in:
huang 2017-04-19 21:48:57 +08:00
parent 4de97b9889
commit b8ba0da2b8
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/games_controller.rb
View File

@ -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

4
app/controllers/myshixuns_controller.rb
View File

@ -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"}

2
app/views/games/_game_results.html.erb
View File

@ -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>

5
db/migrate/20170419132939_add_result_to_outputs.rb Normal file
View File

@ -0,0 +1,5 @@
class AddResultToOutputs < ActiveRecord::Migration
def change
add_column :outputs, :result, :boolean
end
end