cafe-grader-web Commit - r247:bdb708ab847b

cafe-grader-web

parent | child

Description:

fixed indv contest timing bug (same as in codejom), added user contest stat reset

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

r247:bdb708ab847b - Sat, 30 Jan 2010 04:20:34 - 4 files changed: 16 inserted, 2 deleted

app/controllers/contests_controller.rb ¶ +8

                 def user_stat
                   if not Configuration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   @users = User.find(:all)
                   @start_times = {}
                   UserContestStat.find(:all).each do |stat|
                     @start_times[stat.user_id] = stat.started_at
                   end
                 end
+            +   def clear_stat
+            +     user = User.find(params[:id])
+            +     if user.contest_stat!=nil
+            +       user.contest_stat.destroy
+            +     end
+            +     redirect_to :action => 'user_stat'
+            +   end
+            +
                 def clear_all_stat
                   if not Configuration.indv_contest_mode?
                     redirect_to :action => 'index' and return
                   end
                   UserContestStat.delete_all()
                   flash[:notice] = 'All start time statistic cleared.'
                   redirect_to :action => 'index'
                 end
               end

app/controllers/login_controller.rb ¶ -1

               class LoginController < ApplicationController
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
                   if user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     session[:admin] = user.admin?
-            -       UserContestStat.update_user_start_time(user)
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound
                     site = nil

app/controllers/main_controller.rb ¶ +7

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
+            +   append_before_filter :update_user_start_time, :except => [:index, :login]
+            +
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   else
                     memory_used = -1
                   end
                   return {
                     :msg => "#{run_stat}\n#{time_stat}",
                     :running_time => seconds,
                     :exit_status => run_stat,
                     :memory_usage => memory_used
                   }
                 end
+            +   def update_user_start_time
+            +     user = User.find(session[:user_id])
+            +     UserContestStat.update_user_start_time(user)
                 end
+            + end
+            +

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

                 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_one :contest_stat, :class_name => "UserContestStat"
+            +   has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
                 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

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

	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