From 8439e73c7c1e3b672c1351d0c6784f79fa24953f Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 10 Apr 2017 11:23:49 +0800 Subject: [PATCH 01/74] =?UTF-8?q?ignore=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..bb4b68554 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +*.swp +/.project +/.idea +/.bundle +*.swp +/config/database.yml +/config/configuration.yml +/config/additional_environment.rb +/config/oneapm.yml +/config/environments/production.rb + + +/files/* +/log/* +/public/tmp/* +/tmp/* +/public/cache/* +/config/newrelic.yml +/public/images/avatars/* +/db/schema.rb +/Gemfile.lock +/lib/plugins/acts_as_versioned/test/debug.log +.rbenv-gemsets +.DS_Store +public/api_doc/ +/.metadata +vendor/cache +/files +/public/images/avatars +/public/files +/tags +/config/initializers/gitlab_config.rb +1234567 +public/javascripts/wechat/node_modules/ +.ruby-version +.access_token +tmux*.log +config/wechat.yml +config/oneapm.yml From e7aaf0941006a1ee0236fb2dd550e45523f886d4 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 10 Apr 2017 16:19:17 +0800 Subject: [PATCH 02/74] =?UTF-8?q?editorMD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 28 +++++++++++++++++----------- app/views/challenges/show.html.erb | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index ababe3b8e..d06791a90 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -7,17 +7,23 @@ @@ -57,7 +63,7 @@
<%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %> - +
<%#= f.kindeditor :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务", :width=>'87.5%', :height => 159, :resizeType => 0, :no_label => true %> diff --git a/app/views/challenges/show.html.erb b/app/views/challenges/show.html.erb index 0e3e60090..1364e7414 100644 --- a/app/views/challenges/show.html.erb +++ b/app/views/challenges/show.html.erb @@ -48,7 +48,7 @@
  • -
    +
    <%#= @challenge.ready_knowledge.blank? ? "无" : (h @challenge.ready_knowledge.html_safe) %> From 0aec565f5eaec2396529d327ffc8f3dd0cdb5cfd Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 10 Apr 2017 16:33:34 +0800 Subject: [PATCH 03/74] =?UTF-8?q?editorMD=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index d06791a90..ec025c3f7 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -21,7 +21,18 @@ //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。 saveHTMLToTextarea : true, // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标 - placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息" + placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息", + imageUpload : true, + imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"], + imageUploadURL : "" //url + /* + 上传的后台只需要返回一个 JSON 数据，结构如下： + { + success : 0 | 1, // 0 表示上传失败，1 表示上传成功 + message : "提示的信息，上传成功或上传失败及错误信息等。", + url : "图片地址" // 上传成功时才返回 + } + */ }); }); From fa21ceb07b86624c30fce9309b815ceeeebbbb92 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 10 Apr 2017 16:58:24 +0800 Subject: [PATCH 04/74] =?UTF-8?q?Codemirror=E6=A0=B7=E5=BC=8F=E5=BD=B1?= =?UTF-8?q?=E5=93=8DeditorMD=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index ec025c3f7..26004ac79 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -4,7 +4,17 @@ <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min' %> <%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> - + <% end %> From 7a59b013a007e391da1547f5d9ca38fc831480b6 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 11 Apr 2017 11:09:06 +0800 Subject: [PATCH 09/74] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 9 +++++++-- app/helpers/application_helper.rb | 2 +- app/views/repositories/_shixun_dir_list_content.html.erb | 1 - app/views/shixuns/_shixun_top.html.erb | 5 ++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index bd92c6b9e..0511f8375 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -22,11 +22,16 @@ class ShixunsController < ApplicationController # copy_shixun：复制一个新的实训模块包括版本库 # copy_myshixun自动创建系列game,game中只包含状态等信息，公共信息从Challeges中读取 - # + # 开启过实训的则直接跳入my实训页面 def shixun_exec - if has_exec_cur_shixun(@shixun) || User.current.id == @shixun.user_id + unless allow_shixun_exec(@shixun) render_403 end + myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first + unless myshixun.blank? + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun.id) + return + end repository = @shixun.repository ActiveRecord::Base.transaction do begin diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e9de11325..1799122c7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -276,7 +276,7 @@ module ApplicationHelper end def allow_shixun_exec shixun - (User.current.logged? && User.current.id != shixun.user_id && shixun.status == 1) + (User.current.logged? && User.current.id != shixun.user_id && shixun.challenges.count > 0 && !shixun.repository.blank?) end # 通过系统外部邮箱查找用户，如果用户不存在则用邮箱替换 diff --git a/app/views/repositories/_shixun_dir_list_content.html.erb b/app/views/repositories/_shixun_dir_list_content.html.erb index 79a9d1512..ab6493cfa 100644 --- a/app/views/repositories/_shixun_dir_list_content.html.erb +++ b/app/views/repositories/_shixun_dir_list_content.html.erb @@ -16,7 +16,6 @@ :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev, - :depth => (depth + 1), :parent_id => tr_id)) %>');">  <% end %> diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb index c61030f1e..7f95a51b6 100644 --- a/app/views/shixuns/_shixun_top.html.erb +++ b/app/views/shixuns/_shixun_top.html.erb @@ -6,10 +6,9 @@ /

    <%= @shixun.name %>

    <% if allow_shixun_exec(@shixun) %> - <%= link_to "开始挑战", shixun_monitor_shixun_path(@shixun), + <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", - :id => "challenge_begin", - :remote => true %> + :id => "challenge_begin" %> <% end %>
    From ca2e7a9c6c3e2d481d655f17245f416a661fe2a4 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 11 Apr 2017 13:53:01 +0800 Subject: [PATCH 10/74] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPM=E8=BF=87=E5=85=B3?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BD=BF=E7=94=A8MD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 46 ++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index 138a93fd2..7c65026c2 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -45,6 +45,34 @@ } */ }); + taskpass_editormd = editormd("challenge_task_pass", { + width : "89.6%", + height : 300, + syncScrolling : "single", + //你的lib目录的路径，我这边用JSP做测试的 + path : "/editormd/lib/", + toolbarIcons : function() { + // Or return editormd.toolbarModes[name]; // full, simple, mini + // Using "||" set icons align right. + return ["bold", "italic", "|", "h1", "h2", "h3", "|", "list-ul", "list-ol", "|", "image", "code", "code-block", "|", "watch", "clear"] + }, + //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。 + saveHTMLToTextarea : true, + // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标 + dialogMaskOpacity : 0.6, + placeholder: "请输入完成当前任务依赖的知识点或者其它相关信息", + imageUpload : true, + imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"], + imageUploadURL : "" //url + /* + 上传的后台只需要返回一个 JSON 数据，结构如下： + { + success : 0 | 1, // 0 表示上传失败，1 表示上传成功 + message : "提示的信息，上传成功或上传失败及错误信息等。", + url : "图片地址" // 上传成功时才返回 + } + */ + }); }); @@ -92,7 +120,11 @@
  • <%#= f.kindeditor :task_pass, :editor_id => "challenge_task_pass", :width=>'87.5%', :height => 159, :resizeType => 0, :no_label => true %> - <%= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %> + <%#= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %> +
    + <%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %> + +
  • @@ -211,10 +243,10 @@
  • <% if params[:action] == "edit" %> - 保存 + 保存 取消 <% else %> - 保存 + 保存 取消 <% end %> @@ -300,7 +332,7 @@ function challenge_create(){ if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); - }else if($("#challenge_task_pass").val().trim() == ""){ + }else if($("#challenge_task_pass textarea").val().trim() == ""){ $("#new_shixun_pass").show(); }else if($("#challenge_score").val().trim()==""){ $("#new_shixun_score").show(); @@ -312,7 +344,7 @@ function challenge_update(){ if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); - }else if($("#challenge_task_pass").val().trim() == ""){ + }else if($("#challenge_task_pass textarea").val().trim() == ""){ $("#new_shixun_pass").show(); }else if($("#challenge_score").val().trim()==""){ $("#new_shixun_score").show(); @@ -335,7 +367,7 @@ $('#challenge_answer').val(cMirror.getValue()); }); - challenge_task_pass_editor = KindEditor.create('#challenge_task_pass', + /* challenge_task_pass_editor = KindEditor.create('#challenge_task_pass', {"width":"89.7%", "resizeType":0, "no_label":true, @@ -358,7 +390,7 @@ "fileManagerJson":"/kindeditor/filemanager" }); - +*/ function add_tag(){ var num = $(".task-bd-grey").children('div').length; var val = $(".task-tag-input").val().trim(); From 0be0467cb7c0947a2946ee412496898021665c59 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 11 Apr 2017 14:05:50 +0800 Subject: [PATCH 11/74] =?UTF-8?q?challenge=E6=96=B0=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8E=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=BA=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/challenges_helper.rb | 12 ++++++++++++ app/views/challenges/_form.html.erb | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/helpers/challenges_helper.rb b/app/helpers/challenges_helper.rb index 86b0183c9..06d71f9bb 100644 --- a/app/helpers/challenges_helper.rb +++ b/app/helpers/challenges_helper.rb @@ -1,2 +1,14 @@ +# encoding: utf-8 module ChallengesHelper + + def difficulty_type difficulty + case difficulty + when 1 + "简单" + when 2 + "中等" + when 3 + "复杂" + end + end end diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index 138a93fd2..b520f705b 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -97,7 +97,7 @@
  • - <%= select_tag :evaluation, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation]', :class => "ml5", :style => "height: 28px;" %> + <%= select_tag :evaluation_way, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation_way]', :class => "ml5", :style => "height: 28px;" %>
  • @@ -197,9 +197,9 @@
  • - - - + + +
  • From 43d11c538881b15fc4a3de43659626931503eeda Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 11 Apr 2017 16:38:17 +0800 Subject: [PATCH 12/74] =?UTF-8?q?tpi=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_myshixun.html.erb | 348 +++++++- public/images/task/coin.png | Bin 0 -> 26748 bytes public/stylesheets/css/bigdata-common.css | 232 +++--- public/stylesheets/css/bigdata-public.css | 161 +++- public/stylesheets/css/font-awesome.css | 968 +++++++++++----------- public/stylesheets/css/taskstyle.css | 167 ++-- 6 files changed, 1166 insertions(+), 710 deletions(-) create mode 100644 public/images/task/coin.png diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index 86be35ea4..532aef9f1 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/app/views/layouts/base_myshixun.html.erb @@ -9,7 +9,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build', 'css/bigdata-common','css/bigdata-public' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -18,38 +18,313 @@
    -
    -
    -
    -
    -
  • -
    全部任务123 +
    全部任务<%= @myshixun.games.count %>
    • -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -

    第一关标题

    -

    - Python3 代码风格建议
    - Python3 中使用注释
    - 认识 Python3 模块
    - 实验步骤
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    - Python3 中使用注释
    - 认识 Python3 模块
    - 实验步骤
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    - Python3 中使用注释
    - 认识 Python3 模块
    - 实验步骤
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    - Python3 中使用注释
    - 认识 Python3 模块
    - 实验步骤
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    - Python3 中使用注释
    - 认识 Python3 模块
    - 实验步骤
    - 1. 解释器
    - Python 是一个脚本语言，你可以在 Python
    解释器中直接写代码或者将代码写到一个文件里，然后执行这个文件（即脚本文件）。
    - 首先，我们从使用解释器开始，打开终端，键入Python3 并回车。这个时候解释器便工作于交互模式。
    -

    -
    -
    -
    -
    -
    -
    -
    -
    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -
    -
    -
    -
    -
    -
    -
    -
    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -

    dafafdasf

    -
    -
    -
    -
    -
    -
    -
    -
      -
      • -
      • -
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    testrepo / lib / plugins / acts_as_searchable / init.rb

    -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -

    0/11 编译错误

    -
    -
    - - 测试集 1 -
    -
    -
      -
    • 输入：param1：1
      • -
    • 实际输出：空
      • -
    • 期望输出：3
      • -
    -
    -
    -
    -
    - - 测试集 2 -
    -
    -
    -
    -
    -
    - - 测试集 3 - -
    -
    -
    -
    -
    -
    - - 测试集 4 - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    11/11 全部通过

    -
    -
    -
      -
    • 样例测试：9/9
      • -
    • 隐藏测试：9/9
      • -
    • 经验值：+ 300
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - 耗时：1天5小时10分钟 - 测评 -
    -
    -
    -
    -
    -
    +<%= yield %> + diff --git a/db/migrate/20170413030447_add_actual_output_to_test_sets.rb b/db/migrate/20170413030447_add_actual_output_to_test_sets.rb new file mode 100644 index 000000000..b1838e1d0 --- /dev/null +++ b/db/migrate/20170413030447_add_actual_output_to_test_sets.rb @@ -0,0 +1,5 @@ +class AddActualOutputToTestSets < ActiveRecord::Migration + def change + add_column :test_sets, :actual_output, :string + end +end diff --git a/db/migrate/20170413032641_add_hidden_to_test_sets.rb b/db/migrate/20170413032641_add_hidden_to_test_sets.rb new file mode 100644 index 000000000..69253bf49 --- /dev/null +++ b/db/migrate/20170413032641_add_hidden_to_test_sets.rb @@ -0,0 +1,6 @@ +class AddHiddenToTestSets < ActiveRecord::Migration + def change + add_column :test_sets, :is_public, :boolean, :default => true + add_column :test_sets, :result, :boolean, :default => true + end +end From 54ff35bb14f68ae10091f8e340bfce56d42a0c01 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 13 Apr 2017 13:46:30 +0800 Subject: [PATCH 33/74] =?UTF-8?q?TPI=E7=89=88=E6=9C=AC=E5=BA=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_repository.html.erb | 2 +- app/views/games/_tree.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 8a1324cb1..0ccaf77e7 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -1,4 +1,4 @@ -
    +

    <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %>

    diff --git a/app/views/games/_tree.html.erb b/app/views/games/_tree.html.erb index 145592b17..ea2be4980 100644 --- a/app/views/games/_tree.html.erb +++ b/app/views/games/_tree.html.erb @@ -8,7 +8,7 @@ <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path) %> <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %> - + <%= link_to h(ent_name), {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @game, :myshixun_id => @myshixun, :path => to_path_param(ent_path), :rev => @rev, :extend => extend }, :remote => true, From cf90d843547ca7257fe396cc1f70165c9af03325 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 13 Apr 2017 14:02:29 +0800 Subject: [PATCH 34/74] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPM=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_file_edit_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb index b91f5f66a..ace44f895 100644 --- a/app/views/games/_file_edit_form.html.erb +++ b/app/views/games/_file_edit_form.html.erb @@ -38,7 +38,7 @@ // $("#challenge-answer-edit-small" ).nextAll(".CodeMirror").css("line-height", 1.2); $(document).ready(function(){ // 设置codemirror的高度/宽度自适应 - var code_height = $("#new_repository_contents").height() - $("#top_repository").height() - 15; + var code_height = $("#new_repository_contents").height() - $("#top_repository").height() - 10; editor_CodeMirror.setSize("auto",code_height+"px"); editor_CodeMirror.refresh(); }); From c0f0c8b69479312d568477d7190201b1766185bd Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 13 Apr 2017 14:29:33 +0800 Subject: [PATCH 35/74] =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 1 + app/views/games/_game_results.html.erb | 6 ++-- app/views/games/_game_show.html.erb | 36 ++++++++++++++++++++++++ app/views/games/show.html.erb | 38 +------------------------- app/views/games/show.js.erb | 4 +-- 5 files changed, 43 insertions(+), 42 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index db582c838..986abd9ed 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -47,6 +47,7 @@ class GamesController < ApplicationController end logger.info("88888************#{@entries} ") @test_cases = @game_challenge.test_sets + @test_cases_count = @test_cases.count (@myshixun.games.count == @game_challenge.position && @game.status ==2) ? @had_done = 1 : @had_done = 0 if outputs.count == 0 @results = [] diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 50d3fa892..15cbab6a2 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -20,12 +20,12 @@
    测试集 <%= index + 1 %> + <% unless test_case.result? %> + + <% end %> <% unless test_case.is_public? %> <% end %> - <% unless test_case.result? %> - - <% end %>
      diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index d79130136..955008d63 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -78,3 +78,39 @@
    + \ No newline at end of file diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb index 22a03c9d6..ab1fc577f 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -1,4 +1,3 @@ -<%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %> <%= javascript_include_tag "/codemirror/lib/codemirror", "/codemirror/mode/javascript/javascript", "/codemirror/addon/edit/matchbrackets.js", "/codemirror/mode/clike/clike" %> <%= stylesheet_link_tag "/codemirror/lib/codemirror", "/codemirror/theme/ambiance" %> <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min' %> @@ -8,7 +7,7 @@
    - <%= render :partial => 'game_show' %> + <%= render :partial => 'games/game_show' %>
    \ No newline at end of file diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index bf708d4ea..8be4d8fe8 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,4 +1,4 @@ $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); -$("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); -$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); +//$("#myshixun_top").html('<%#= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); +//$("#current_task_tab").attr('href','<%#= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); From d698dd5fc7cba402949f7adfaf3d3e1c2f272418 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 13 Apr 2017 14:33:09 +0800 Subject: [PATCH 36/74] =?UTF-8?q?=E7=BA=A0=E9=94=99=EF=BC=88=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_show.html.erb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index d79130136..5701ab90c 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -47,7 +47,7 @@
    @@ -77,4 +77,10 @@ - + \ No newline at end of file From ed9e4f571ada929f622ee5fecbc1f76b68b1dd1e Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 13 Apr 2017 16:29:15 +0800 Subject: [PATCH 37/74] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=BA=A0=E9=94=99?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 7 ++++++ app/views/games/_game_show.html.erb | 12 ++++++++--- app/views/games/_send_error_pop.html.erb | 27 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 app/views/games/_send_error_pop.html.erb diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index f8d1290f4..56a056ea4 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -514,7 +514,13 @@ class WordsController < ApplicationController if params[:text].size>0 && @user # @user.add_jour(me, params[:text]) #私信 + if params[:shixuns] == "true" + master = User.find(params[:shixun_author]) + message = "【#{master.show_name}导师/#{params[:shixun_name]}>第#{params[:position]}关】问题报告：
    " + params[:text] + JournalsForMessage.create(:jour_id => master.id,:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + else message = "【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】
    "+params[:text] + end @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) else status = 0 @@ -524,6 +530,7 @@ class WordsController < ApplicationController render_403 end end + private diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index cf9eeb4c5..2a12771e2 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -1,3 +1,10 @@ +
    @@ -114,8 +121,7 @@ $('#task_pass_contents').find('img').css("max-width", "100%"); }); function error_correction_pop(){ - /* $.ajax({ - url: '<%#= send_error %>' - });*/ + var htmlvalue = "<%= escape_javascript(render :partial => 'games/send_error_pop') %>"; + pop_box_new(htmlvalue,460,316); } \ No newline at end of file diff --git a/app/views/games/_send_error_pop.html.erb b/app/views/games/_send_error_pop.html.erb new file mode 100644 index 000000000..4d4fac696 --- /dev/null +++ b/app/views/games/_send_error_pop.html.erb @@ -0,0 +1,27 @@ +
    +

    问题报告

    + +
    +
    +

    这个任务有什么问题或错误？

    +

    请尽可能清晰的描述

    + +
    +
    + 取消 + 确定 +
    + \ No newline at end of file From 698d9f54d543c1b972d97165272aaa48831da905 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Apr 2017 08:39:09 +0800 Subject: [PATCH 38/74] =?UTF-8?q?TPM=E7=BA=A0=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 1 + app/controllers/words_controller.rb | 11 ++++++++--- app/models/test_set.rb | 2 +- app/views/games/_game_results.html.erb | 2 +- app/views/games/_send_error_pop.html.erb | 2 +- app/views/games/show.js.erb | 4 +--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 986abd9ed..d2e57e85f 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -47,6 +47,7 @@ class GamesController < ApplicationController end logger.info("88888************#{@entries} ") @test_cases = @game_challenge.test_sets + @error_position = @test_cases.each_with_index { |test_case, index| test_case.result == 0 } @test_cases_count = @test_cases.count (@myshixun.games.count == @game_challenge.position && @game.status ==2) ? @had_done = 1 : @had_done = 0 if outputs.count == 0 diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 56a056ea4..e66abaf33 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -514,14 +514,19 @@ class WordsController < ApplicationController if params[:text].size>0 && @user # @user.add_jour(me, params[:text]) #私信 - if params[:shixuns] == "true" + if params[:shixun_name] master = User.find(params[:shixun_author]) + game_id = params[:game_id] message = "【#{master.show_name}导师/#{params[:shixun_name]}>第#{params[:position]}关】问题报告：
    " + params[:text] - JournalsForMessage.create(:jour_id => master.id,:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + # game.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + jfm = JournalsForMessage.new(:jour_id => game_id, :jour_type => "Game", :user_id => master.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + jfm.save + JournalsForMessage.create(:jour_id => game_id, :jour_type => "Game", :user_id => 1, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) else message = "【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】
    "+params[:text] - end @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + end + else status = 0 end diff --git a/app/models/test_set.rb b/app/models/test_set.rb index 90627a8db..c4d0e43db 100644 --- a/app/models/test_set.rb +++ b/app/models/test_set.rb @@ -1,5 +1,5 @@ class TestSet < ActiveRecord::Base - default_scope :order => 'id desc' + default_scope :order => 'id asc' attr_accessible :challenge_id, :input, :output, :game_id, :actual_output belongs_to :challenge end diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 15cbab6a2..aa289aa65 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -14,7 +14,7 @@
    -

    0/11 编译错误

    +

    0/<%= @test_cases_count %> 编译错误

    <% @test_cases.each_with_index do |test_case, index| %>
    diff --git a/app/views/games/_send_error_pop.html.erb b/app/views/games/_send_error_pop.html.erb index 4d4fac696..c5fbc0b9d 100644 --- a/app/views/games/_send_error_pop.html.erb +++ b/app/views/games/_send_error_pop.html.erb @@ -15,7 +15,7 @@ function problem_report(user){ $.ajax({ url: '<%= leave_email_activation_message_path(1) %>', - data: {user: user, text: $("#error_contents").val(), shixuns: true, shixun_name:'<%= @myshixun.name %>', shixun_author:'<%= @game_challenge.user_id %>', position:'<%= @game_challenge.position %>'}, + data: {user: user, text: $("#error_contents").val(), game_id: '<%= @game.id %>', shixun_name:'<%= @myshixun.name %>', shixun_author:'<%= @game_challenge.user_id %>', position:'<%= @game_challenge.position %>'}, type: "POST", success: function (data) { var htmlvalue = "" diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index 8be4d8fe8..5457d9b56 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,4 +1,2 @@ $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); - -//$("#myshixun_top").html('<%#= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); -//$("#current_task_tab").attr('href','<%#= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); +$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); From fe15d8fa9f264d687610f27cbe9c1463b2ec62d8 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 08:41:00 +0800 Subject: [PATCH 39/74] =?UTF-8?q?TPm=E7=BA=A0=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_send_error_pop.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/games/_send_error_pop.html.erb b/app/views/games/_send_error_pop.html.erb index 4d4fac696..4244595a0 100644 --- a/app/views/games/_send_error_pop.html.erb +++ b/app/views/games/_send_error_pop.html.erb @@ -1,6 +1,6 @@

    问题报告

    - +

    这个任务有什么问题或错误？

    @@ -9,18 +9,16 @@
    取消 - 确定 + 确定
    + diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index 5457d9b56..4ddbeb86d 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,2 +1,3 @@ +$("#all_task_show").toggle(); $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); $("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); From cbcd63f4c3df90d4dc28b4b2ffc4cb21327045b1 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 10:27:19 +0800 Subject: [PATCH 41/74] =?UTF-8?q?=E5=AE=9E=E8=AE=ADtpm=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E9=9A=8F=E9=9A=BE=E6=98=93=E5=BA=A6=E7=9A=84=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E8=80=8C=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 48 ++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index 1e436a5ff..daf25b887 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -130,7 +130,7 @@
  • - <%= select_tag :evaluation_way, options_for_select([["输出输出", 1], ["文件存在", 2]]), :name => 'challenge[evaluation_way]', :class => " fl", :style => "height: 40px; width:200px;" %> + <%= select_tag :evaluation_way, options_for_select([["输出输出", 1]]), :name => 'challenge[evaluation_way]', :class => " fl", :style => "height: 40px; width:200px;" %> 请选择自动检测学员是否完成本任务的评测标准
    • @@ -238,13 +238,13 @@ <%= radio_button_tag("challenge[difficulty]", 1, checked = (@challenge.difficulty ==1 ? true : false)) %>简单 <%= radio_button_tag("challenge[difficulty]", 2, checked = (@challenge.difficulty ==2 ? true : false)) %>中等 <%= radio_button_tag("challenge[difficulty]", 3, checked = (@challenge.difficulty ==3 ? true : false)) %>困难 - 请选择难易度并设定通过本关后，学员得到的经验值 +
  • - <%= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %> - （100~200 经验值） + <%#= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %> + <%= select_tag :challenge_score, options_for_select([100, 200]), :name => 'challenge[score]', :class => " fl", :style => "height: 40px; width:170px;" %>
    • @@ -315,6 +315,45 @@ $(inputs_labels[j]).html("组" + (j + 1)); } }); + + // 根据难易程度设置不同的奖励经验值（适用新建与编辑模式） + var list= $('input:radio[name="challenge[difficulty]"]:checked').val(); // 获取select的索引值 + if(list == 1){ + $("#challenge_score").empty(); + for(var i= 100; i <= 200; i += 100){ + $("#challenge_score").append(""); + } + }else if(list == 2){ + $("#challenge_score").empty(); + for(var i= 300; i <= 600; i += 100){ + $("#challenge_score").append(""); + } + }else if(list == 3){ + $("#challenge_score").empty(); + for(var i= 700; i <= 1000; i += 100){ + $("#challenge_score").append(""); + } + } + $("#challenge_score").find("option[value='<%= @challenge.score %>']").attr("selected",true); // 设置option默认值 + $("#challenge_difficulty_1").click(function(){ + $("#challenge_score").empty(); + for(var i= 100; i <= 200; i += 100){ + $("#challenge_score").append(""); + } + }); + $("#challenge_difficulty_2").click(function(){ + $("#challenge_score").empty(); + for(var i= 300; i <= 600; i += 100){ + $("#challenge_score").append(""); + } + }); + $("#challenge_difficulty_3").click(function(){ + $("#challenge_score").empty(); + for(var i= 700; i <= 1000; i += 100){ + $("#challenge_score").append(""); + } + }) + }); // 设置textarea的宽度到140以后出现滚动条 var text1 = document.getElementById("textarea_sample_input_test"); @@ -418,5 +457,4 @@ var obj = thisObj.parentNode.id; $("#"+obj).remove(); } - From 151a118d6310d5280bc7e75156f24de2579fad56 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 10:58:14 +0800 Subject: [PATCH 42/74] =?UTF-8?q?TPI=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/show.js.erb | 1 + app/views/layouts/base_myshixun.html.erb | 18 ++++++++++++++++++ public/stylesheets/css/taskstyle.css | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index 4ddbeb86d..863d4e779 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,3 +1,4 @@ $("#all_task_show").toggle(); $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); $("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); + diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index b79a4993a..171fdc6ae 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/app/views/layouts/base_myshixun.html.erb @@ -73,6 +73,24 @@ g('blacktab_con_'+n).className='dis'; g('blacktab_nav_'+n).className='blacktab_hover'; } + + // 点击全部任务左侧tab样式切换 + var c = 0; // 设置全部任务展开样式，与不展开时的样式 + $("#all_task_tab").click(function(){ + if( c == 0){ + $("#all_task_tab").addClass('leftnav-active'); + $("#current_task_tab").removeClass('leftnav-active'); + c = 1; + }else if(c == 1){ + $("#all_task_tab").removeClass('leftnav-active'); + $("#current_task_tab").addClass('leftnav-active'); + c = 0; + } + }); + $("#current_task_tab").click(function(){ + $("#current_task_tab").addClass('leftnav-active'); + $("#all_task_tab").removeClass('leftnav-active'); + }); <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %> diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 583873b5b..352b5bf17 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -11,7 +11,7 @@ a.user-info-img img:hover{border:2px solid #888;} a.user-info-name{ display: block; font-size: 16px; color: #fff; max-width:100px; margin: 10px auto; text-align: center;} .leftnav-box{ width: 80px; height: 60px; background:#292b3a; padding:10px 0; margin-bottom:2px;} a.leftnav-box-inner{ display: block; width:77px; border-left:3px solid #292b3a; background:#292b3a; text-align: center; padding:10px 0; color:#575f6c;} -a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff; } +a:hover.leftnav-box-inner,a.leftnav-active{border-left:3px solid #3498db;color: #fff!important;} .btn-cir{ background:#575f6c; color:#292b3a;display: inline-block; padding:0px 5px; border-radius:25px; border-radius:15px; line-height:20px; height: 20px; font-size:12px;} .btn-cir:hover{background:#fff;} .btn-cir-grey{background: #e1e1e1;color: #333;} @@ -177,7 +177,7 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .-position-a-r15{ position: absolute; top:5px; right:15px;} .btn-cir-big{ background: #999;color: #fff;display: inline-block; padding:2px 10px; border-radius:25px; border-radius:15px; line-height:20px; height: 20px; font-size:12px;} .-task-ml80{ margin-left: 80px;} -.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:10000;background:rgba(0,0,0,0.7); height:100%; color:#fff;} +.page--over { position: fixed;top: 0; left:80px; right: 0; z-index:10000;background:rgba(0,0,0,0.3); height:100%; color:#fff;} .-task-list-header{ border-bottom:1px solid #eee; padding:5px 15px; color:#898989; font-size: 14px; font-weight: normal;} .-task-list-header h3{ font-weight: normal; font-size:16px; color:#333;} .-task-list-inner{ background:#EFF2F7; margin:10px; padding:5px;} From e351834fb14bf892e2f84aedcb2b9abccd6c2e58 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Apr 2017 10:58:25 +0800 Subject: [PATCH 43/74] =?UTF-8?q?=E6=B7=BB=E5=8A=A0game=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8Copen=5Ftime=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E3=80=82index=E5=88=B7=E6=96=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 2 +- app/controllers/shixuns_controller.rb | 2 +- app/models/game.rb | 2 +- app/views/games/show.js.erb | 2 +- db/migrate/20170414023452_add_open_time_to_game.rb | 5 +++++ db/migrate/20170414024741_update_open_time_to_game.rb | 10 ++++++++++ 6 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170414023452_add_open_time_to_game.rb create mode 100644 db/migrate/20170414024741_update_open_time_to_game.rb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index d2e57e85f..c49bc2a40 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -168,7 +168,7 @@ class GamesController < ApplicationController def next_step render_403 if @game.status != 2 next_game = @game.next_game - next_game.update_attribute(:status, 0) if next_game.status == 3 + next_game.update_attributes(:status => 0, :open_time => Time.now) if next_game.status == 3 respond_to do |format| format.js{redirect_to myshixun_game_path(next_game, :myshixun_id => @myshixun.id)} diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 4e9dd4102..7e48c8c4e 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -81,7 +81,7 @@ class ShixunsController < ApplicationController # 之所以增加user_id是为了方便统计查询性能 challenges.each_with_index do |challenge, index| status = (index == 0 ? 0 : 3) - Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id) + Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id, :open_time => Time.now) end else raise("网络异常，请稍后重试") diff --git a/app/models/game.rb b/app/models/game.rb index 9117941ba..9bff76d7e 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 + attr_accessible :myshixun_id, :user_id, :status, :final_score, :challenge_id, :open_time belongs_to :myshixun,:touch=> true belongs_to :user belongs_to :challenge diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index 4ddbeb86d..7029c2bd1 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,3 +1,3 @@ -$("#all_task_show").toggle(); +$("#all_task_show").hide(); $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); $("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); diff --git a/db/migrate/20170414023452_add_open_time_to_game.rb b/db/migrate/20170414023452_add_open_time_to_game.rb new file mode 100644 index 000000000..7f0318a12 --- /dev/null +++ b/db/migrate/20170414023452_add_open_time_to_game.rb @@ -0,0 +1,5 @@ +class AddOpenTimeToGame < ActiveRecord::Migration + def change + add_column :games, :open_time, :datetime + end +end diff --git a/db/migrate/20170414024741_update_open_time_to_game.rb b/db/migrate/20170414024741_update_open_time_to_game.rb new file mode 100644 index 000000000..a5df9d440 --- /dev/null +++ b/db/migrate/20170414024741_update_open_time_to_game.rb @@ -0,0 +1,10 @@ +class UpdateOpenTimeToGame < ActiveRecord::Migration + def up + Game.all.each do |game| + game.update_attribute(:open_time, game.created_at) + end + end + + def down + end +end From 50ed200ca4a083e14b5cc7b031c09f32d2a5b68f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Apr 2017 14:38:29 +0800 Subject: [PATCH 44/74] =?UTF-8?q?game=E7=BA=A0=E9=94=99=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/words_controller.rb | 12 ++++++------ app/models/journals_for_message.rb | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index e66abaf33..b3e8ec91c 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -515,13 +515,13 @@ class WordsController < ApplicationController # @user.add_jour(me, params[:text]) #私信 if params[:shixun_name] - master = User.find(params[:shixun_author]) game_id = params[:game_id] - message = "【#{master.show_name}导师/#{params[:shixun_name]}>第#{params[:position]}关】问题报告：
    " + params[:text] - # game.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) - jfm = JournalsForMessage.new(:jour_id => game_id, :jour_type => "Game", :user_id => master.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) - jfm.save - JournalsForMessage.create(:jour_id => game_id, :jour_type => "Game", :user_id => 1, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + message = params[:text] + admin_id = User.where(:admin => 1).first.try(:id) + user_ids = [admin_id, params[:shixun_author_id].to_i] + user_ids.each do |user_id| + JournalsForMessage.create(:jour_id => game_id, :jour_type => "Game", :user_id => user_id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) + end else message = "【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】
    "+params[:text] @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index d1f32f82d..885bdc0b8 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -322,6 +322,9 @@ class JournalsForMessage < ActiveRecord::Base receivers.each do |r| self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) end + elsif self.jour_type == 'Game' + # game不存在回复 + self.user_feedback_messages << UserFeedbackMessage.new(:user_id => self.user_id, :journals_for_message_id => self.id, :journals_for_message_type => "Game", :viewed => false) end end From 080d00ab04ce5849c9e9f9a1a736b9c95d9a7de4 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 15:47:20 +0800 Subject: [PATCH 45/74] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E4=B8=8E=E8=B8=A9?= =?UTF-8?q?=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 | 4 ++ app/controllers/praise_tread_controller.rb | 16 ++++++- app/views/games/_game_show.html.erb | 49 +++++++++++++++++++--- app/views/games/show.js.erb | 3 +- 4 files changed, 62 insertions(+), 10 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index c49bc2a40..eec9e8aeb 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -22,8 +22,12 @@ class GamesController < ApplicationController # mushixun的版本库必须创建时就创建 # 首次进入版本库自动打开文件 # path："" && path: @game.path + # @praise 判断是否点赞 + # @praise 判断是否踩 def show @game_challenge = @game.challenge + @praise = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?", @game_challenge.id, @game_challenge.class.to_s, User.current.id).first + @tread = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?", @game_challenge.id, "ChallengeTread", User.current.id).first logger.info("test ................#{@game_challenge.id}") game_path = (@game_challenge.path.blank? ? @path : @game_challenge.path.strip) logger.info("test game_path ................#{game_path}") diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb index 136915bbd..a661892f8 100644 --- a/app/controllers/praise_tread_controller.rb +++ b/app/controllers/praise_tread_controller.rb @@ -17,13 +17,19 @@ class PraiseTreadController < ApplicationController end # @is_in_list = nil @obj = find_object_by_type_and_id(@obj_type,@obj_id) - pts = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",@obj_id,@obj_type.to_s,User.current.id) - unless pts.empty? + pts = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",@obj_id,@obj_type.to_s,User.current.id).first + unless pts.blank? + if(params[:game_praise] == "true") + pts.delete + render :json => {praise: false} + return + end respond_to do |format| format.js end return end + @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal] # if @obj.respond_to?("author_id") # author_id = @obj.author_id @@ -33,6 +39,10 @@ class PraiseTreadController < ApplicationController # unless author_id == User.current.id praise_tread_plus(@obj_type,@obj_id,1) # end + if params[:game_praise] == "true" + render :json => {praise: true} + return + end respond_to do |format| format.js end @@ -137,6 +147,8 @@ class PraiseTreadController < ApplicationController @obj = Syllabus.find_by_id(id) when 'Work' @obj = Work.find_by_id(id) + when 'Challenge' || 'ChallengeTread' + @obj = Challenge.find_by_id(id) else @obj = nil end diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb index 2a12771e2..965e228e9 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -52,8 +52,8 @@
      -
      • -
      • +
    • " onclick="game_praise()" id="game_praise_tread">" alt="赞" >
      • +
    • " onclick="game_tread()" id="game_tread">" >
    @@ -120,8 +120,45 @@ // 设置图片最大宽度不能超出边框 $('#task_pass_contents').find('img').css("max-width", "100%"); }); - function error_correction_pop(){ - var htmlvalue = "<%= escape_javascript(render :partial => 'games/send_error_pop') %>"; - pop_box_new(htmlvalue,460,316); - } + function error_correction_pop(){ + var htmlvalue = "<%= escape_javascript(render :partial => 'games/send_error_pop') %>"; + pop_box_new(htmlvalue,460,316); + }; + + // 点赞/取消点赞功能 + var h = true; + function game_praise(){ + $.ajax({ + url: '<%= praise_tread_praise_plus_path({:obj_id => @game_challenge.id, :obj_type => @game_challenge.class}) %>', + data: {horizontal: h, game_praise: true}, + success:function(data){ + h = !h; + if(data.praise){ + $("#game_praise_tread").children("i").addClass("color-light-green"); + $("#game_praise_tread").attr("title", "取消点赞") + }else{ + $("#game_praise_tread").children("i").removeClass("color-light-green"); + $("#game_praise_tread").attr("title", "点赞") + } + } + }); + } + // 踩/取消踩功能 + var d = true; + function game_tread(){ + $.ajax({ + url: '<%= praise_tread_praise_plus_path({:obj_id => @game_challenge.id, :obj_type => "ChallengeTread"}) %>', + data: {horizontal: d, game_praise: true}, + success:function(data){ + d = !d; + if(data.praise){ + $("#game_tread").children("i").addClass("color-orange"); + $("#game_tread").attr("title", "踩") + }else{ + $("#game_tread").children("i").removeClass("color-orange"); + $("#game_tread").attr("title", "取消踩") + } + } + }); + } \ No newline at end of file diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index a00bf0ab6..ed64bad7f 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,4 +1,3 @@ $("#all_task_show").hide(); $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); -$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); - +$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>') \ No newline at end of file From 99de376266c8be665b6a4591e7f1046f4775f3b4 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Apr 2017 16:12:54 +0800 Subject: [PATCH 46/74] =?UTF-8?q?game=E6=B5=8B=E8=AF=95=E9=9B=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 20 +++++++------------- app/views/games/_code_actions.html.erb | 2 +- app/views/games/_game_result_order.html.erb | 5 +++++ app/views/games/_game_results.html.erb | 13 +++++++------ app/views/games/_send_error_pop.html.erb | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 app/views/games/_game_result_order.html.erb diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index c49bc2a40..381b0bc7b 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -46,20 +46,14 @@ class GamesController < ApplicationController logger.info("7777************#{@entries} ") end logger.info("88888************#{@entries} ") - @test_cases = @game_challenge.test_sets - @error_position = @test_cases.each_with_index { |test_case, index| test_case.result == 0 } - @test_cases_count = @test_cases.count - (@myshixun.games.count == @game_challenge.position && @game.status ==2) ? @had_done = 1 : @had_done = 0 - if outputs.count == 0 - @results = [] - else - @results = outputs.map{|result| [result.code, result.id]} + @test_sets = @game_challenge.test_sets + @test_sets.each_with_index do |test_set, index| + @test_set_error_position = (index + 1) unless test_set.result end - logger.info("##################languae is #{@language}") - logger.info("##################latest_output is #{@latest_output}") - logger.info("##################had_done is #{@had_done}") - logger.info("##################status is #{@game.status}") - logger.info("##################result is #{@results}") + @test_sets_count = @test_sets.count + (@myshixun.games.count == @game_challenge.position && @game.status ==2) ? @had_done = 1 : @had_done = 0 + @test_sets_hidden_count = @test_sets.where(:is_public => false).count + respond_to do |format| format.html format.js diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 0fd7e1a65..0db470a30 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -1,4 +1,4 @@ -耗时：<%= game_spend_time(@game.created_at, @game.updated_at) %> +耗时：<%= game_spend_time(@game.open_time, @game.updated_at) %> <% if @game.status == 0 %> 评测 <% elsif @game.status == 1 %> diff --git a/app/views/games/_game_result_order.html.erb b/app/views/games/_game_result_order.html.erb new file mode 100644 index 000000000..cd6af47f2 --- /dev/null +++ b/app/views/games/_game_result_order.html.erb @@ -0,0 +1,5 @@ +<% if @test_set_error_position.nil? %> +

    <%= @test_sets_count %>/<%= @test_sets_count %> 全部通过

    +<% else %> +

    <%= @test_set_error_position %>/<%= @test_sets_count %> 编译错误

    +<% end %> \ No newline at end of file diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index aa289aa65..8b6afe4be 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -14,8 +14,8 @@
    -

    0/<%= @test_cases_count %> 编译错误

    - <% @test_cases.each_with_index do |test_case, index| %> + <%= render :partial => 'game_result_order' %> + <% @test_sets.each_with_index do |test_case, index| %>
    @@ -44,13 +44,14 @@
    -

    11/11 全部通过

    + <%= render :partial => 'game_result_order' %> +

    Exception:test!

      -
    • 样例测试：9/9
      • -
    • 隐藏测试：9/9
      • -
    • 经验值：+ 300
      • +
    • 样例测试：<%= @test_set_error_position.nil? ? @test_sets_count : @test_set_error_position %>/<%= @test_sets_count %>
      • +
    • 隐藏测试：<%= @test_sets_hidden_count %>/<%= @test_sets_count %>
      • +
    • 经验值：+ <%= @game.final_score %>
    diff --git a/app/views/games/_send_error_pop.html.erb b/app/views/games/_send_error_pop.html.erb index 7b6bf9021..13f755582 100644 --- a/app/views/games/_send_error_pop.html.erb +++ b/app/views/games/_send_error_pop.html.erb @@ -16,7 +16,7 @@ function problem_report(user){ $.ajax({ url: '<%= leave_email_activation_message_path(1) %>', - data: {user: user, text: $("#error_contents").val(), game_id: '<%= @game.id %>', shixun_name:'<%= @myshixun.name %>', shixun_author:'<%= @game_challenge.user_id %>', position:'<%= @game_challenge.position %>'}, + data: {user: user, text: $("#error_contents").val(), game_id: '<%= @game.id %>', shixun_name:'<%= @myshixun.name %>', shixun_author_id:'<%= @game_challenge.user_id %>', position:'<%= @game_challenge.position %>'}, type: "POST", success: function (data) { } From 978dc492a20603dffe108e80101b102f7a811437 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 16:28:04 +0800 Subject: [PATCH 47/74] =?UTF-8?q?tpi=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_code_actions.html.erb | 4 ++-- app/views/games/show.html.erb | 3 +++ public/stylesheets/css/taskstyle.css | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 0fd7e1a65..6062c8bef 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -2,7 +2,7 @@ <% if @game.status == 0 %> 评测 <% elsif @game.status == 1 %> - 评测中.. + 评测中.. <% elsif @game.status == 2 %> <%= link_to "下 一 步 ", {:controller => 'games',:action => "next_step", :id => @game, :myshixun_id => @myshixun}, @@ -15,7 +15,7 @@ function training_task_submmit(){ var i = 0; $("#ajax-indicator").show(); - $("#game_commit").html("评测中.."); + $("#game_commit").html("评测中.."); $.ajax({ url: '<%= game_build_myshixun_game_path(@game, :myshixun_id => @myshixun) %>', success: function (){ diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb index ab1fc577f..c9819f984 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -14,6 +14,7 @@ // 版本库扩大与缩小 var control = 0; // 版本库控制 0表示点击放大 1表示点击缩小 var control_1 = 0; // 测评控制 0表示点击放大 1表示点击缩小 + function repository_extend_and_zoom(){ if(control == 0){ $("#game_left_contents").addClass("-flex-basic0"); @@ -22,6 +23,7 @@ $("#games_valuation_contents").addClass("-flex-basic0"); $("#extend_and_zoom").children("i").addClass("fa-compress"); $("#extend_and_zoom").children("i").removeClass("fa-arrows-alt"); + editor_CodeMirror.setSize("auto", "auto"); control = 1; }else if(control == 1){ $("#game_left_contents").removeClass("-flex-basic0"); @@ -30,6 +32,7 @@ $("#games_valuation_contents").removeClass("-flex-basic0"); $("#extend_and_zoom").children("i").removeClass("fa-compress"); $("#extend_and_zoom").children("i").addClass("fa-arrows-alt"); + editor_CodeMirror.setSize("auto", "auto"); control = 0; } } diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 352b5bf17..b51dc2b49 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -45,7 +45,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top: .undis {display:none;} .dis {display:block;} .tab-info{ } -.content-editor-inner{ overflow:auto; height:600px; } +.content-editor-inner{ overflow:auto;height: 813px} .tab-info-inner{ overflow:auto; height:600px; margin:0 0 0px 15px;padding-top: 15px} .content-history-inner{height:120px; overflow:auto; padding:15px;} .content-history{width:48.7%; min-width:500px; } From 18c2acc0511e6ae763d76db96422b19105fc8496 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 16:41:14 +0800 Subject: [PATCH 48/74] =?UTF-8?q?tpm=E5=A4=B4=E9=83=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/myshixuns/_myshixun_top.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/myshixuns/_myshixun_top.html.erb b/app/views/myshixuns/_myshixun_top.html.erb index 2e47d51d7..bb7c9733b 100644 --- a/app/views/myshixuns/_myshixun_top.html.erb +++ b/app/views/myshixuns/_myshixun_top.html.erb @@ -1,5 +1,5 @@
    -

    Helloworld:Java入门实训项目

    +

    <%= @myshixun.name %>

    第<%= @game_challenge.position %>关
    From 0fdc400e5250a884415afc29678d6484571fc643 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 14 Apr 2017 16:55:14 +0800 Subject: [PATCH 49/74] =?UTF-8?q?game=E5=BA=95=E7=AB=AF=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/views/games/_code_actions.html.erb | 2 +- app/views/games/_game_results.html.erb | 22 ++++++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4097ffd9a..389d4708f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -122,7 +122,7 @@ module ApplicationHelper time = "#{hour}小时 : #{min}分" end else - time = "#{day}天 : #{hour}小时 : #{min}分" + time = "#{day}天 #{hour}小时 #{min}分" end return time end diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 0db470a30..d7ce83ddb 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -1,4 +1,4 @@ -耗时：<%= game_spend_time(@game.open_time, @game.updated_at) %> +耗时：<%= game_spend_time(@game.open_time, @game.updated_at) %> <% if @game.status == 0 %> 评测 <% elsif @game.status == 1 %> diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 8b6afe4be..77533b4da 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -15,25 +15,27 @@
    <%= render :partial => 'game_result_order' %> - <% @test_sets.each_with_index do |test_case, index| %> + <% @test_sets.each_with_index do |test_set, index| %>
    测试集 <%= index + 1 %> - <% unless test_case.result? %> + <% unless test_set.result? %> <% end %> - <% unless test_case.is_public? %> + <% unless test_set.is_public? %> <% end %>
    -
    -
      -
    • 输入：<%= test_case.input %>
      • -
    • 实际输出：<%= test_case.actual_output %>
      • -
    • 期望输出：<%= test_case.output %>
      • -
    -
    + <% if test_set.is_public? %> +
    +
      +
    • 输入：<%= test_set.input %>
      • +
    • 实际输出：<%= test_set.actual_output %>
      • +
    • 期望输出：<%= test_set.output %>
      • +
    +
    + <% end %>
    <% end %>
    From be888247861c55ca5a9031c8487bea3d826ea8a0 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 17:40:46 +0800 Subject: [PATCH 50/74] =?UTF-8?q?tpm=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index aa289aa65..a9d1a8775 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -17,7 +17,7 @@

    0/<%= @test_cases_count %> 编译错误

    <% @test_cases.each_with_index do |test_case, index| %>
    -
    +
    测试集 <%= index + 1 %> <% unless test_case.result? %> @@ -27,7 +27,7 @@ <% end %>
    -
    +
    • 输入：<%= test_case.input %>
    • 实际输出：<%= test_case.actual_output %>
      • @@ -58,4 +58,12 @@
    -
    \ No newline at end of file +
    + \ No newline at end of file From 05be4e220784c97ade7acbe9f75f32b113a91a15 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 17:47:24 +0800 Subject: [PATCH 51/74] =?UTF-8?q?tpm=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 337cefe53..a9d1a8775 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -14,28 +14,27 @@
    - <%= render :partial => 'game_result_order' %> - <% @test_sets.each_with_index do |test_set, index| %> +

    0/<%= @test_cases_count %> 编译错误

    + <% @test_cases.each_with_index do |test_case, index| %>
    测试集 <%= index + 1 %> - <% unless test_set.result? %> + <% unless test_case.result? %> <% end %> - <% unless test_set.is_public? %> + <% unless test_case.is_public? %> <% end %>
    - <% if test_set.is_public? %>
      -
    • 输入：<%= tes test_set.input %>
      • -
    • 实际输出：<%= test_set.actual_output %>
      • -
    • 期望输出：<%= test_set.output %>
      • +
    • 输入：<%= test_case.input %>
      • +
    • 实际输出：<%= test_case.actual_output %>
      • +
    • 期望输出：<%= test_case.output %>
    - <% end %>
    +
    <% end %>
    @@ -45,14 +44,13 @@
    - <%= render :partial => 'game_result_order' %> -

    Exception:test!

    +

    11/11 全部通过

      -
    • 样例测试：<%= @test_set_error_position.nil? ? @test_sets_count : @test_set_error_position %>/<%= @test_sets_count %>
      • -
    • 隐藏测试：<%= @test_sets_hidden_count %>/<%= @test_sets_count %>
      • -
    • 经验值：+ <%= @game.final_score %>
      • +
    • 样例测试：9/9
      • +
    • 隐藏测试：9/9
      • +
    • 经验值：+ 300
    From 7531fcc05d32baff25cb3d33e8621a29cdda926c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 17:49:56 +0800 Subject: [PATCH 52/74] =?UTF-8?q?tmp=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index a9d1a8775..45980c5ff 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -27,14 +27,16 @@ <% end %>
    -
    -
      -
    • 输入：<%= test_case.input %>
      • -
    • 实际输出：<%= test_case.actual_output %>
      • -
    • 期望输出：<%= test_case.output %>
      • -
    -
    -
    + <% if test_set.is_public? %> +
    +
      +
    • 输入：<%= test_set.input %>
      • +
    • 实际输出：<%= test_set.actual_output %>
      • +
    • 期望输出：<%= test_set.output %>
      • +
    +
    +
    + <% end %> <% end %>
    From 6f2a55984b98a5beef7c25d914ffad996e5252b2 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 14 Apr 2017 17:54:25 +0800 Subject: [PATCH 53/74] =?UTF-8?q?tpm=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 45980c5ff..e96b7e0a6 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -14,16 +14,16 @@
    -

    0/<%= @test_cases_count %> 编译错误

    - <% @test_cases.each_with_index do |test_case, index| %> + <%= render :partial => 'game_result_order' %> + <% @test_sets.each_with_index do |test_set, index| %>
    -
    +
    测试集 <%= index + 1 %> - <% unless test_case.result? %> + <% unless test_set.result? %> <% end %> - <% unless test_case.is_public? %> + <% unless test_set.is_public? %> <% end %>
    From e99b3399f0b729e6013462c47c43dab515e40c9d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 16 Apr 2017 10:15:30 +0800 Subject: [PATCH 54/74] =?UTF-8?q?tpm=E6=96=B0=E5=BB=BA=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=94=81=E5=AE=9A=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index daf25b887..1de43e6f5 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -82,6 +82,7 @@

    锁定 +

    @@ -163,7 +164,8 @@

    组1 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 - 锁定 + 锁定 +

    @@ -311,9 +313,18 @@ $("#shixun_form").on('click', 'a.sample_icon_remove', function () { $(this).parent().parent('.clearfix').remove(); var inputs_labels = document.getElementsByName("sample_inputs_label"); + var lock = document.getElementsByName("sample[lock][]"); + var hid = document.getElementsByName("sample[hidden][]"); for (var j = 0; j < inputs_labels.length; j++) { $(inputs_labels[j]).html("组" + (j + 1)); } + for(var o = 0; o < lock.length; o++){ + if($(lock[o]).prop("checked")){ + $(hid[o]).val(1); + }else{ + $(hid[o]).val(0); + } + } }); // 根据难易程度设置不同的奖励经验值（适用新建与编辑模式） @@ -377,7 +388,22 @@ $("#challenge_subject").keydown(function(){ $("#new_shixun_pass").hide(); }); + + // 判断测试集是否锁定, 0未锁定，1锁定 + function test_set_whether_lock(){ + var lock = document.getElementsByName("sample[lock][]"); + var hid = document.getElementsByName("sample[hidden][]"); + for(var o = 0; o < lock.length; o++){ + if($(lock[o]).prop("checked")){ + $(hid[o]).val(1); + }else{ + $(hid[o]).val(0); + } + } + } + function challenge_create(){ + test_set_whether_lock() if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); }else if($("#challenge_task_pass textarea").val().trim() == ""){ @@ -390,6 +416,7 @@ } function challenge_update(){ + test_set_whether_lock() if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); }else if($("#challenge_task_pass textarea").val().trim() == ""){ From 62b579df71871cf06d388db9652e67f640362f63 Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 16 Apr 2017 10:16:36 +0800 Subject: [PATCH 55/74] =?UTF-8?q?game=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/challenges_controller.rb | 15 +-- app/controllers/myshixuns_controller.rb | 40 +++--- app/views/challenges/_form.html.erb | 68 ++-------- app/views/games/_game_results.html.erb | 165 ++++++++++++++++++++++- 4 files changed, 196 insertions(+), 92 deletions(-) diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index d939f02f5..6b0efec93 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -27,15 +27,8 @@ class ChallengesController < ApplicationController ActiveRecord::Base.transaction do begin @challenge.save! - if params[:sample][:input].length > 0 - params[:sample][:input].each_with_index do |value, index| - unless (value == params[:sample][:output][index] && value.blank?) - ChallengeSample.create(:challenge_id => @challenge.id, :input => value, :output => params[:sample][:output][index]) - end - end - end - if params[:program][:output].length > 0 - params[:program][:output].each do |output| + if params[:test_set][:output].length > 0 + params[:test_set][:output].each do |output| TestSet.create(:challenge_id => @challenge.id, :input => nil, :output => output) end end @@ -45,11 +38,10 @@ class ChallengesController < ApplicationController end end # 向jenkins端发送请求，构建pipeline片段，实时返回结果 -=begin begin jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] params = {:shixunType => "#{@challenge.evaluation_way.to_i}", :filePath => "#{@challenge.path}", :step => "#{@challenge.position}", :challengeId => "#{@challenge.id}"} - uri = URI("#{jenkins_shixuns}/jenkins-exec/api/generateScriptPerChallenge") + uri = URI("#{jenkins_shixuns}/jenkins-exec/api/generatePipelineScriptForEachChallenge") res = uri_exec uri, params if res.blank? raise("jenkins服务器异常") @@ -57,7 +49,6 @@ class ChallengesController < ApplicationController rescue raise("jenkins服务器异常") end -=end respond_to do |format| format.html {redirect_to shixun_challenge_path(@challenge, :shixun_id => @shixun), notice: '创建成功！'} end diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index b8df444b3..4d274d0bf 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -10,26 +10,26 @@ class MyshixunsController < ApplicationController # output 为测试用户编译输出结果 # myshixun:status 1为完成实训 def training_task_status - status = params[:status].to_i - task_id = params[:taskId] - outPut = Base64.decode64(params[:outPut]) unless params[:outPut].blank? - message = Base64.decode64(params[:msg]) unless params[:msg].blank? - game = Game.find(task_id) - challenge = game.challenge - if status == 0 - myshixun = game.myshixun - games_count = myshixun.games.count - if challenge.position == games_count - myshixun.update_attribute(:status, 1) - end - game_outputs = Output.create(:code => status, :msg => message, :game_id => task_id, :out_put => outPut) - game.update_attribute(:status, 2) - game.update_attribute(:final_score, challenge.score) - else - game_outputs = Output.create(:code => status, :msg => message, :game_id => task_id, :out_put => outPut) - game.update_attribute(:status, 0) - end - render :json => {:data => "success"} + # status = params[:status].to_i + # task_id = params[:taskId] + # outPut = Base64.decode64(params[:outPut]) unless params[:outPut].blank? + # message = Base64.decode64(params[:msg]) unless params[:msg].blank? + # game = Game.find(task_id) + # challenge = game.challenge + # if status == 0 + # myshixun = game.myshixun + # games_count = myshixun.games.count + # if challenge.position == games_count + # myshixun.update_attribute(:status, 1) + # end + # game_outputs = Output.create(:code => status, :msg => message, :game_id => task_id, :out_put => outPut) + # game.update_attribute(:status, 2) + # game.update_attribute(:final_score, challenge.score) + # else + # game_outputs = Output.create(:code => status, :msg => message, :game_id => task_id, :out_put => outPut) + # game.update_attribute(:status, 0) + # end + # render :json => {:data => "success"} end def show diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index daf25b887..ee726f84b 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -81,25 +81,15 @@

  • - 锁定 + 锁定

    - - -
    • - - +
  • @@ -142,7 +132,7 @@

  • 组<%= index + 1 %> - 锁定 + 锁定 <% if index == 0 %> 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 <% end %> @@ -151,8 +141,8 @@ <% end %>

    - - + +
    • <% end %> @@ -163,53 +153,15 @@

    组1 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 - 锁定 + 锁定

    - - + + <% end %> -
  • - <% if params[:action] == "edit" && @challenge.test_sets.count > 0 %> - -
      - <% @challenge.test_sets.each_with_index do |test, index| %> -
    • -

      - 测试集<%= index + 1 %> - <% if index == 0%> - 温馨提示：在学员"提交评测"时进行自动检测。 - <% end %> - - <% if index > 0 %> - - <% end %> -

      - - -
      • - <% end %> -
    - <% else %> - -
      -
    • -

      - 测试集1 - 温馨提示：在学员"提交评测"时进行自动检测。 - -

      - - -
      • -
    - <% end %> -
    • - -
  • diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index e96b7e0a6..510925e0f 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -1,3 +1,6 @@ +<%= content_for(:header_tags) do %> + <%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %> +<% end %>
    -
    +
    + + + +
    @@ -35,8 +43,8 @@
  • 期望输出：<%= test_set.output %>
    • -
    <% end %> +
    <% end %>
    @@ -68,4 +76,157 @@ $("#test_case_"+id).toggle(); } } + + + + + + + + + + + \ No newline at end of file From 2bc0080ed7985c85be216b53ce7ce9bb11de6d96 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Sun, 16 Apr 2017 14:01:10 +0800 Subject: [PATCH 56/74] =?UTF-8?q?tpm=E9=94=81=E5=AE=9A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_form.html.erb | 21 ++++++--------------- app/views/games/_game_results.html.erb | 7 ++++--- public/stylesheets/css/taskstyle.css | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index cac96ba8b..ee70bdedf 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -82,7 +82,7 @@

    锁定 - +

    @@ -155,7 +155,7 @@ 组1 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 锁定 - +

    @@ -265,18 +265,9 @@ $("#shixun_form").on('click', 'a.sample_icon_remove', function () { $(this).parent().parent('.clearfix').remove(); var inputs_labels = document.getElementsByName("sample_inputs_label"); - var lock = document.getElementsByName("sample[lock][]"); - var hid = document.getElementsByName("sample[hidden][]"); for (var j = 0; j < inputs_labels.length; j++) { $(inputs_labels[j]).html("组" + (j + 1)); } - for(var o = 0; o < lock.length; o++){ - if($(lock[o]).prop("checked")){ - $(hid[o]).val(1); - }else{ - $(hid[o]).val(0); - } - } }); // 根据难易程度设置不同的奖励经验值（适用新建与编辑模式） @@ -343,8 +334,8 @@ // 判断测试集是否锁定, 0未锁定，1锁定 function test_set_whether_lock(){ - var lock = document.getElementsByName("sample[lock][]"); - var hid = document.getElementsByName("sample[hidden][]"); + var lock = document.getElementsByName("test_set[lock][]"); + var hid = document.getElementsByName("test_set[hidden][]"); for(var o = 0; o < lock.length; o++){ if($(lock[o]).prop("checked")){ $(hid[o]).val(1); @@ -355,7 +346,7 @@ } function challenge_create(){ - test_set_whether_lock() + test_set_whether_lock(); if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); }else if($("#challenge_task_pass textarea").val().trim() == ""){ @@ -368,7 +359,7 @@ } function challenge_update(){ - test_set_whether_lock() + test_set_whether_lock(); if($('#challenge_subject').val().trim() == ""){ $("#new_shixun_name").show(); }else if($("#challenge_task_pass textarea").val().trim() == ""){ diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 510925e0f..3a114cb6b 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -17,7 +17,7 @@ -
    +
    @@ -82,7 +82,7 @@ - +<% if false %> \ No newline at end of file + +<% end %> \ No newline at end of file diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index b51dc2b49..51a899496 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -137,7 +137,7 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .-layout-h { display: flex;flex-direction: row;} .-horizontal { flex-direction:row-reverse;} .-scroll{ overflow:auto;} -.-flex-basic0{flex-basis: 0%!important;} +.-flex-basic0{flex-basis: 0%!important; display: none} .-flex-basic40{flex-basis: 40%;} .-flex-basic50{flex-basis: 50%;} .-flex-basic60{flex-basis: 60%;} From 67af31b8ccccc99f7487e4fbd764aa0039a3cf8e Mon Sep 17 00:00:00 2001 From: huang Date: Sun, 16 Apr 2017 17:20:47 +0800 Subject: [PATCH 57/74] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/challenges_controller.rb | 24 ++++++++----------- app/controllers/shixuns_controller.rb | 18 ++++++++++---- app/helpers/application_helper.rb | 18 +++++++++++++- app/models/test_set.rb | 2 +- ...0170416064210_add_position_to_test_sets.rb | 5 ++++ 5 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 db/migrate/20170416064210_add_position_to_test_sets.rb diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index 6b0efec93..2c6d0ae98 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -27,9 +27,11 @@ class ChallengesController < ApplicationController ActiveRecord::Base.transaction do begin @challenge.save! - if params[:test_set][:output].length > 0 - params[:test_set][:output].each do |output| - TestSet.create(:challenge_id => @challenge.id, :input => nil, :output => output) + if params[:test_set][:hidden].length > 0 + params[:test_set][:input].each_with_index do |input, index| + unless (input[index] == params[:test_set][:output][index] && input[index].nil?) + TestSet.create(:challenge_id => @challenge.id, :input => input, :output => params[:test_set][:output][index], :is_public => params[:test_set][:hidden][index].to_i, :position => (index + 1)) + end end end unless params[:knowledge].blank? @@ -38,17 +40,11 @@ class ChallengesController < ApplicationController end end # 向jenkins端发送请求，构建pipeline片段，实时返回结果 - begin - jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] - params = {:shixunType => "#{@challenge.evaluation_way.to_i}", :filePath => "#{@challenge.path}", :step => "#{@challenge.position}", :challengeId => "#{@challenge.id}"} - uri = URI("#{jenkins_shixuns}/jenkins-exec/api/generatePipelineScriptForEachChallenge") - res = uri_exec uri, params - if res.blank? - raise("jenkins服务器异常") - end - rescue - raise("jenkins服务器异常") - end + jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] + params = {:challengeStage => "#{@challenge.id}", :challengeType => "#{@challenge.evaluation_way.to_i}", :challengeProgramName => "#{@challenge.path}", :trainingID => "#{@shixun.id}"} + uri = URI("#{jenkins_shixuns}/jenkins-exec/game/generatePipelineScriptForChallenge") + res = uri_exec uri, {challengeInfo: params.to_json} + @challenge.update_attribute(:pipeline_script, res['msg']) if res['code'] == 0 respond_to do |format| format.html {redirect_to shixun_challenge_path(@challenge, :shixun_id => @shixun), notice: '创建成功！'} end diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 7e48c8c4e..188018718 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -21,22 +21,30 @@ class ShixunsController < ApplicationController end # jenkins回调脚本 + # gameID 及实训ID def publish jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] - fragments = {} + fragments = [] + testSet = [] testCases = [] + gameInfo = [] begin challenges = @shixun.challenges.includes(:test_sets) challenges.each do |challenge| - fragments.store(challenge.position, challenge.try(:pipeline_script)) + pipeline_script = challenge.try(:pipeline_script).nil? ? challenge.try(:pipeline_script) : Base64.encode64(challenge.try(:pipeline_script)) + challenge_script = {:challengeStage => challenge.position, :challengePipeline => pipeline_script} + fragments << challenge_script challenge.test_sets.each do |test_set| test_cases = {:casdId => test_set.id, :input => test_set.input, :output => test_set.output} - testCases << test_cases + testSet << test_cases end + test_sets_list = {:challengeStage => challenge.position, :challengeTestCases => testSet} + testCases << test_sets_list end + gameInfo = {:trainingID => @shixun.id, :operationEnvironment => @shixun.language, :challengePipelines => fragments, :testCases => testCases} fragments = fragments.to_json - uri = URI("#{jenkins_shixuns}/jenkins-exec/api/generateScript") - params = {language: @shixun.language, fragments: fragments, testCases:testCases, shixunId: @shixun.id} + uri = URI("#{jenkins_shixuns}/jenkins-exec/game/publishGame") + params = {gameInfo:gameInfo} begin res = uri_exec uri, params rescue diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 389d4708f..86e19bdc1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -185,7 +185,23 @@ module ApplicationHelper end def uri_exec uri, params - res = Net::HTTP.post_form(uri, params).body + begin + logger.error("@parmas is #{params}, url is #{uri}") + res = Net::HTTP.post_form(uri, params).body + res = JSON.parse(res) + rescue => e + logger.error("failed to create challenge by 'generatePipelineScriptForChallenge'! #{e}") + raise("jenkins服务器异常") + end + end + + def uri_json_exec uri, params + Net::HTTP.start(uri.hostname, uri.port) {|http| + http.post(uri.path, params.to_json) + } + + http = Net::HTTP.new(uri.host, uri.port) + res = Net::HTTP.post(uri, params.to_json).body res = JSON.parse(res) end diff --git a/app/models/test_set.rb b/app/models/test_set.rb index c4d0e43db..86ae6887b 100644 --- a/app/models/test_set.rb +++ b/app/models/test_set.rb @@ -1,5 +1,5 @@ class TestSet < ActiveRecord::Base default_scope :order => 'id asc' - attr_accessible :challenge_id, :input, :output, :game_id, :actual_output + attr_accessible :challenge_id, :input, :output, :game_id, :actual_output, :is_public, :result, :position belongs_to :challenge end diff --git a/db/migrate/20170416064210_add_position_to_test_sets.rb b/db/migrate/20170416064210_add_position_to_test_sets.rb new file mode 100644 index 000000000..67c3b2eaf --- /dev/null +++ b/db/migrate/20170416064210_add_position_to_test_sets.rb @@ -0,0 +1,5 @@ +class AddPositionToTestSets < ActiveRecord::Migration + def change + add_column :test_sets, :position, :integer + end +end From 9328c771b019acc7d3e8eccfd9579152b021481e Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 17 Apr 2017 10:11:17 +0800 Subject: [PATCH 58/74] =?UTF-8?q?challenge=20show=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 29 +++++++++++---------------- app/views/challenges/show.html.erb | 29 ++------------------------- app/views/shixuns/_form.html.erb | 2 +- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 188018718..5a90f288c 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -32,28 +32,23 @@ class ShixunsController < ApplicationController challenges = @shixun.challenges.includes(:test_sets) challenges.each do |challenge| pipeline_script = challenge.try(:pipeline_script).nil? ? challenge.try(:pipeline_script) : Base64.encode64(challenge.try(:pipeline_script)) - challenge_script = {:challengeStage => challenge.position, :challengePipeline => pipeline_script} + challenge_script = {:challengeStage => "#{challenge.position}", :challengePipeline => "#{pipeline_script}"} fragments << challenge_script challenge.test_sets.each do |test_set| - test_cases = {:casdId => test_set.id, :input => test_set.input, :output => test_set.output} + test_cases = {:caseId => test_set.id.to_s, :input => test_set.input, :output => test_set.output} testSet << test_cases end - test_sets_list = {:challengeStage => challenge.position, :challengeTestCases => testSet} + test_sets_list = {:challengeStage => challenge.position.to_s, :challengeTestCases => testSet} testCases << test_sets_list end - gameInfo = {:trainingID => @shixun.id, :operationEnvironment => @shixun.language, :challengePipelines => fragments, :testCases => testCases} + gameInfo = {:trainingID => @shixun.id.to_s, :operationEnvironment => @shixun.language, :challengePipelines => fragments, :testCases => testCases} fragments = fragments.to_json uri = URI("#{jenkins_shixuns}/jenkins-exec/game/publishGame") - params = {gameInfo:gameInfo} - begin - res = uri_exec uri, params - rescue - @jenkin_error = true - raise "网络异常，请稍后重试" - end + params = {gameInfo:gameInfo.to_json} + res = uri_exec uri, params if res['code'] == 0 @shixun.update_attribute(:status, 1) - @shixun.update_attribute(:script, res) + @shixun.update_attribute(:script, res["msg"]) end rescue respond_to do |format| @@ -233,14 +228,14 @@ class ShixunsController < ApplicationController jenkins_shixuns = Redmine::Configuration['jenkins_shixuns'] if myshixun.save! MyshixunMember.create!(:myshixun_id => myshixun.id, :user_id => User.current.id, :role => 1) - rep_url = git_repository_url(myshixun, "Myshixun") - uri = URI("#{jenkins_shixuns}/jenkins-exec/api/createJob") - pipeLine = "#{Base64.encode64(shixun.script)}" - params = {jobName: "myshixun_#{myshixun.id}", pipeLine: pipeLine, gitUrl:rep_url} - res = uri_exec uri, params rep = Repository.new(:myshixun_id => myshixun.id, :identifier => gshixun.name,:project_id => -1, :shixun_id => -2) rep.type = "Repository::Gitlab" rep.save! + rep_url = git_repository_url(myshixun, "Myshixun") + uri = URI("#{jenkins_shixuns}/jenkins-exec/game/openGameInstance") + pipeLine = "#{Base64.encode64(shixun.script)}" + params = {jobNameForInstance: "myshixun_#{myshixun.id}", gamePipelineScript: pipeLine, instanceGitURL:rep_url} + res = uri_exec uri, params if (res && res['code'] != 0) raise("Job 创建失败") end diff --git a/app/views/challenges/show.html.erb b/app/views/challenges/show.html.erb index d389de968..86f52252e 100644 --- a/app/views/challenges/show.html.erb +++ b/app/views/challenges/show.html.erb @@ -74,26 +74,6 @@ 输入输出
    -
  • - -
      - <% if @challenge_samples.count > 0 %> - <% @challenge_samples.each_with_index do |sample, index| %> -
    • -

      - 组<%= index + 1 %> - - -

      -
      输入：

      <%= sample.input %>

      -
      希望输出：

      <%= sample.output %>

      -
      • - <% end %> - <% else %> - 无 - <% end %> -
    -
    • @@ -103,7 +83,8 @@

      测试集<%= index + 1 %>

      -

      <%= test.output %>

      +
      输入：

      <%= test.input %>

      +
      输出：

      <%= test.output %>

      <% end %> <% else %> @@ -111,12 +92,6 @@ <% end %>
    • -
  • - -
    - 自动评测脚本 -
    -
  • <% unless @challenge_tags.blank? %> diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index 020d12da2..17118a9a4 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -17,7 +17,7 @@
  • - + <%= f.kindeditor :description, :editor_id => 'project_create_editor', :owner_id => @project.nil? ? 0: @project.id, :owner_type => OwnerTypeHelper::PROJECT, From e7c7594762ef3a9c782d8121319f6d1d86f22702 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 17 Apr 2017 10:29:15 +0800 Subject: [PATCH 59/74] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=99=BE=E5=BA=A6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=81=9A=E6=B5=8B=E8=AF=95=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_game_results.html.erb | 134 ++++++++++++++++--------- app/views/games/_games_list.html.erb | 2 +- 2 files changed, 87 insertions(+), 49 deletions(-) diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb index 3a114cb6b..87a2080ab 100644 --- a/app/views/games/_game_results.html.erb +++ b/app/views/games/_game_results.html.erb @@ -12,64 +12,102 @@
    -
    - - - -
    -
    -
    -
    -
    - <%= render :partial => 'game_result_order' %> - <% @test_sets.each_with_index do |test_set, index| %> -
    -
    - - 测试集 <%= index + 1 %> - <% unless test_set.result? %> - - <% end %> - <% unless test_set.is_public? %> - - <% end %> -
    - <% if test_set.is_public? %> -
    -
      -
    • 输入：<%= test_set.input %>
      • -
    • 实际输出：<%= test_set.actual_output %>
      • -
    • 期望输出：<%= test_set.output %>
      • -
    -
    - <% end %> +
    + + \ No newline at end of file diff --git a/app/views/shixuns/publish.js.erb b/app/views/shixuns/publish.js.erb index db29bb5b8..6ad466d10 100644 --- a/app/views/shixuns/publish.js.erb +++ b/app/views/shixuns/publish.js.erb @@ -1,6 +1,6 @@ <% if @jenkin_error %> var htmlvalue = "<%= escape_javascript(render :partial => 'shixuns/monitor_tip') %>"; - pop_box_new(htmlvalue,460,316); + pop_box_new(htmlvalue,460,406); <% else %> $("#shixun_top").html('<%= escape_javascript(render :partial => 'shixuns/shixun_top') %>'); <% end %> From f6998fb6ab3978abd52031fb61fc65766dd56484 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 17 Apr 2017 15:39:01 +0800 Subject: [PATCH 69/74] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 4 ++-- app/views/shixuns/_shixun_top.html.erb | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 7a742f7c9..bd26fd7a4 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -5,7 +5,7 @@ class ShixunsController < ApplicationController before_filter :require_login before_filter :find_shixun, :except => [ :index, :new, :create] before_filter :shixun_view_allow, :only => [:show] - before_filter :require_manager, :only => [ :settings, :add_script] + before_filter :require_manager, :only => [ :settings, :add_script, :publish] include ApplicationHelper @@ -266,7 +266,7 @@ class ShixunsController < ApplicationController # 实训管理员或者超级管理员 def require_manager - render_403 unless User.current.manager_of_shixun?(@shixun) + render_403 unless (User.current.manager_of_shixun?(@shixun) || User.current.admin?) end end diff --git a/app/views/shixuns/_shixun_top.html.erb b/app/views/shixuns/_shixun_top.html.erb index a884cddf6..867844320 100644 --- a/app/views/shixuns/_shixun_top.html.erb +++ b/app/views/shixuns/_shixun_top.html.erb @@ -13,7 +13,9 @@ <%= link_to "发布实训", publish_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", :id => "challenge_begin", :remote => true %> <% end %> <% else %> - <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", :id => "challenge_begin" %> + <% if @shixun.status == 1 %> + <%= link_to "开始挑战", shixun_exec_shixun_path(@shixun), :class => "fr task-btn task-btn-orange", :id => "challenge_begin" %> + <% end %> <% end %> <% end %>
    From 02978101e4f49f3e1c36b286e4a0209ee3af6904 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 17 Apr 2017 15:51:44 +0800 Subject: [PATCH 70/74] =?UTF-8?q?=E5=AE=9E=E8=AE=ADtpi=E7=9A=84=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/show.js.erb | 4 ++-- app/views/layouts/base_myshixun.html.erb | 1 + app/views/shixuns/_form.html.erb | 2 +- app/views/shixuns/_settings_edit.html.erb | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index 1d3bdf84c..cc1392d7f 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,4 +1,4 @@ $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); $("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); -fadein = 0; // 使左侧导航栏恢复原始状态 - +$("#all_task_show").hide(); +fadein = 0; diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index a03c93300..af231f213 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/app/views/layouts/base_myshixun.html.erb @@ -88,6 +88,7 @@ $("#current_task_tab").click(function(){ $("#current_task_tab").addClass('leftnav-active'); $("#all_task_tab").removeClass('leftnav-active'); + c = 0; }); <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %> diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb index 17118a9a4..fc1ce97f8 100644 --- a/app/views/shixuns/_form.html.erb +++ b/app/views/shixuns/_form.html.erb @@ -17,7 +17,7 @@
  • - + <%= f.kindeditor :description, :editor_id => 'project_create_editor', :owner_id => @project.nil? ? 0: @project.id, :owner_type => OwnerTypeHelper::PROJECT, diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb index a18631dcc..6f2dada29 100644 --- a/app/views/shixuns/_settings_edit.html.erb +++ b/app/views/shixuns/_settings_edit.html.erb @@ -10,7 +10,7 @@
  • - + <%= f.kindeditor :description, :editor_id => 'shixun_setting_editor', :owner_id => @shixun.nil? ? 0: @shixun.id, :owner_type => OwnerTypeHelper::PROJECT, From 4a950dbdfb38a072ef0978ae4f9a49aaa9a98470 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 17 Apr 2017 16:30:37 +0800 Subject: [PATCH 71/74] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=8F=8A=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index bd26fd7a4..46a9d8093 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -70,7 +70,8 @@ class ShixunsController < ApplicationController end myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first unless myshixun.blank? - redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun.id) + logger.info("current task id is #{myshixun.current_task}") + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) return end repository = @shixun.repository @@ -93,13 +94,12 @@ class ShixunsController < ApplicationController else raise("网络异常，请稍后重试") end - respond_to do |format| - format.html{myshixun_game_url(myshixun.current_task, :myshixun_id => myshixun)} - end + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) rescue Exception => e - flash[:error] = l(:notice_shixun_failed_exec)+ " : " + e.message + flash[:error] = e.message + logger.info("failed to exec shixun: current task id is #{e}") @g.delete_project(gshixun.id) if !gshixun.id.nil? - redirect_to shixun_path(@shixun) + redirect_to shixun_challenges_path(@shixun) raise ActiveRecord::Rollback end end @@ -237,7 +237,7 @@ class ShixunsController < ApplicationController rep.save! rep_url = git_repository_url(myshixun, "Myshixun") uri = URI("#{jenkins_shixuns}/jenkins-exec/game/openGameInstance") - pipeLine = "#{Base64.encode64(shixun.script)}" + pipeLine = "#{shixun.script}" params = {jobNameForInstance: "myshixun_#{myshixun.id}", gamePipelineScript: pipeLine, instanceGitURL:rep_url} res = uri_exec uri, params if (res && res['code'] != 0) From 05dbce6fa9f8284ffbfb5e273923b87018dfa4d3 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 17 Apr 2017 17:01:28 +0800 Subject: [PATCH 72/74] =?UTF-8?q?codemirror=E9=AB=98=E5=BA=A6=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_file_edit_form.html.erb | 3 +-- app/views/games/_game_show.html.erb | 4 +-- app/views/games/_repository.html.erb | 32 ++++++++++++++--------- app/views/games/entry.js.erb | 2 +- public/stylesheets/css/bigdata-common.css | 4 +++ public/stylesheets/css/taskstyle.css | 4 +-- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb index ace44f895..cc47100a2 100644 --- a/app/views/games/_file_edit_form.html.erb +++ b/app/views/games/_file_edit_form.html.erb @@ -38,8 +38,7 @@ // $("#challenge-answer-edit-small" ).nextAll(".CodeMirror").css("line-height", 1.2); $(document).ready(function(){ // 设置codemirror的高度/宽度自适应 - var code_height = $("#new_repository_contents").height() - $("#top_repository").height() - 10; - editor_CodeMirror.setSize("auto",code_height+"px"); + editor_CodeMirror.setSize("auto","auto"); editor_CodeMirror.refresh(); }); \ 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 965e228e9..9853c9e13 100644 --- a/app/views/games/_game_show.html.erb +++ b/app/views/games/_game_show.html.erb @@ -66,9 +66,7 @@
    -
    - <%= render :partial => 'games/repository' %> -
    + <%= render :partial => 'games/repository' %>
    <%= render :partial => 'games/game_results' %> diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 0ccaf77e7..cade2d571 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -3,19 +3,25 @@ <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %>
    - +
    -
    - <% if params[:action] == "entry" || @file_open %> -
    - <%= render :partial => 'games/file_edit_form', :locals => {:filename => @path, :content => @content} %> +
    +
    +
    +
    +
    + <% if params[:action] == "entry" || @file_open %> +
    + <%= render :partial => 'games/file_edit_form', :locals => {:filename => @path, :content => @content} %> +
    + <% else %> + <% unless @entries.blank? %> + <%= render :partial => 'tree', :locals => { :extend => false}%> + <% end %> + <% end %> +
    - <% else %> - <% unless @entries.blank? %> - <%= render :partial => 'tree', :locals => { :extend => false}%> - <% end %> - <% end %> -
    - - +
    +
    +
    \ No newline at end of file diff --git a/app/views/games/entry.js.erb b/app/views/games/entry.js.erb index 20cb2502f..23f0de04e 100644 --- a/app/views/games/entry.js.erb +++ b/app/views/games/entry.js.erb @@ -1,4 +1,4 @@ -$("#new_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); +$("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); diff --git a/public/stylesheets/css/bigdata-common.css b/public/stylesheets/css/bigdata-common.css index 4621786a7..96c744e93 100644 --- a/public/stylesheets/css/bigdata-common.css +++ b/public/stylesheets/css/bigdata-common.css @@ -7,6 +7,10 @@ ol,ul,li{ list-style-type:none} a:link,a:visited{text-decoration:none;color:#898989; } a:hover {color:#29bd8b;} input,textarea,select{ background: #fff; border:1px solid #ccc; color:#666;} +/*侧滚动条*/ +::-webkit-scrollbar { width:10px; height:10px; background-color: #F5F5F5; border-radius: 10px; } +::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); border-radius: 10px; background-color: #F5F5F5; } +::-webkit-scrollbar-thumb { border-radius: 10px; -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3); background-color: #555; } /*万能清除浮动*/ .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden;} .clearfix{clear:both;zoom:1} diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css index 0efc868f0..95df908ae 100644 --- a/public/stylesheets/css/taskstyle.css +++ b/public/stylesheets/css/taskstyle.css @@ -45,7 +45,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top: .undis {display:none;} .dis {display:block;} .tab-info{ } -.content-editor-inner{ overflow:auto;height: 813px} +.content-editor-inner{ overflow:auto;} .tab-info-inner{ overflow:auto; height:600px; margin:0 0 0px 15px;padding-top: 15px} .content-history-inner{height:120px; overflow:auto; padding:15px;} .content-history{width:48.7%; min-width:500px; } @@ -144,7 +144,7 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f .-flex-basic100{flex-basis: 100%!important;} .-header-title{ max-width:500px; font-weight: normal;} -.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;} +.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;} .-header-right-info{ padding:10px; background:#fff; border-radius:3px; top:50px; right:10px; position: relative;display:none;color:#666;} .-header-right-info font { border: 1px solid #dddddd; display: block;border-width: 8px; position: absolute; top: -15px;right:20px;border-style: solid; border-color: transparent transparent #fff transparent; font-size: 0; line-height: 0;} .-header-right-box:hover .-header-right-info{ display: block;} From d670cf8a367ca75bda73a0b433455d7e90a0cf2f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 18 Apr 2017 09:51:42 +0800 Subject: [PATCH 73/74] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0=E6=B5=8B=E8=AF=95=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/_code_actions.html.erb | 70 +++++++++++++++++++----- public/stylesheets/css/bigdata-popup.css | 15 ++++- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 358565461..d3be1b372 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -1,8 +1,9 @@ 耗时：<%= game_spend_time(@game.open_time, @game.updated_at) %> +
    <% if @game.status == 0 %> -评测 +评测 <% elsif @game.status == 1 %> - 评测中.. + 评测中.. <% elsif @game.status == 2 %> <%= link_to "下 一 步 ", {:controller => 'games',:action => "next_step", :id => @game, :myshixun_id => @myshixun}, @@ -10,12 +11,12 @@ :onclick => "training_task_submmit();", :remote => true %> <% end %> - +