From c507a97ac6a2022a7ef055d5bb6817d092dab683 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Jul 2015 21:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=96=E8=AF=91=E8=BF=94?=
=?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=B7?=
=?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=98=AF=E5=90=A6=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/homework_common_controller.rb | 42 +++++++++----------
.../homework_common/programing_test.js.erb | 4 +-
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a6fae032f..918c1b8b9 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -120,16 +120,16 @@ class HomeworkCommonController < ApplicationController
# http.request(req)
# end
- # uri = URI('http://192.168.80.21:8080/api/questions.json')
- # body = question.to_json
- # res = Net::HTTP.new(uri.host, uri.port).start do |client|
- # request = Net::HTTP::Post.new(uri.path)
- # request.body = body
- # request["Content-Type"] = "application/json"
- # client.request(request)
- # end
- # result = JSON.parse(res.body)
- # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
+ uri = URI('http://192.168.80.21:8080/api/questions.json')
+ body = question.to_json
+ res = Net::HTTP.new(uri.host, uri.port).start do |client|
+ request = Net::HTTP::Post.new(uri.path)
+ request.body = body
+ request["Content-Type"] = "application/json"
+ client.request(request)
+ end
+ result = JSON.parse(res.body)
+ homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
homework.homework_detail_programing = homework_detail_programing
else
@@ -355,18 +355,16 @@ class HomeworkCommonController < ApplicationController
def programing_test
test = {language:params[:language],src:params[:src],input:[params[:input]],output:[params[:output]]}
@index = params[:index]
- # uri = URI('http://192.168.80.21:8080/api/realtime.json')
- # body = test.to_json
- # res = Net::HTTP.new(uri.host, uri.port).start do |client|
- # request = Net::HTTP::Post.new(uri.path)
- # request.body = body
- # request["Content-Type"] = "application/json"
- # client.request(request)
- # end
- # result = JSON.parse(res.body)
- # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
- #
- # homework.homework_detail_programing = homework_detail_programing
+ uri = URI('http://192.168.80.21:8080/api/realtime.json')
+ body = test.to_json
+ res = Net::HTTP.new(uri.host, uri.port).start do |client|
+ request = Net::HTTP::Post.new(uri.path)
+ request.body = body
+ request["Content-Type"] = "application/json"
+ client.request(request)
+ end
+ result = JSON.parse(res.body)
+ @result = result[:result][0][:status]
end
private
diff --git a/app/views/homework_common/programing_test.js.erb b/app/views/homework_common/programing_test.js.erb
index 4f5b115db..b6bcfdc86 100644
--- a/app/views/homework_common/programing_test.js.erb
+++ b/app/views/homework_common/programing_test.js.erb
@@ -1,2 +1,2 @@
-$("#test_send_<%= @index%>").replaceWith("错误");
-$("#test_result_<%= @index%>").val("1");
\ No newline at end of file
+$("#test_send_<%= @index%>").replaceWith(" fl ml5 mt1'><%= @result == 0 ? '正确' : '错误'%>");
+$("#test_result_<%= @index%>").val("<%= @result%>");
\ No newline at end of file