cafe-grader-web Commit - r607:350b2d080045

cafe-grader-web

Commit `r607:350b2d080045` public

parent | child

Description:

- start adding testcases into database - fix download button for score report

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r607:350b2d080045 - Mon, 17 Oct 2016 11:02:03 - 7 files changed: 77 inserted, 6 deleted

app/models/testcase.rb created 644 ¶ +4

@@ -0,0 +1,4
	1	+ class Testcase < ActiveRecord::Base
	2	+ belongs_to :problem
	3	+ attr_accessible :group, :input, :num, :score, :sol
	4	+ end

db/migrate/20161014091417_create_testcases.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class CreateTestcases < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :testcases do \|t\|
	4	+ t.references :problem
	5	+ t.integer :num
	6	+ t.integer :group
	7	+ t.integer :score
	8	+ t.text :input
	9	+ t.text :sol
	10	+
	11	+ t.timestamps
	12	+ end
	13	+ add_index :testcases, :problem_id
	14	+ end
	15	+ end

spec/models/testcases_spec.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ require 'spec_helper'
	2	+
	3	+ describe Testcases do
	4	+ pending "add some examples to (or delete) #{__FILE__}"
	5	+ end

app/controllers/report_controller.rb ¶ +35 -2

+            + require 'csv'
+            +
               class ReportController < ApplicationController
                 before_filter :authenticate
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 def max_score
                 end
                 def current_score
                   @problems = Problem.find_available_problems
                   @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
-            -     if params[:commit] == 'download csv' then
+            +     if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'current_score'
                   end
                 end
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   params[:problem_id].each do |id|
                     next unless id.strip != ""
                     pid = Problem.find_by_id(id.to_i)
                     @problems << pid if pid
                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.find(:all, :include => [:contests, :contest_stat])
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   since_id = params.fetch(:min_id, 0).to_i
                   until_id = params.fetch(:max_id, 0).to_i
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users,since_id,until_id)
                   #rencer accordingly
-            -     if params[:commit] == 'download csv' then
+            +     if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.find_available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                     ustat[0] = u
                     problems.each do |p|
                       unless get_last_score
                         #get max score
                         max_points = 0
                         Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                           max_points = sub.points if sub and sub.points and (sub.points > max_points)
                         end
                         ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                       else
                         #get latest score
                         sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                         if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                           ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                         else
                           ustat << [0,false]
                         end
                       end
                     end
                     scorearray << ustat
                   end
                   return scorearray
                 end
+            +   def gen_csv_from_scorearray(scorearray,problem)
+            +     CSV.generate do |csv|
+            +       #add header
+            +       header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
+            +       problem.each { |p| header << p.name }
+            +       header += ['Total','Passed']
+            +       csv << header
+            +       #add data
+            +       scorearray.each do |sc|
+            +         total = num_passed = 0
+            +         row = Array.new
+            +         sc.each_index do |i|
+            +           if i == 0
+            +             row << sc[i].login
+            +             row << sc[i].full_name
+            +             row << sc[i].activated
+            +             row << (sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no')
+            +             row << sc[i].contests.collect {|c| c.name}.join(', ')
+            +           else
+            +             row << sc[i][0]
+            +             total += sc[i][0]
+            +             num_passed += 1 if sc[i][1]
                         end
+            +         end
+            +         row << total
+            +         row << num_passed
+            +         csv << row
+            +       end
+            +     end
+            +   end
+            +
+            + end

app/models/problem.rb ¶ +1

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
+            +   has_many :testcases, :dependent => :destroy
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100

app/views/report/max_score.html.haml ¶ +3 -3

               %h1 Maximum score
               = form_tag report_show_max_score_path
               .row
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Problems
                     .panel-body
                       %p
                         Select problem(s) that we wish to know the score.
                       = label_tag :problem_id, "Problems"
                       = select_tag 'problem_id[]',
-            -             options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}),
+            +             options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
                           { class: 'select2 form-control', multiple: "true" }
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Submission range
                     .panel-body
                       %p
                         Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
                       .form-group
                         = label_tag :from, "Min"
                         = text_field_tag 'from_id', nil, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
                         = text_field_tag 'to_id', nil, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .panel-body
                       .radio
                         %label
                           = radio_button_tag 'users', 'all', true
                           All users
                       .radio
                         %label
                           = radio_button_tag 'users', 'enabled'
                           Only enabled users
               .row
                 .col-md-12
-            -     = button_tag 'Show', class: "btn btn-primary btn-large"
+            +     = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
-            -     = button_tag 'Download CSV', class: "btn btn-primary btn-large"
+            +     = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

db/schema.rb ¶ +14 -1

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20161008050135) do
+            + ActiveRecord::Schema.define(:version => 20161014091417) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at",                      :null => false
                   t.datetime "updated_at",                      :null => false
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at",       :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at",       :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
+            +   create_table "testcases", :force => true do |t|
+            +     t.integer  "problem_id"
+            +     t.integer  "num"
+            +     t.integer  "group"
+            +     t.integer  "score"
+            +     t.text     "input"
+            +     t.text     "sol"
+            +     t.datetime "created_at", :null => false
+            +     t.datetime "updated_at", :null => false
+            +   end
+            +
+            +   add_index "testcases", ["problem_id"], :name => "index_testcases_on_problem_id"
+            +
                 create_table "user_contest_stats", :force => true do |t|
                   t.integer  "user_id"
                   t.datetime "started_at"
                   t.datetime "created_at",    :null => false
                   t.datetime "updated_at",    :null => false
                   t.boolean  "forced_logout"
                 end
                 create_table "users", :force => true do |t|
                   t.string   "login",           :limit => 50
                   t.string   "full_name"
                   t.string   "hashed_password"
                   t.string   "salt",            :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "enabled",                       :default => true
                   t.string   "remark"
                   t.string   "last_ip"
                   t.string   "section"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r607:350b2d080045 - Mon, 17 Oct 2016 11:02:03 - 7 files changed: 77 inserted, 6 deleted

Sign in to your account

Commit r607:350b2d080045 public

Author

r607:350b2d080045 - Mon, 17 Oct 2016 11:02:03 - 7 files changed: 77 inserted, 6 deleted

Commit `r607:350b2d080045` public