cafe-grader-web Commit - r219:95cc49d72ca8

cafe-grader-web

Commit `r219:95cc49d72ca8` public

parent | child

Description:

added codejom_status model for computing level with basic user update

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r219:95cc49d72ca8 - Sun, 24 Jan 2010 19:54:35 - 9 files changed: 79 inserted, 1 deleted

app/models/codejom_status.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ class CodejomStatus < ActiveRecord::Base
		2	+
		3	+ belongs_to :user
		4	+
		5	+ end

db/migrate/20100124191250_create_codejom_statuses.rb created 644 ¶ +15

			@@ -0,0 +1,15
		1	+ class CreateCodejomStatuses < ActiveRecord::Migration
		2	+ def self.up
		3	+ create_table :codejom_statuses do \|t\|
		4	+ t.integer :user_id
		5	+ t.boolean :alive
		6	+ t.integer :num_problems_passed
		7	+
		8	+ t.timestamps
		9	+ end
		10	+ end
		11	+
		12	+ def self.down
		13	+ drop_table :codejom_statuses
		14	+ end
		15	+ end

test/fixtures/codejom_statuses.yml created 644 ¶ +11

			@@ -0,0 +1,11
		1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
		2	+
		3	+ one:
		4	+ user_id: 1
		5	+ alive: false
		6	+ num_problems_passed: 1
		7	+
		8	+ two:
		9	+ user_id: 1
		10	+ alive: false
		11	+ num_problems_passed: 1

test/unit/codejom_status_test.rb created 644 ¶ +8

			@@ -0,0 +1,8
		1	+ require 'test_helper'
		2	+
		3	+ class CodejomStatusTest < ActiveSupport::TestCase
		4	+ # Replace this with your real tests.
		5	+ test "the truth" do
		6	+ assert true
		7	+ end
		8	+ end

app/controllers/main_controller.rb ¶ +1

                   status = user.get_submission_status_for(problem)
                   if status == nil
                     status = SubmissionStatus.new :user => user, :problem => problem, :submission_count => 0
                   end
                   status.submission_count += 1
                   status.passed = passed
                   status.save
                   if passed
                     flash[:notice] = 'Correct solution.'
+            +       user.update_codejom_status
                   else
                     flash[:notice] = 'Incorrect solution.'
                   end
                   redirect_to :action => 'list'
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if Configuration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else

app/models/problem.rb ¶ +5

                 def random_test_pair(forbidden_numbers=nil)
                   begin
                     test_num = 1 + rand(test_pair_count)
                   end while forbidden_numbers!=nil and forbidden_numbers.include? test_num
                   test_pairs.find_by_number test_num
                 end
                 def self.find_available_problems
                   find(:all, :conditions => {:available => true}, :order => "date_added DESC")
                 end
+            +   # TODO: may try to optimize this using cache
+            +   def self.available_problem_count
+            +     return Problem.find_available_problems.length
+            +   end
+            +
                 def self.create_from_import_form_params(params, old_problem=nil)
                   problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false

app/models/user.rb ¶ +21

                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_many :test_pair_assignments, :dependent => :delete_all
                 has_many :submission_statuses
                 has_one :contest_stat, :class_name => "UserContestStat"
                 belongs_to :site
                 belongs_to :country
+            +   # For Code Jom
+            +   has_one :codejom_status
+            +
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                   end
                 end
                 def contest_started?
                   if Configuration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
+            +   # For Code Jom
+            +   def update_codejom_status
+            +     status = codejom_status || CodejomStatus.new(:user => self)
+            +     problem_count = Problem.available_problem_count
+            +     status.num_problems_passed = (self.submission_statuses.find_all {|s| s.passed}).length
+            +     status.alive = (problem_count - (status.num_problems_passed)) <= CODEJOM_MAX_ALIVE_LEVEL
+            +     status.save
+            +   end
+            +
+            +   def codejom_level
+            +     problem_count = Problem.available_problem_count
+            +     if codejom_status!=nil
+            +       return problem_count - codejom_status.num_problems_passed
+            +     else
+            +       return problem_count
+            +     end
+            +   end
+            +
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def assign_default_site
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.site==nil
                         self.site = Site.find_by_name('default')

config/environment.rb.SAMPLE ¶ +4

               # This is mainly for Code Jom contest.
               ALLOW_TEST_PAIR_IMPORT = false
               # Uncomment so that the system validates user e-mails
               # VALIDATE_USER_EMAILS = true
               # Uncomment so that Apache X-Sendfile is used when delivering files
               # (e.g., in /tasks/view).
               # USE_APACHE_XSENDFILE = true
               # Uncomment so that configuration is read only once when the server is loaded
               # Configuration.enable_caching
+            +
+            + # OPTIONS FOR CODE JOM
+            + # --------------------
+            + CODEJOM_MAX_ALIVE_LEVEL = 10

db/schema.rb ¶ +9 -1

               # 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 => 20100124054458) do
+            + ActiveRecord::Schema.define(:version => 20100124191250) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
+            +   create_table "codejom_statuses", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.boolean  "alive"
+            +     t.integer  "num_problems_passed"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.text     "description"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"

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

r219:95cc49d72ca8 - Sun, 24 Jan 2010 19:54:35 - 9 files changed: 79 inserted, 1 deleted

Sign in to your account

Commit r219:95cc49d72ca8 public

Author

r219:95cc49d72ca8 - Sun, 24 Jan 2010 19:54:35 - 9 files changed: 79 inserted, 1 deleted

Commit `r219:95cc49d72ca8` public