From 14958006b84ce60798b9a25bd0553f7ecaa6e711 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Sat, 19 Oct 2019 16:41:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=AB=9E=E8=B5=9Bapi=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/competitions/competitions_controller.rb | 2 +- app/helpers/competitions_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 03a276952..a17564737 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -160,7 +160,7 @@ class Competitions::CompetitionsController < Competitions::BaseController @competition_head_cells = %w(序号 战队名 指导老师 队员 学校) end - statistic_stages = competition.competition_stages.where("rate > 0") + statistic_stages = competition.competition_stages.where("score_rate > 0") statistic_stages.each do |stage| @competition_head_cells += ["#{stage.name}得分", "#{stage.name}用时"] end diff --git a/app/helpers/competitions_helper.rb b/app/helpers/competitions_helper.rb index 66c7eec41..9e3e7f62a 100644 --- a/app/helpers/competitions_helper.rb +++ b/app/helpers/competitions_helper.rb @@ -44,7 +44,7 @@ module CompetitionsHelper statistic_stages.each do |stage| if stage.max_end_time && stage.max_end_time < Time.now - stages << {id: stage.id, name: "#{stage.name}排行榜", rate: stage.rate, start_time: stage.min_start_time, end_time: stage.max_end_time} + stages << {id: stage.id, name: "#{stage.name}排行榜", rate: stage.score_rate, start_time: stage.min_start_time, end_time: stage.max_end_time} end end From 9f351aa8b08ccfa96fb5f5cea56299fae5e07a97 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 19 Oct 2019 20:14:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?vnc=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 2 +- app/views/games/show.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 8a3999410..2441037b0 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -60,7 +60,7 @@ class GamesController < ApplicationController praise_count: praise_count, user_praise: user_praise, time_limit: time_limit, tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher, myshixun_manager: myshixun_manager, git_url: (@shixun.vnc ? repo_url(@myshixun.repo_path) : "")} - if @shixun.vnc + if @shixun.vnc && @st == 0 get_vnc_link(@game) end diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 048188746..7c9d1f22a 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1,7 +1,7 @@ json.(@base_date, :st, :discusses_count, :game_count, :record_onsume_time, :prev_game, :next_game, :praise_count, :user_praise, :time_limit, :tomcat_url, :is_teacher, :myshixun_manager, :game, :challenge, :shixun, :myshixun, :git_url) -if @shixun.vnc +if @shixun.vnc && @st == 0 json.vnc_url @vnc_url json.vnc_evaluate @vnc_evaluate end From 46c13a1df5b561a388138a9916a85e5eb3dd3809 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 19 Oct 2019 20:41:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?vnc=E5=AE=9E=E8=AE=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 8a3999410..78f665b3d 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -55,7 +55,7 @@ class GamesController < ApplicationController # 选择题和编程题公共部分 @base_date = {st: @st, discusses_count: discusses_count, game_count: game_count, myshixun: @myshixun, - challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.try(:attributes), + challenge: game_challenge.attributes.except("answer"), game: @game.try(:attributes), shixun: @shixun.attributes.except("vnc", "vnc_evaluate"), record_onsume_time: record_onsume_time, prev_game: prev_game, next_game: next_game, praise_count: praise_count, user_praise: user_praise, time_limit: time_limit, tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher, From ec08589dd39d525fed1316c647cfa52e3a09cbc6 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 19 Oct 2019 21:48:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?VNC=E5=AE=9E=E8=AE=AD=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A2=98=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 2 +- app/views/games/show.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 78f665b3d..5a86fa06e 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -60,7 +60,7 @@ class GamesController < ApplicationController praise_count: praise_count, user_praise: user_praise, time_limit: time_limit, tomcat_url: edu_setting('cloud_tomcat_php'), is_teacher: is_teacher, myshixun_manager: myshixun_manager, git_url: (@shixun.vnc ? repo_url(@myshixun.repo_path) : "")} - if @shixun.vnc + if @shixun.vnc && @st == 0 get_vnc_link(@game) end diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder index 048188746..7c9d1f22a 100644 --- a/app/views/games/show.json.jbuilder +++ b/app/views/games/show.json.jbuilder @@ -1,7 +1,7 @@ json.(@base_date, :st, :discusses_count, :game_count, :record_onsume_time, :prev_game, :next_game, :praise_count, :user_praise, :time_limit, :tomcat_url, :is_teacher, :myshixun_manager, :game, :challenge, :shixun, :myshixun, :git_url) -if @shixun.vnc +if @shixun.vnc && @st == 0 json.vnc_url @vnc_url json.vnc_evaluate @vnc_evaluate end From 509c081a155612aff571180e3cb9e9e2d1a9df82 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 19 Oct 2019 23:14:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AD=94=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 5a86fa06e..8c777a214 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -881,7 +881,7 @@ class GamesController < ApplicationController end # actual_output为空表示暂时没有评测答题，不允许查看 actual_output = output.try(:actual_output).try(:strip) - #has_answer << choose.answer if choose.answer.present? + has_answer << choose.answer if choose.answer.present? # 标准答案处理，错误的不让用户查看，用-1替代 standard_answer = (actual_output.blank? || !output.try(:result)) ? -1 : choose.standard_answer result = output.try(:result) @@ -892,7 +892,7 @@ class GamesController < ApplicationController @chooses << sin_choose test_sets << sin_test_set end - @has_answer = true # 选择题永远都有答案 + @has_answer = has_answer.presence @choose_test_cases = {:had_submmit => had_submmit, :challenge_chooses_count => challenge_chooses_count, :choose_correct_num => choose_correct_num, :test_sets => test_sets} end From 6a374a3f2570fc911f0cba6a043bc74bf517f241 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sat, 19 Oct 2019 23:31:39 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E7=AD=94?= =?UTF-8?q?=E6=A1=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 5a86fa06e..97c3dc6e2 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -881,7 +881,7 @@ class GamesController < ApplicationController end # actual_output为空表示暂时没有评测答题，不允许查看 actual_output = output.try(:actual_output).try(:strip) - #has_answer << choose.answer if choose.answer.present? + has_answer << choose.answer if choose.answer.present? # 标准答案处理，错误的不让用户查看，用-1替代 standard_answer = (actual_output.blank? || !output.try(:result)) ? -1 : choose.standard_answer result = output.try(:result) @@ -892,7 +892,7 @@ class GamesController < ApplicationController @chooses << sin_choose test_sets << sin_test_set end - @has_answer = true # 选择题永远都有答案 + @has_answer = has_answer.presence # 选择题永远都有答案 @choose_test_cases = {:had_submmit => had_submmit, :challenge_chooses_count => challenge_chooses_count, :choose_correct_num => choose_correct_num, :test_sets => test_sets} end From 4bc32cb9e98df675f31e9078b92143c682476dff Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 21 Oct 2019 08:58:03 +0800 Subject: [PATCH 7/7] vnc --- public/react/src/context/TPIContextProvider.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js index ee01c3c72..bcd470134 100644 --- a/public/react/src/context/TPIContextProvider.js +++ b/public/react/src/context/TPIContextProvider.js @@ -435,6 +435,9 @@ pop_box_new(htmlvalue, 480, 182); // TODO 测试 // resData.power = 0; + resData.shixun.vnc = !!resData.vnc_url + resData.shixun.vnc_evaluate = resData.vnc_evaluate + this.setState({ ...resData,