diff --git a/app/models/problem.rb b/app/models/problem.rb --- a/app/models/problem.rb +++ b/app/models/problem.rb @@ -14,7 +14,7 @@ DEFAULT_MEMORY_LIMIT = 32 def self.find_available_problems - Problem.available.all(:order => "date_added DESC") + Problem.available.all(:order => "date_added DESC, name ASC") end def self.create_from_import_form_params(params, old_problem=nil) @@ -43,6 +43,7 @@ if not importer.import_from_file(import_params[:file], import_params[:time_limit], import_params[:memory_limit], + import_params[:checker_name], import_to_db) problem.errors.add(:base,'Import error.') end @@ -53,6 +54,13 @@ def self.download_file_basedir return "#{Rails.root}/data/tasks" end + + def get_submission_stat + result = Hash.new + #total number of submission + result[:total_sub] = Submission.where(problem_id: self.id).count + result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id) + end protected @@ -90,6 +98,11 @@ problem.errors.add(:base,'No testdata file.') end + checker_name = 'text' + if ['text','float'].include? params[:checker] + checker_name = params[:checker] + end + file = params[:file] if !problem.errors.empty? @@ -106,7 +119,8 @@ return [{ :time_limit => time_limit, :memory_limit => memory_limit, - :file => file + :file => file, + :checker_name => checker_name }, problem] end