diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 6217532c..d946c12b 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -5,7 +5,7 @@ class ManagementsController < ApplicationController :editmd_template, :subject_level_system, :subject_setting_list, :shixun_authorization, :ec_template, :codemirror_template, :course_guide_template, :shixun_quality_score, :tech_system, :update_notice, :setting_banner, - :training_2018, :create_standard] + :create_standard] layout 'base_management' include ManagementsHelper include SortHelper @@ -100,26 +100,23 @@ class ManagementsController < ApplicationController @pay_type = params[:pay_type] @page = params[:page] || 1 @status = params[:status] - if User.current.admin? - @trainings = Training.includes(:training_payinfo) - if params[:search] && params[:search].strip != "" - @trainings = @trainings.where("trainings.name like '%#{params[:search]}%'") - end - if params[:training_type] && params[:training_type].to_i != -1 - @trainings = @trainings.where("training_type = #{params[:training_type]}") - end - if params[:pay_type] && params[:pay_type].to_i != -1 - @trainings = @trainings.where("training_payinfos.pay_type = #{params[:pay_type]}") - end - if params[:status] && params[:status].to_i != -1 - @trainings = @trainings.where("training_payinfos.status = #{params[:status]}") - end - @page = params[:page] || 1 - @all_trainings = @trainings.reorder("trainings.created_at desc") - @trainings = paginateHelper @trainings.reorder("trainings.created_at desc"), 50 - else - render_403 + @trainings = Training.includes(:training_payinfo) + if params[:search] && params[:search].strip != "" + @trainings = @trainings.where("trainings.name like '%#{params[:search]}%'") end + if params[:training_type] && params[:training_type].to_i != -1 + @trainings = @trainings.where("training_type = #{params[:training_type]}") + end + if params[:pay_type] && params[:pay_type].to_i != -1 + @trainings = @trainings.where("training_payinfos.pay_type = #{params[:pay_type]}") + end + if params[:status] && params[:status].to_i != -1 + @trainings = @trainings.where("training_payinfos.status = #{params[:status]}") + end + @page = params[:page] || 1 + @all_trainings = @trainings.reorder("trainings.created_at desc") + @trainings = paginateHelper @trainings.reorder("trainings.created_at desc"), 50 + respond_to do |format| format.js format.html diff --git a/app/views/libraries/_form.html.erb b/app/views/libraries/_form.html.erb index c5bb2ecd..e5878176 100644 --- a/app/views/libraries/_form.html.erb +++ b/app/views/libraries/_form.html.erb @@ -90,7 +90,7 @@
  • 温馨提示
  • diff --git a/app/views/managements/evaluate_simple.html.erb b/app/views/managements/evaluate_simple.html.erb index 30e8cd39..514223a3 100644 --- a/app/views/managements/evaluate_simple.html.erb +++ b/app/views/managements/evaluate_simple.html.erb @@ -5,7 +5,6 @@ ID 总耗时 - 作品更新 文件更新 中间层总耗时 pull代码 @@ -15,7 +14,8 @@ 前端轮询 结果存储 创建时间 - 最大执行时间 + 评测时最大时间 + 最新执行时间 唯一标识 实训名称 @@ -26,7 +26,6 @@ <%= record.id %> <%= record.consume_time %> - <%= record.student_work %> <%= record.file_update %> <%= record.brige %> <%= record.git_pull %> @@ -37,8 +36,9 @@ <%= record.test_cases %> <%= format_time record.created_at %> <% challenge = Game.find(record.game_id).challenge %> + <%= record.try(:exec_time) %> <%= challenge.try(:exec_time) %> - <%= record.shixun.try(:identifier) %> + <%= record.try(:identifier) %> <%= link_to record.shixun.try(:name), task_path(record.game), :target => "_blank", :title => "#{record.shixun.try(:name)}" %> <% end %> diff --git a/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb b/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb new file mode 100644 index 00000000..0b054e3c --- /dev/null +++ b/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb @@ -0,0 +1,5 @@ +class AddExecTimeToEvaluateRecords < ActiveRecord::Migration + def change + add_column :evaluate_records, :exec_time, :integer + end +end