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

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
Linda 2017-04-28 10:12:30 +08:00
parent d7c05853ff 849d00f068
commit fdf72d982a
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/myshixuns_controller.rb
View File

@ -14,7 +14,7 @@ class MyshixunsController < ApplicationController
jsonTestDetails = JSON.parse(params[:jsonTestDetails])
status = jsonTestDetails['status']
game_id = jsonTestDetails['buildID']
outPut = Base64.urlsafe_decode64(jsonTestDetails['outPut']) unless jsonTestDetails['outPut'].blank?
outPut = Base64.urlsafe_decode64(jsonTestDetails['outPut'].gsub(" ", "+")) unless jsonTestDetails['outPut'].blank?
jenkins_testsets = jsonTestDetails['msg']
# message = Base64.decode64(params[:msg]) unless params[:msg].blank?
game = Game.find(game_id)

4
app/helpers/application_helper.rb
View File

@ -131,6 +131,10 @@ module ApplicationHelper
return time
end
def consume_time time
time.strftime('%Y/%m/%d %H:%M:%S')
end
def avg_spend_time shixun_id, position
Game.find_by_sql("SELECT avg(g.updated_at - g.created_at) as avg_time FROM `games` g, `challenges` c where c.id=g.challenge_id and g.status =2 and c.position = #{position} and g.myshixun_id in (SELECT id FROM `myshixuns` where shixun_id= #{shixun_id});").first.try(:avg_time).to_i
end

30
app/views/games/_code_actions.html.erb
View File

@ -1,4 +1,4 @@
<span class="mt10 -flex c_grey ml15" id="time-consuming">耗时：<%= @consume_time %></span>
<span class="mt10 -flex c_grey ml15" id="time-consuming"></span>
<div id="code_estimate">
<% if @game.status == 0 %>
<a href="javascript:void(0)" class="task-btn task-btn-blue mr15 mt8" id="code_test" onclick="training_task_submmit();">评测</a>
@ -17,6 +17,34 @@
<% end %>
</div>
<script>
var cTime = 1;
var cm = setInterval(setTime, 1000);
function setTime(){
var startTime = 0; // 开始时间 - 毫秒
var endTime = 0; // 结束时间
var consumeTime = 0; // 耗时
<% if @game.status == 2 %>
startTime = (new Date("<%= consume_time(@game.open_time) %>")).getTime();
endTime = (new Date("<%= consume_time(@game.updated_at) %>")).getTime();
consumeTime = parseInt(endTime - startTime);
<% else %>
startTime = (new Date("<%= consume_time(@game.open_time) %>")).getTime();
endTime = (new Date("<%= consume_time(Time.now) %>")).getTime();
consumeTime = parseInt(endTime - startTime) + cTime * 1000;
cTime++;
<% end %>
formatDuring(consumeTime);
}
function formatDuring(time){
var days = parseInt(time / (1000 * 60 * 60 * 24));
var hours = parseInt((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
var minutes = parseInt((time % (1000 * 60 * 60)) / (1000 * 60));
var seconds = (time % (1000 * 60)) / 1000;
/* return days + " 天 " + hours + " 小时 " + minutes + " 分钟 " + seconds + " 秒 ";*/
$("#time-consuming").html("耗时：" + days + " 天 " + hours + " 小时 " + minutes + " 分钟 " + seconds + " 秒 ");
}
function training_task_submmit(){
$('#file_update_id').submit();
var i = 0;