cafe-grader-web Commit - r246:180b30450ef3

cafe-grader-web

Commit `r246:180b30450ef3` public

parent | child

Description:

fixed codejom stutus update to ignore disabled problems

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

r246:180b30450ef3 - Sat, 30 Jan 2010 02:47:05 - 1 file changed: 2 inserted, 2 deleted

app/models/user.rb ¶ +2 -2

-            - # -*- coding: undecided -*-
+            + # -*- coding: utf-8 -*-
               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 has_many :test_requests, :order => "submitted_at DESC"
                 has_many :messages,
                          :class_name => "Message",
                          :foreign_key => "sender_id",
                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :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..20
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :member1_full_name
                 validates_length_of :member1_full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                     return nil if site==nil
                     return site.time_left
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     if contest_stat==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if Configuration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     return false if contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false
                   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.num_problems_passed = (self.submission_statuses.find_all {|s| s.passed and s.problem.available }).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')
                         if self.site==nil
                           self.site = Site.find(1)  # when 'default has be renamed'
                         end
                       end
                     rescue
                     end
                   end
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     if user and (user.login != self.login)
                       self.errors.add_to_base("Email has already been taken")
                     end
                   end

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

r246:180b30450ef3 - Sat, 30 Jan 2010 02:47:05 - 1 file changed: 2 inserted, 2 deleted

Sign in to your account

Commit r246:180b30450ef3 public

Author

r246:180b30450ef3 - Sat, 30 Jan 2010 02:47:05 - 1 file changed: 2 inserted, 2 deleted

Commit `r246:180b30450ef3` public