From 57f61361bcfc058a525f5f5781b03829cf4ea854 Mon Sep 17 00:00:00 2001 From: Linda <2294690300@qq.com> Date: Thu, 27 Apr 2017 17:19:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?loading=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_edu.html.erb | 2 +- public/images/bigdata/loading.gif | Bin 0 -> 33002 bytes public/stylesheets/css/bigdata-common.css | 30 +++++++++------------- 3 files changed, 13 insertions(+), 19 deletions(-) create mode 100644 public/images/bigdata/loading.gif diff --git a/app/views/layouts/base_edu.html.erb b/app/views/layouts/base_edu.html.erb index 293514d5b..249a76f97 100644 --- a/app/views/layouts/base_edu.html.erb +++ b/app/views/layouts/base_edu.html.erb @@ -28,7 +28,7 @@
diff --git a/public/images/bigdata/loading.gif b/public/images/bigdata/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..c6aeed4dc972739ef25dec42fd3dd401047d6c3a GIT binary patch literal 33002 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%0A4DnUn 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/css/bigdata-common.css b/public/stylesheets/css/bigdata-common.css index 4647f5aff..fac6506cf 100644 --- a/public/stylesheets/css/bigdata-common.css +++ b/public/stylesheets/css/bigdata-common.css @@ -127,29 +127,23 @@ a:hover.task-btn-ver{background:#5f7cab;} /*pre标签换行*/ .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap !important;word-break: break-all;} - .pr {position:relative;} -/***** Ajax indicator ******/ +/***** loading ******/ #ajax-indicator { position: absolute; /* fixed not supported by IE */ - background-color:#eee; - border: 1px solid #bbb; - top:35%; - left:40%; - width:20%; - font-weight:bold; - text-align:center; - padding:0.6em; - z-index:100; - opacity: 0.5; + top:0%; + left:0%; + width:100%; + height:100%; + z-index:1000; + color:#fff; } - -html>body #ajax-indicator { position: fixed; } - +html>body #ajax-indicator { position: fixed;padding:20% 45%; } #ajax-indicator span { - background-position: 0% 40%; + display: block; + left:30%; background-repeat: no-repeat; - background-image: url(/images/loading.gif); - padding-left: 26px; + background-image: url(/images/bigdata/loading.gif); + padding:55px; vertical-align: bottom; } From d65e95ba7da4980322fb7e38595b6b91b04b50c8 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 4 May 2017 16:59:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BAnil=E6=97=B6500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/myshixuns_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index d291ff729..9e1955079 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -29,9 +29,8 @@ class MyshixunsController < ApplicationController game_outputs = Output.create(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'], :actual_output => actual_output, :result => j_test_set['passed'].to_i) else - output.update_attributes(:code => status, :out_put => outPut, :actual_output => actual_output.force_encoding("utf-8"), :result => j_test_set['passed'].to_i) + output.update_attributes(:code => status, :out_put => outPut, :actual_output => actual_output, :result => j_test_set['passed'].to_i) end - end end if status == "0" From ea0d90a3834e567c6f37a469c0065a30aca5d33b Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 4 May 2017 17:29:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 13 ++++++++++--- app/controllers/myshixuns_controller.rb | 3 +-- app/helpers/application_helper.rb | 2 +- app/models/game.rb | 3 +-- app/views/challenges/_form.html.erb | 4 ++-- app/views/games/_code_actions.html.erb | 2 +- .../20170504065145_add_answer_open_to_games.rb | 6 ++++++ db/migrate/20170504070210_sync_end_time_for_game.rb | 8 ++++++++ 8 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20170504065145_add_answer_open_to_games.rb create mode 100644 db/migrate/20170504070210_sync_end_time_for_game.rb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 61dcc454d..b7b45f2f3 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -161,14 +161,21 @@ class GamesController < ApplicationController redirect_to myshixun_game_path(@game, :myshixun_id => @myshixun) end + # @myshixun -status 1:完成实训 def game_status game_challenge = @game.challenge # @had_done 1 已通关 (@myshixun.games.count == game_challenge.position && @game.status ==2) ? had_done = 1 : had_done = 0 - # 下一关自动开启 - if had_done != 1 && @game.status == 2 - @game.next_game.update_attribute(:status, 0) + # 全部通关奖励1000分 + if had_done == 1 + reward_grade(@game.user, @game.id, @game.class, 1000) @myshixun.update_attribute(:status, 1) + else + # 通过当前一关 + if @game.status == 2 + @game.next_game.update_attribute(:status, 0) + reward_grade(@game.user, @game.id, @game.class, game_challenge.score) + end end test_sets = game_challenge.test_sets unless test_sets.blank? diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index 9e1955079..b9857a689 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -34,8 +34,7 @@ class MyshixunsController < ApplicationController end end if status == "0" - game.update_attribute(:status, 2) - game.update_attribute(:final_score, challenge.score) + game.update_attributes!(:status => 2, :final_score => challenge.score, :end_time => Time.now) else game.update_attribute(:status, 0) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 383651ffa..65bfb0a05 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper def reward_grade(user, container_id, container_type, score) grade = Grade.where(:user_id => user.id, :container_id => container_id, :container_type => container_type).first unless grade.nil? - user.update_column(:grade, (500 + user.grade.to_i)) + user.update_column(:grade, (score.to_i + user.grade.to_i)) Grade.create!(:user_id => user.id, :container_id => container_id, :container_type => container_type, :score => score) end end diff --git a/app/models/game.rb b/app/models/game.rb index 0bed87484..79f4426fe 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,7 +1,7 @@ class Game < ActiveRecord::Base # stauts 0: can exe 1：doing 2：successed 3:locked default_scope :order => 'created_at desc' - attr_accessible :myshixun_id, :user_id, :status, :final_score, :challenge_id, :open_time, :identifier + attr_accessible :myshixun_id, :user_id, :status, :final_score, :challenge_id, :open_time, :identifier, :answer_open, :end_time belongs_to :myshixun,:touch=> true belongs_to :user belongs_to :challenge @@ -14,7 +14,6 @@ class Game < ActiveRecord::Base identifier end - def last_game challenge = self.challenge last_challenge_id = challenge.last_challenge diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index 62cb6a08e..ba39f7da9 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -104,11 +104,11 @@
  • - <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：app/controllers/welcome_controller.rb", :maxlength => "256" %> + <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：src/test/welcome.java", :maxlength => "256" %>
  • - <%= f.text_field :exec_path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "输入关卡需要执行的文件路径，如：app/controllers/welcome_controller.rb", :maxlength => "256" %> + <%= f.text_field :exec_path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "输入关卡需要执行的文件路径，如：src/test/main.java", :maxlength => "256" %>
  • diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index a4d8d81f2..cc1ed0a20 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -26,7 +26,7 @@ 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(); + endTime = (new Date("<%= consume_time(@game.end_time) %>")).getTime(); consumeTime = parseInt(endTime - startTime); <% else %> startTime = (new Date("<%= consume_time(@game.open_time) %>")).getTime(); diff --git a/db/migrate/20170504065145_add_answer_open_to_games.rb b/db/migrate/20170504065145_add_answer_open_to_games.rb new file mode 100644 index 000000000..575705586 --- /dev/null +++ b/db/migrate/20170504065145_add_answer_open_to_games.rb @@ -0,0 +1,6 @@ +class AddAnswerOpenToGames < ActiveRecord::Migration + def change + add_column :games, :answer_open, :boolean, :default => false + add_column :games, :end_time, :datetime + end +end diff --git a/db/migrate/20170504070210_sync_end_time_for_game.rb b/db/migrate/20170504070210_sync_end_time_for_game.rb new file mode 100644 index 000000000..e495f56c3 --- /dev/null +++ b/db/migrate/20170504070210_sync_end_time_for_game.rb @@ -0,0 +1,8 @@ +class SyncEndTimeForGame < ActiveRecord::Migration + def change + games = Game.all + games.each do |game| + game.update_column(:end_time, game.updated_at) + end + end +end From 9bf33e4fe3e8b199665147fa6bce927c66ef6a9d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 5 May 2017 14:57:58 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=AD=94=E6=A1=88?= =?UTF-8?q?=E6=89=A3=E9=99=A4=E7=A7=AF=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 41 ++++++++++++++----- app/views/games/_acquire_answer.html.erb | 16 ++++++++ .../games/_game_answer_error_pop.html.erb | 17 ++++++++ app/views/games/_game_answer_tip_pop.html.erb | 31 ++++++++++++++ app/views/games/_game_show.html.erb | 27 ++++++------ app/views/games/answer.js.erb | 10 +++++ app/views/games/minus_score.js.erb | 5 +++ app/views/layouts/base_myshixun.html.erb | 4 +- app/views/shixuns/_shixun_list.html.erb | 10 ++--- config/routes.rb | 1 + 10 files changed, 131 insertions(+), 31 deletions(-) create mode 100644 app/views/games/_acquire_answer.html.erb create mode 100644 app/views/games/_game_answer_error_pop.html.erb create mode 100644 app/views/games/_game_answer_tip_pop.html.erb create mode 100644 app/views/games/answer.js.erb create mode 100644 app/views/games/minus_score.js.erb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index b7b45f2f3..ac4e37ded 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -3,7 +3,7 @@ class GamesController < ApplicationController layout "base_myshixun" skip_before_filter :verify_authenticity_token, :only => [:file_update] before_filter :find_myshixun, :only => [:index] - before_filter :find_game, :only => [:show, :game_build, :entry,:next_step, :outputs_show, :file_edit, :file_update, :game_status, :change_status, :answer] + before_filter :find_game, :only => [:show, :game_build, :entry,:next_step, :outputs_show, :file_edit, :file_update, :game_status, :change_status, :answer, :minus_score] before_filter :find_repository, :only => [:show, :entry, :file_edit, :file_update] before_filter :allowd_manager before_filter :allowd_view, :only => [:show] @@ -223,21 +223,40 @@ class GamesController < ApplicationController # 如果已看过，下次可以免费查看 # viewed 1: 直接查看 2：弹框提示将要扣除积分，确定后显示内容 3：弹框提示分数不够 def answer + challenge = @game.challenge + user = User.current + @challenge_score = challenge.score.to_i + user_score = user.grade.to_i + @score = user_score - @challenge_score + # 已经开启过 + @answer = challenge.answer + if @game.answer_open + @viewed = 1 + else + if @score >= 0 + @viewed = 2 + else + @viewed = 3 + end + end + respond_to do |format| + format.js + end + end + + def minus_score challenge = @game.challenge user = User.current challenge_score = challenge.score.to_i user_score = user.grade.to_i @score = user_score - challenge_score - # 已经开启过 - if @game.answer_open - render :json => {:answer => challenge.answer, :viewed => 1} - else - if @score > 0 - user.update_column(:grade, @score) - render :json => {:answer => challenge.answer, :viewed => 2} - else - render :json => {:answer => false, :viewed => 3} - end + @answer = challenge.answer + + user.update_column(:grade, @score) + @game.update_column(:answer_open, true) + + respond_to do |format| + format.js end end diff --git a/app/views/games/_acquire_answer.html.erb b/app/views/games/_acquire_answer.html.erb new file mode 100644 index 000000000..a5043fabc --- /dev/null +++ b/app/views/games/_acquire_answer.html.erb @@ -0,0 +1,16 @@ +
    +
    +
    + +
    +
    +
    + \ No newline at end of file diff --git a/app/views/games/_game_answer_error_pop.html.erb b/app/views/games/_game_answer_error_pop.html.erb new file mode 100644 index 000000000..549cfb593 --- /dev/null +++ b/app/views/games/_game_answer_error_pop.html.erb @@ -0,0 +1,17 @@ +
    +
    +

    提示

    +     +
    +
    +
    +
      +
    • + 333333333333333333333333333 +
      • +
    +
    +
    + \ No newline at end of file diff --git a/app/views/games/_game_answer_tip_pop.html.erb b/app/views/games/_game_answer_tip_pop.html.erb new file mode 100644 index 000000000..ff3fbfc8a --- /dev/null +++ b/app/views/games/_game_answer_tip_pop.html.erb @@ -0,0 +1,31 @@ +
    +
    +

    提示

    + +
    +
    +
    + <% if @viewed == 2 %> +
      +
    • + 将扣除<%= @challenge_score %>点积分
      是否确认查看答案 +
      • +
      + 取消 + 确定 +
      + <% else %> +
    • + 本操作需要扣除<%= @challenge_score %>点积分
      你的积分不够 +
      • + <% end %> +
    +
    +
    + \ No newline at end of file diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index 984e9d5bc..ca63de3dc 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -18,12 +18,13 @@
  • 预备知识
    • -
  • - <% if @game.answer_open %> +
  • + 参考答案 +
    • 经验值：<%= @game_challenge.score %> @@ -51,9 +52,8 @@
    - +
    -
    @@ -119,13 +119,7 @@ flowChart : true, // 默认不解析 sequenceDiagram : true // 默认不解析 }); - answer_md = editormd.markdownToHTML("game_answer_show", { - htmlDecode : "style,script,iframe", // you can filter tags decode - taskList : true, - tex : false, // 数学公式 - flowChart : true, // 默认不解析 - sequenceDiagram : true // 默认不解析 - }); + /* myCodeMirror.setSize("auto", "auto");//设置版本库codemirror的高度 $("#game_answer_show").find(".CodeMirror-scroll").css("margin-bottom", 0); $("#game_answer_show" ).children(".CodeMirror").css("line-height", 1.2); @@ -133,6 +127,11 @@ // 设置图片最大宽度不能超出边框 $('#task_pass_contents').find('img').css("max-width", "100%"); }); + $("#tab_nav_3").click(function(){ + $.ajax({ + url: '<%= answer_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' + '.js' + }); + }); function error_correction_pop(){ var htmlvalue = "<%= escape_javascript(render :partial => 'games/send_error_pop') %>"; pop_box_new(htmlvalue,460,316); diff --git a/app/views/games/answer.js.erb b/app/views/games/answer.js.erb new file mode 100644 index 000000000..15f9926bb --- /dev/null +++ b/app/views/games/answer.js.erb @@ -0,0 +1,10 @@ +<% if @viewed == 1 %> + $("#tab_con_3").html('<%= j (render :partial => 'games/acquire_answer') %>'); + $("#tab_nav_1").removeClass('tab_hover'); + $("#tab_nav_2").removeClass('tab_hover'); + $("#tab_nav_3").addClass('tab_hover'); + $("#tab_con_3").show(); +<% else %> + var htmlvalue = "<%= escape_javascript(render :partial => 'game_answer_tip_pop') %>"; + pop_box_new(htmlvalue,460,300); +<% end %> \ No newline at end of file diff --git a/app/views/games/minus_score.js.erb b/app/views/games/minus_score.js.erb new file mode 100644 index 000000000..c9c8dd115 --- /dev/null +++ b/app/views/games/minus_score.js.erb @@ -0,0 +1,5 @@ +$("#tab_con_3").html('<%= j (render :partial => 'games/acquire_answer') %>'); +$("#tab_nav_1").removeClass('tab_hover'); +$("#tab_nav_2").removeClass('tab_hover'); +$("#tab_nav_3").addClass('tab_hover'); +$("#tab_con_3").show(); diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index 34640f39c..3ea92ba82 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/app/views/layouts/base_myshixun.html.erb @@ -58,12 +58,14 @@ - - - - - -<% if false %> - - - - -<% end %> \ No newline at end of file + \ No newline at end of file diff --git a/db/migrate/20170505032131_add_is_public_to_outputs.rb b/db/migrate/20170505032131_add_is_public_to_outputs.rb new file mode 100644 index 000000000..ae96cde60 --- /dev/null +++ b/db/migrate/20170505032131_add_is_public_to_outputs.rb @@ -0,0 +1,5 @@ +class AddIsPublicToOutputs < ActiveRecord::Migration + def change + add_column :outputs, :is_public, :boolean + end +end From ead40dda018e22cecbf30fb6af0bd1cc4ec31058 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 5 May 2017 16:37:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?ajax=E5=8A=A0=E8=BD=BD=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/edu-common.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index f34d85950..bcf108076 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -138,13 +138,14 @@ a:hover.task-btn-ver{background:#5f7cab;} z-index:1000; color:#fff; } -html>body #ajax-indicator { position: fixed;padding:20% 45%; } + +html>body #ajax-indicator { position: fixed; } + #ajax-indicator span { - display: block; - left:30%; + background-position: 0% 40%; background-repeat: no-repeat; - background-image: url(/images/bigdata/loading.gif); - padding:55px; + background-image: url(../images/loading.gif); + padding-left: 26px; vertical-align: bottom; }