jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
huang 2015-08-01 11:36:47 +08:00
parent 3b60d409d3 504d5a6b32
commit 2d6909b4ee
3 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/homework_common_controller.rb
View File

@ -1,6 +1,7 @@
class HomeworkCommonController < ApplicationController class HomeworkCommonController < ApplicationController
require 'net/http' require 'net/http'
require 'json' require 'json'
require "base64"
layout "base_courses" layout "base_courses"
before_filter :find_course, :only => [:index,:new,:create,:next_step] before_filter :find_course, :only => [:index,:new,:create,:next_step]
before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy] before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
@ -353,7 +354,7 @@ class HomeworkCommonController < ApplicationController
end end
def programing_test def programing_test
test = {language:params[:language],src:params[:src],input:[params[:input]],output:[params[:output]]} test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
@index = params[:index] @index = params[:index]
uri = URI('http://192.168.80.21:8080/api/realtime.json') uri = URI('http://192.168.80.21:8080/api/realtime.json')
body = test.to_json body = test.to_json
@ -364,8 +365,8 @@ class HomeworkCommonController < ApplicationController
client.request(request) client.request(request)
end end
result = JSON.parse(res.body) result = JSON.parse(res.body)
result[:results].each do |re| result["results"].each do |re|
@result = re[:status] @result = re["status"]
end end
end end

4
app/views/homework_common/index.html.erb
View File

@ -48,7 +48,8 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<% if homework.homework_type == 2 && homework.homework_detail_programing && @is_teacher%> <% if homework.homework_type == 2 && homework.homework_detail_programing%>
<% if @is_teacher%>
<table class="border_ce" cellpadding="0" cellspacing="0"> <table class="border_ce" cellpadding="0" cellspacing="0">
<tbody> <tbody>
<tr class="<%= cycle("", "b_grey") %>"> <tr class="<%= cycle("", "b_grey") %>">
@ -72,6 +73,7 @@
</tbody> </tbody>
</table> </table>
<div class="cl"></div> <div class="cl"></div>
<% end%>
<div class="mt5"> <div class="mt5">
<span class="tit_fb" style="width: auto;"> 开发语言：</span> <span class="tit_fb" style="width: auto;"> 开发语言：</span>

4
app/views/student_work/index.html.erb
View File

@ -137,6 +137,7 @@
<div class="cl"></div> <div class="cl"></div>
<% if @homework.homework_type == 2 && @homework.homework_detail_programing%> <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
<% if @is_teacher%>
<table class="border_ce" cellpadding="0" cellspacing="0"> <table class="border_ce" cellpadding="0" cellspacing="0">
<tbody> <tbody>
<tr class="<%= cycle("", "b_grey") %>"> <tr class="<%= cycle("", "b_grey") %>">
@ -147,7 +148,7 @@
输出 输出
</td> </td>
</tr> </tr>
<% @homework.homework_tests.each do |test|%> <% homework.homework_tests.each do |test|%>
<tr class="<%= cycle("", "b_grey") %>"> <tr class="<%= cycle("", "b_grey") %>">
<td class="td_tit"> <td class="td_tit">
<%=test.input%> <%=test.input%>
@ -160,6 +161,7 @@
</tbody> </tbody>
</table> </table>
<div class="cl"></div> <div class="cl"></div>
<% end%>
<div class="mt5"> <div class="mt5">
<span class="tit_fb" style="width: auto;"> 开发语言：</span> <span class="tit_fb" style="width: auto;"> 开发语言：</span>