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

Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 

Conflicts:
	app/controllers/games_controller.rb
This commit is contained in:
huang 2017-03-20 11:26:28 +08:00
parent 563febc7c4 d3d3dc0c5c
commit 072c9550fc
5 changed files with 84 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/games_controller.rb
View File

@ -1,7 +1,7 @@
class GamesController < ApplicationController class GamesController < ApplicationController
layout "base_myshixun" layout "base_myshixun"
before_filter :find_myshixun, :only => [:index] before_filter :find_myshixun, :only => [:index]
before_filter :find_game, :only => [:show, :game_build, :entry,:next_step, :output_show, :file_edit, :file_update] before_filter :find_game, :only => [:show, :game_build, :entry,:next_step, :output_show, :file_edit, :file_update, :game_status]
before_filter :find_repository, :only => [:show, :entry, :file_edit, :file_update] before_filter :find_repository, :only => [:show, :entry, :file_edit, :file_update]
before_filter :allowd_manager, :only => [:game_build] before_filter :allowd_manager, :only => [:game_build]
include ApplicationHelper include ApplicationHelper
@ -76,9 +76,6 @@ class GamesController < ApplicationController
@outputs = @game.outputs @outputs = @game.outputs
end end
respond_to do |format|
format.js
end
end end

72
app/views/games/_exec_results.html.erb
View File

@ -1,4 +1,11 @@
<div class=" col-width fl content-history mt15" > <%= content_for(:header_tags) do %>
<%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %>
<% end %>
<div id="code_results">
</div>
<script id="t:exec_results" type="text/html">
<div class=" col-width fl content-history mt15" >
<div class="panel-header clearfix"> <div class="panel-header clearfix">
<h3 class="fl">测评历史</h3> <h3 class="fl">测评历史</h3>
<div class="fr mt5"> <div class="fr mt5">
@ -17,55 +24,68 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div> </div>
<div class=" col-width fl content-output ml15 mt15"> <div class=" col-width fl content-output ml15 mt15">
<div class="panel-header "> <div class="panel-header ">
<h3 >测试输出</h3> <h3 >测试输出</h3>
</div> </div>
<div class="content-history-inner"> <div class="content-history-inner">
Thor position=(32,4).Light position={32,4}<br/> 999999
Engryg=74
</div> </div>
</div> </div>
<div class=" col-width fl content-submit ml15 mt15"> <div class=" col-width fl content-submit ml15 mt15">
<div class="panel-header "> <div class="panel-header ">
<h3 >操作</h3> <h3 >操作</h3>
</div> </div>
<div class="content-submitbox"> <div class="content-submitbox">
<a href="#" class="task-btn mb10 ">保存修改</a> <a href="#" class="task-btn mb10 ">保存修改</a>
<% if @game.status == 0 %>
<! if(status == 0){ !>
<div id="game_commit"> <div id="game_commit">
<%= link_to "提交评测", {:controller => 'games', :action => "game_build", :id => @game, :myshixun_id => @myshixun}, :class => "task-btn task-btn-green", :onclick => "training_task_submmit();", :remote => true %> <a href="javascript:void(0)" class="task-btn task-btn-green" onclick="training_task_submmit();">提交评测</a>
</div> </div>
<% elsif @game.status == 1 %> <! }else if(status == 1){ !>
<a class="task-btn mb10">评测中..</a> <a class="task-btn mb10">评测中..</a>
<% elsif @game.status == 2 %> <! }else if(status == 2){ !>
<%= link_to "下 一 步", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun}, :class => "task-btn task-btn-green", :onclick => "training_task_submmit();", :remote => true %> <%= link_to "下 一 步", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun}, :class => "task-btn task-btn-green", :onclick => "training_task_submmit();", :remote => true %>
<% end %> <! } !>
</div> </div>
</div> </div>
</script>
<script >
var bt = baidu.template;
bt.LEFT_DELIMITER = '<!';
bt.RIGHT_DELIMITER = '!>';
$(function(){
var html = bt('t:exec_results',{status: <%= @game.status %>});
$("#code_results").html(html);
});
<script>
function training_task_submmit(){ function training_task_submmit(){
$.ajax('game_build', function(){ $.ajax({
$("#game_commit").html("<span class='task-btn task-btn-green'>当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>"); url: '<%= game_build_myshixun_game_path(@game, @myshixun) %>',
success: function (){
$("#training_tasl_commit").html("<span class='task-display-span alert-blue mt10'>当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>");
//循环等1分钟 //循环等1分钟
alert("111");
var intId = setInterval(function(){ var intId = setInterval(function(){
$.ajax('game_status', function(data){ $.ajax({
url: '<%= game_status_myshixun_game_path(@game) %>',
data:'test',
success:function(data){
//如果查到了，就退出 //如果查到了，就退出
alert(data.status);
clearInterval(intId); clearInterval(intId);
var html = bt('t:exec_results',{status: 2});
$("#code_results").html(data); console.log(html);
$("#code_results").html(html);
}); }
}, 2000);
}); });
}, 6000);
}
})
} }
</script> </script>

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

@ -41,10 +41,8 @@
<div id="code_content"> <div id="code_content">
<%= render :partial => 'repository' %> <%= render :partial => 'repository' %>
</div> </div>
<div id="code_results">
<%= render :partial => 'exec_results' %> <%= render :partial => 'exec_results' %>
</div> </div>
</div>
</div> </div>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">

22
app/views/training_tasks/_action_status.html.erb
View File

@ -1,3 +1,4 @@
<%# activity = activity.nil? ? local_assigns[:activity] : activity %> <%# activity = activity.nil? ? local_assigns[:activity] : activity %>
<div class="mb10"> <div class="mb10">
<% if activity.status == 1 %> <% if activity.status == 1 %>
@ -14,27 +15,6 @@
</div> </div>
<script> <script>
function training_task_submmit(){
$.ajax('game_build', function(){
$("#training_tasl_commit").html("<span class='task-display-span alert-blue mt10'>当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>");
//循环等1分钟
var intId = setInterval(function(){
$.ajax('game_status', function(data){
//如果查到了，就退出
clearInterval(intId);
$("#code_results").html(data);
});
}, 2000);
});
}
</script> </script>

2
public/stylesheets/css/taskstyle.css
View File

@ -139,7 +139,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
.task-header-navs li{ float: left;} .task-header-navs li{ float: left;}
.task-header-navs li a{ display: block; height: 50px; padding:0 50px; color:#fff; text-align: center; font-size: 16px; line-height: 50px;} .task-header-navs li a{ display: block; height: 50px; padding:0 50px; color:#fff; text-align: center; font-size: 16px; line-height: 50px;}
.task-header-navs li a:hover,.task-header-navs li a.active{ background:#29bd8b;} .task-header-navs li a:hover,.task-header-navs li a.active{ background:#29bd8b;}
.task-pm-content{ width: 1000px; margin: 0 auto; } .task-pm-content{ width: 1000px; margin: 0 auto; min-height:566px}
.task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;} .task-pm-box{ width: 100%; background: #fff; border: 1px solid #e8e8e8;}
.task-paner-con{ padding:15px; color:#666; line-height:2.0;} .task-paner-con{ padding:15px; color:#666; line-height:2.0;}
.panel-form{ width:800px; margin:0 100px; padding:30px 0; line-height: 40px; } .panel-form{ width:800px; margin:0 100px; padding:30px 0; line-height: 40px; }