diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index 58b43a737..953a3575f 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -2,12 +2,12 @@ class ChallengesController < ApplicationController layout "base_shixun" before_filter :check_authentication - before_filter :find_shixun, :only => [:index, :new, :create, :destroy, :challenge_build] - before_filter :find_challenge, :only => [:show, :edit, :update, :challenge_build, :index_up, :index_down, :destroy] + before_filter :find_shixun, :only => [:index, :new, :create, :destroy, :challenge_build, :update_evaluation] + before_filter :find_challenge, :only => [:show, :edit, :update, :challenge_build, :index_up, :index_down, :destroy, :update_evaluation] before_filter :build_challege_from_params, :only => [:new, :create] before_filter :tpi_manager_allowed, :only => [:challenge_build, :destroy, :edit, :new, :create] before_filter :allowed_view, :only => [:show] - before_filter :query_challeges, :only => [:show, :edit, :update] + before_filter :query_challeges, :only => [:show, :edit, :update, :update_evaluation] before_filter :find_shixun_language, :only => [:show, :new, :edit] include ApplicationHelper @@ -26,6 +26,13 @@ class ChallengesController < ApplicationController @challenge.position = challenge_count + 1 @challenge.shixun = @shixun @challenge.user = User.current + @challenge.save! + + respond_to do |format| + format.html {redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun)} + end + +=begin ActiveRecord::Base.transaction do begin @challenge.save! @@ -53,6 +60,7 @@ class ChallengesController < ApplicationController raise ActiveRecord::Rollback end end +=end end # 处理新建challenge返回的pipeline片段 @@ -84,6 +92,8 @@ class ChallengesController < ApplicationController end def edit + @tab = params[:tab].blank? ? 1 : params[:tab].to_i + @editor = params[:editor] # 编辑模式 end def destroy @@ -94,6 +104,9 @@ class ChallengesController < ApplicationController end def update + @challenge.update_attributes(params[:challenge]) + redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]) +=begin respond_to do |format| ActiveRecord::Base.transaction do @challenge.update_attributes(params[:challenge]) @@ -123,6 +136,40 @@ class ChallengesController < ApplicationController end end end +=end + end + + def update_evaluation + ActiveRecord::Base.transaction do + @challenge.update_attributes(params[:challenge]) + begin + if params[:tab].to_i == 2 + @test_sets.delete_all unless @test_sets.blank? + 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?) + params[:test_set][:hidden][index].to_i == 0 ? open = 1 : open = 0 + TestSet.create(:challenge_id => @challenge.id, :input => input, :output => params[:test_set][:output][index], :is_public => open, :position => (index + 1)) + end + end + end + elsif params[:tab].to_i == 5 + @challenge_tags.delete_all unless @challenge_tags.blank? + unless params[:knowledge].blank? + params[:knowledge][:input].each do |input| + ChallengeTag.create(:name => input, :challenge_id => @challenge.id) + end + end + end + # 向jenkins端发送请求，构建公共测试用例 + add_shixun_modify_status(@shixun, 1) + redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]) + rescue Exception => e + flash[:error] = "#{e.message}" + redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]) + raise ActiveRecord::Rollback + end + end end def index_down diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index a974abce7..84f445f53 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -44,22 +44,29 @@ class CoursesController < ApplicationController @user = User.current @search = params[:search].nil? ? '' : params[:search] @select = params[:select].nil? ? '' : params[:select] - # 全部课堂 + @is_end = params[:is_end].nil? ? 0 : params[:is_end].to_i #是否归档 + @syllabuses_num = Course.where("is_end = 0 and is_delete = 0").count - all_syllabuses = Course.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc") - # 我参与的课堂 - join_syllabuses = @user.courses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'").order("created_at desc") + #@syllabus_count = all_syllabuses.count # 我创建的课堂 - create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'").order("created_at desc") - @syllabus_count = all_syllabuses.count + create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") + # 我参与的课堂 + join_syllabuses = @user.courses.where("is_end = #{@is_end} and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'") @join_syllabuses_count = join_syllabuses.count @create_syllabuses_count = create_syllabuses.count + # 页面筛选的课程 if @select == "create" @syllabuses = create_syllabuses elsif @select == "join" @syllabuses = join_syllabuses + elsif @select == "end" + # 归档的课堂 + end_syllabuses = Course.where("is_end = #{@is_end} and name like '%#{@search}%'") + @syllabuses = end_syllabuses else + # 全部课堂 + all_syllabuses = Course.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") @syllabuses = all_syllabuses end diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 5157197e4..13aa8349e 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -200,8 +200,15 @@ class ShixunsController < ApplicationController shixun_ids = Myshixun.where(:user_id => User.current, :status => 1).map(&:shixun_id) @shixuns = @shixuns.where(:id => shixun_ids) end - @shixuns = @shixuns.reorder(order_str) - + if @order == "created_at" + @shixuns =@shixuns.reorder(order_str) + else + # 最热排序 + @shixuns.each do |shixun| + shixun[:myshixunCount] = shixun.myshixuns.count + end + @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]} + end # @shixuns = Shixun.where(:authentication => 1).reorder(order) @shixuns_count = @shixuns.count @limit = 16 @@ -577,6 +584,7 @@ class ShixunsController < ApplicationController @myshixun = Myshixun.where(:id => params[:myshixun_id]).first @is_modify = ShixunModify.where(:myshixun_id => params[:myshixun_id], :shixun_id => @shixun.try(:id), :status => 1).first @mail = User.current.mail.blank? + end private diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 10064d77b..da7c72a84 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -45,7 +45,7 @@ class UsersController < ApplicationController :user_courses4show,:user_projects4show,:user_contests4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction, :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages,:choose_user_course,:user_courselist,:user_projectlist,:sort_syllabus_list, :sort_project_list,:my_homeworks,:manage_or_receive_homeworks,:search_m_r_homeworks, :cancel_or_collect,:expand_courses,:homepage, :user_issues, :course_community, :project_community, :contest_community, - :shixuns, :user_show_course_list] + :shixuns, :user_show_course_list, :shixuns_or_courses_filter] before_filter :auth_user_extension, only: :show before_filter :show_system_message, :only => [:show] #before_filter :rest_user_score, only: :show @@ -2030,6 +2030,7 @@ class UsersController < ApplicationController @user_fanlist_count = fan_query.count(); @user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12); +=begin # 合作者及创建者 ids = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}") # 已挑战过 @@ -2038,12 +2039,13 @@ class UsersController < ApplicationController ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank? id = ids + ids2 id = id.uniq +=end if @user == User.current - @shixuns = Shixun.where(:id => id).order("created_at desc") + @shixuns = Shixun.where(:user_id => @user).order("created_at desc") else - @shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc") + @shixuns = Shixun.where(:status => [2, 3], :id => @user).order("created_at desc") end - @limit = 8 + @limit = 5 @is_remote = true @shixuns_count = @shixuns.count @shixuns_pages = Paginator.new @shixuns_count, @limit, params['page'] || 1 @@ -2193,11 +2195,67 @@ class UsersController < ApplicationController end end + # @params: index表示 "实训" 或 "课程" 那个的筛选 + # filter 表示筛选的条件[challenge => "我挑战的", create => "我创建的", cooperative => "合作者"] + def shixuns_or_courses_filter + if params[:index] == "shixun" + if params[:filter] == "challenge" + # 已挑战过 + id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})") + if @user == User.current + @shixuns = Shixun.where(:id => id).order("created_at desc") + else + @shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc") + end + elsif params[:filter] == "create" + if @user == User.current + @shixuns = Shixun.where(:user_id => @user).order("created_at desc") + else + @shixuns = Shixun.where(:status => [2, 3], :id => @user).order("created_at desc") + end + elsif params[:filter] == "cooperative" + # 合作者及创建者 + ids = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}") + ids = ids.map{|shixun| shixun.shixun_id} unless ids.blank? + # 我创建的id + create_id = Shixun.where(:user_id => @user).pluck(:id) + id = ids - create_id + if @user == User.current + @shixuns = Shixun.where(:id => id).order("created_at desc") + else + @shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc") + end + end + @limit = 5 + @is_remote = true + @shixuns_count = @shixuns.count + @shixuns_pages = Paginator.new @shixuns_count, @limit, params['page'] || 1 + @offset ||= @shixuns_pages.offset + @shixuns = paginateHelper @shixuns, @limit + elsif params[:index] == "course" + if params[:filter] == "manage" + @courses = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).order("updated_at desc") + elsif params[:filter] == "join" + @courses = @user.courses.not_deleted_not_end.where("tea_id != #{@user.id}").order("updated_at desc") + end + @limit = 5 + @is_remote = true + @courses_count = @courses.count + @courses_pages = Paginator.new @courses_count, @limit, params['page'] || 1 + @offset ||= @courses_pages.offset + @courses = paginateHelper @courses, @limit + end + + respond_to do |format| + format.js + end + end + + def user_show_course_list - @courses = @user.courses.not_deleted_not_end + @courses = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).order("updated_at desc") @courses_count = @courses.count - @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") - @limit = 8 + @limit = 5 @is_remote = true @courses_pages = Paginator.new @courses_count, @limit, params['page'] || 1 @offset ||= @courses_pages.offset diff --git a/app/models/challenge.rb b/app/models/challenge.rb index e37a91360..82b776c86 100644 --- a/app/models/challenge.rb +++ b/app/models/challenge.rb @@ -9,7 +9,7 @@ class Challenge < ActiveRecord::Base has_many :games, :dependent => :destroy validates_presence_of :subject - validates_presence_of :score + # validates_presence_of :score validates_presence_of :task_pass validates_length_of :subject, :maximum => 255 diff --git a/app/models/myshixun.rb b/app/models/myshixun.rb index e6692381a..5e57b85e9 100644 --- a/app/models/myshixun.rb +++ b/app/models/myshixun.rb @@ -58,9 +58,9 @@ class Myshixun < ActiveRecord::Base # 如果都完成，则当前任务为最后一个任务 def current_task games = self.games - current_game = games.select{|game| game.status==1 || game.status==0}.first + current_game = games.select{|game| game.status == 1 || game.status == 0}.first if current_game.blank? - passed_games = games.select{|game| game.status==2} + passed_games = games.select{|game| game.status == 2} current_game = passed_games.first end return current_game diff --git a/app/views/challenges/_answer_form.html.erb b/app/views/challenges/_answer_form.html.erb new file mode 100644 index 000000000..9e7ed5cde --- /dev/null +++ b/app/views/challenges/_answer_form.html.erb @@ -0,0 +1,77 @@ +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> + +
+
  • + +
    + +
    +
    • +
  • + 保存 + 取消 +
    • +
    + \ No newline at end of file diff --git a/app/views/challenges/_edit_answer.html.erb b/app/views/challenges/_edit_answer.html.erb new file mode 100644 index 000000000..1d4df206e --- /dev/null +++ b/app/views/challenges/_edit_answer.html.erb @@ -0,0 +1,41 @@ +
    + <% if @editor.blank? && @challenge.answer %> +
    +
    +

    + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +

    +
    + +
    + <% end %> + <% if @challenge.answer.blank? || !@editor.blank? %> + + <% end %> +
    + \ No newline at end of file diff --git a/app/views/challenges/_edit_evaluating.html.erb b/app/views/challenges/_edit_evaluating.html.erb new file mode 100644 index 000000000..bbc795b3a --- /dev/null +++ b/app/views/challenges/_edit_evaluating.html.erb @@ -0,0 +1,66 @@ + +
    +
    "> +
    +

    + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +

    +
    + +
    + +
    + \ No newline at end of file diff --git a/app/views/challenges/_edit_scoring.html.erb b/app/views/challenges/_edit_scoring.html.erb new file mode 100644 index 000000000..4c19ce5bd --- /dev/null +++ b/app/views/challenges/_edit_scoring.html.erb @@ -0,0 +1,37 @@ + +
    +
    "> +
    +

    + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +

    +
    + +
    + +
    + \ No newline at end of file diff --git a/app/views/challenges/_edit_skill.html.erb b/app/views/challenges/_edit_skill.html.erb new file mode 100644 index 000000000..2a00676bd --- /dev/null +++ b/app/views/challenges/_edit_skill.html.erb @@ -0,0 +1,36 @@ +
    +
    "> +
    +

    + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +

    +
    + +
    + +
    + diff --git a/app/views/challenges/_edit_task_pass.html.erb b/app/views/challenges/_edit_task_pass.html.erb new file mode 100644 index 000000000..65409d177 --- /dev/null +++ b/app/views/challenges/_edit_task_pass.html.erb @@ -0,0 +1,48 @@ +
    + <% if @editor.blank? && @challenge.subject %> +
    +
    +

    + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +

    +
    + +
    + <% end %> + <% if @challenge.subject.blank? || !@editor.blank? %> + + <% end %> +
    + \ No newline at end of file diff --git a/app/views/challenges/_evaluating_form.html.erb b/app/views/challenges/_evaluating_form.html.erb new file mode 100644 index 000000000..83fb35cc1 --- /dev/null +++ b/app/views/challenges/_evaluating_form.html.erb @@ -0,0 +1,167 @@ + + +
    +
  • + + <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：src/test/welcome.java", :maxlength => "256" %> +
    • +
  • + + <%= f.text_field :exec_path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "输入关卡需要执行的文件路径，如：src/test/main.java", :maxlength => "256" %> +
    • +
  • + + <%= select_tag :evaluation_way, options_for_select([["输入输出", 1]]), :name => 'challenge[evaluation_way]', :class => " fl", :style => "height: 40px; width:200px;" %> + 请选择自动检测学员是否完成本任务的评测标准 +
    • +
  • + <% if params[:action] == "edit" && @challenge.test_sets.count > 0 %> + + + <% else %> + + + <% end %> +
    • +
  • + 保存 + 取消 +
    • +
    + + diff --git a/app/views/challenges/_score_form.html.erb b/app/views/challenges/_score_form.html.erb new file mode 100644 index 000000000..7f8e66622 --- /dev/null +++ b/app/views/challenges/_score_form.html.erb @@ -0,0 +1,81 @@ +
    +
  • + + <%= 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 => "请输入分值（只能是数字）" %> + <%= select_tag :challenge_score, options_for_select([100, 200]), :name => 'challenge[score]', :class => " fl", :style => "height: 40px; width:170px;" %> +
    + +
    • + +
    +
      +
    1. 如果学员查看了参考答案，则不能得到相应的经验值
      2. +
    2. 如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+100经验值、+100金币
      3. +
    +
    + +
  • + 保存 + 取消 +
    • +
    + + diff --git a/app/views/challenges/_skill_form.html.erb b/app/views/challenges/_skill_form.html.erb new file mode 100644 index 000000000..e7f0f81b9 --- /dev/null +++ b/app/views/challenges/_skill_form.html.erb @@ -0,0 +1,63 @@ +
    +
  • + +
    + <% if params[:action] == "edit" && @challenge_tags.count > 0 %> + <% @challenge_tags.each do |tag| %> +
    + + +
    + <% end %> + <% end %> + +
    + + +
    + +添加 +
    +
    • +

    +
    +
      +
    1. 学员为参考答案通过了本阶段的评测时将获得技能，否则不能获得技能
      2. +
    +
    + +
  • + 保存 + 取消 +
    • +
    + + diff --git a/app/views/challenges/_task_pass_form.html.erb b/app/views/challenges/_task_pass_form.html.erb new file mode 100644 index 000000000..e1849fc65 --- /dev/null +++ b/app/views/challenges/_task_pass_form.html.erb @@ -0,0 +1,107 @@ +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> + + + +
    +
  • + + <%= f.text_field :subject, :class => "panel-form-width-690 fl panel-box-sizing", :no_label => true, :placeholder => "请输入当前任务的名称（此信息将提前泄露给学员）" %> + +
    • +
  • + +
    + +
    + +
    • +
  • + 保存 + 取消 +
    • +
    + + diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb index bf88b7a80..55bae7a68 100644 --- a/app/views/challenges/edit.html.erb +++ b/app/views/challenges/edit.html.erb @@ -1,22 +1,54 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: true, prettify: false, init_activity: false) %> - <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> - <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -<% end %> +<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> +<%= stylesheet_link_tag "/assets/codemirror/codemirror" %> + +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js' %> +
    -

    编辑阶段（第<%= @challenge.position %>关）

    +

    阶段编辑（第<%= @challenge.position %>关）

    -
    -
      - <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun) do |f| %> - <%= render :partial => "form", :locals => {:f => f} %> - <% end %> -
    -
    - +
    + +
    + <% if @tab == 1 || @tab.blank? %> + <%= render :partial => "edit_task_pass" %> + <% elsif @tab == 2 %> + <%= render :partial => "edit_evaluating" %> + <% elsif @tab == 3 %> + <%= render :partial => "edit_answer" %> + <% elsif @tab == 4 %> + <%= render :partial => "edit_scoring" %> + <% elsif @tab == 5 %> + <%= render :partial => "edit_skill" %> + <% end %>
    - diff --git a/app/views/challenges/new.html.erb b/app/views/challenges/new.html.erb index a5234ce72..a01035538 100644 --- a/app/views/challenges/new.html.erb +++ b/app/views/challenges/new.html.erb @@ -1,5 +1,24 @@ <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> + + +
    +
    +

    新建阶段

    +
    +
    + +
    +
    + + + + +<% if false %>

    新建阶段

    @@ -12,6 +31,6 @@
    - +<% end %> diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 12fa74002..466b8d9d4 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -8,15 +8,16 @@
    - @search) %>" id="courses_index_syllabuses_1" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂 - @search) %>" id="courses_index_syllabuses_2" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的 - @search) %>" id="courses_index_syllabuses_3" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的 + @is_end,:search => @search) %>" id="courses_index_syllabuses_1" class="course_filtrate fl course_filtrate_bg" data-tab="all" data-remote="true">全部课堂 + @is_end, :search => @search) %>" id="courses_index_syllabuses_2" class="course_filtrate fl" data-tab="create" data-remote="true">我管理的 + @is_end, :search => @search) %>" id="courses_index_syllabuses_3" class="course_filtrate fl" data-tab="join" data-remote="true">我参与的 -