cafe-grader-web Commit - r218:915a5c2d7529

cafe-grader-web

Commit `r218:915a5c2d7529` public

parent | child

Description:

Merge branch 'master' into codejom: added individual contest mode

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r218:915a5c2d7529 - Sun, 24 Jan 2010 16:23:48 - 22 files changed: 274 inserted, 58 deleted

app/controllers/contests_controller.rb created 644 ¶ +30

@@ -0,0 +1,30
	1	+ class ContestsController < ApplicationController
	2	+
	3	+ before_filter :admin_authorization
	4	+
	5	+ def index
	6	+ end
	7	+
	8	+ def user_stat
	9	+ if not Configuration.indv_contest_mode?
	10	+ redirect_to :action => 'index' and return
	11	+ end
	12	+
	13	+ @users = User.find(:all)
	14	+ @start_times = {}
	15	+ UserContestStat.find(:all).each do \|stat\|
	16	+ @start_times[stat.user_id] = stat.started_at
	17	+ end
	18	+ end
	19	+
	20	+ def clear_all_stat
	21	+ if not Configuration.indv_contest_mode?
	22	+ redirect_to :action => 'index' and return
	23	+ end
	24	+
	25	+ UserContestStat.delete_all()
	26	+ flash[:notice] = 'All start time statistic cleared.'
	27	+ redirect_to :action => 'index'
	28	+ end
	29	+
	30	+ end

app/helpers/contests_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module ContestsHelper
	2	+ end

app/models/user_contest_stat.rb created 644 ¶ +14

@@ -0,0 +1,14
	1	+ class UserContestStat < ActiveRecord::Base
	2	+
	3	+ belongs_to :user
	4	+
	5	+ def self.update_user_start_time(user)
	6	+ stat = user.contest_stat
	7	+ if stat == nil
	8	+ stat = UserContestStat.new(:user => user,
	9	+ :started_at => Time.now.gmtime)
	10	+ stat.save
	11	+ end
	12	+ end
	13	+
	14	+ end

app/views/contests/_indv_contest_mode_index.html.haml created 644 ¶ +4

@@ -0,0 +1,4
	1	+ .submitbox
	2	+ %b Menu:
	3	+ = link_to '[View user start time]', :action => 'user_stat'
	4	+ = link_to '[Clear all start times]', {:action => 'clear_all_stat'}, {:confirm => 'Do you really want to clear all start time statistics?'}

app/views/contests/index.html.haml created 644 ¶ +9

@@ -0,0 +1,9
	1	+ %h1 Contest management
	2	+
	3	+ - if (not Configuration.contest_mode?) and (not Configuration.indv_contest_mode?)
	4	+ Currently the system is not running in contest mode.
	5	+ - elsif Configuration.contest_mode?
	6	+ System running in normal contest mode.
	7	+ - else
	8	+ System running in individual contest mode.
	9	+ = render :partial => 'indv_contest_mode_index'

app/views/contests/user_stat.html.haml created 644 ¶ +24

@@ -0,0 +1,24
	1	+ %h1 Individual Contest: User start time
	2	+
	3	+ If you want to restart contest, you may want to
	4	+ %b
	5	+ = link_to '[clear all start times]', {:action => 'clear_all_stat'}, {:confirm => 'Do you really want to clear all start time statistics?'}
	6	+ so that users can participate again.
	7	+
	8	+ %table.info
	9	+ %tr.info-head
	10	+ %th Login
	11	+ %th Start time
	12	+ %th Time left
	13	+ %th
	14	+ - @users.each_with_index do \|user,i\|
	15	+ %tr{:class => 'info-' + cycle('even','odd')}
	16	+ %td= user.login
	17	+ %td
	18	+ - if @start_times.has_key? user.id
	19	+ = @start_times[user.id]
	20	+ - else
	21	+ n/a
	22	+ %td= format_short_duration(user.contest_time_left)
	23	+ %td
	24	+ = link_to '[reset]', {:action => 'clear_stat', :id => user.id}, :confirm => 'Are you sure?'

db/migrate/20100124040107_add_description_to_config.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddDescriptionToConfig < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :configurations, :description, :text
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column :configurations, :description
	8	+ end
	9	+ end

db/migrate/20100124054458_create_user_contest_stats.rb created 644 ¶ +14

@@ -0,0 +1,14
	1	+ class CreateUserContestStats < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :user_contest_stats do \|t\|
	4	+ t.integer :user_id
	5	+ t.timestamp :started_at
	6	+
	7	+ t.timestamps
	8	+ end
	9	+ end
	10	+
	11	+ def self.down
	12	+ drop_table :user_contest_stats
	13	+ end
	14	+ end

test/fixtures/user_contest_stats.yml created 644 ¶ +9

@@ -0,0 +1,9
	1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+
	3	+ one:
	4	+ user_id: 1
	5	+ started_at: 2010-01-24 12:44:58
	6	+
	7	+ two:
	8	+ user_id: 1
	9	+ started_at: 2010-01-24 12:44:58

test/functional/contests_controller_test.rb created 644 ¶ +8

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

test/unit/helpers/contests_helper_test.rb created 644 ¶ +4

@@ -0,0 +1,4
	1	+ require 'test_helper'
	2	+
	3	+ class ContestsHelperTest < ActionView::TestCase
	4	+ end

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

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

app/controllers/application_controller.rb ¶ +2 -2

                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   return true if user==nil or user.site == nil
-            -     if user.site.finished?
+            +     if user.contest_finished?
-            -       flash[:notice] = 'Error: the contest on your site is over.'
+            +       flash[:notice] = 'Error: the contest you are participating is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end

app/controllers/login_controller.rb ¶ +2 -5

                   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'
-            -       if user.admin?
-            -         session[:admin] = true
-            -       else
-            -         session[:admin] = false
-            -       end
                   else
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end

app/controllers/main_controller.rb ¶ +1 -4

               class MainController < ApplicationController
-            -   SYSTEM_MODE_CONF_KEY = 'system.mode'
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                   if (params['file']) and (params['file']!='')
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
-            -     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
+            +     if Configuration.time_limit_mode? and user.contest_finished?
-            -         user.site!=nil and user.site.finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?

app/controllers/test_controller.rb ¶ +2 -4

               class TestController < ApplicationController
-            -   SYSTEM_MODE_CONF_KEY = 'system.mode'
                 before_filter :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                   if @submitted_test_request.errors.length != 0
                     prepare_index_information
                     render :action => 'index' and return
                   end
-            -     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
+            +     if Configuration.time_limit_mode?
-            -       if @user.site!=nil and @user.site.finished?
+            +       if @user.contest_finished?
                       @submitted_test_request.errors.add_to_base('Contest is over.')
                       prepare_index_information
                       render :action => 'index' and return
                     end
                     if !Configuration.allow_test_request(@user)

app/helpers/application_helper.rb ¶ +15 -12

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
-            -   SYSTEM_MODE_CONF_KEY = 'system.mode'
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
-            -       append_to menu_items, '[Problem admin]', 'problems', 'index'
+            +       append_to menu_items, '[Problems]', 'problems', 'index'
-            -       append_to menu_items, '[User admin]', 'user_admin', 'index'
+            +       append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
+            +       append_to menu_items, '[Contests]', 'contests', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
+            +   def format_short_duration(duration)
+            +     return '' if duration==nil
+            +     d = duration.to_f
+            +     return Time.at(d).gmtime.strftime("%X")
+            +   end
+            +
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
-            -     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
+            +     if Configuration.time_limit_mode?
-            -       if user.site!=nil and user.site.finished?
+            +       if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
-            -       if !user.site.started
+            +       if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
-            -         if user.site!=nil
+            +         time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
-            -           time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
+            +           " #{format_short_duration(user.contest_time_left)}"
-            -             " #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
-            -         end
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
-            -     if Configuration[SYSTEM_MODE_CONF_KEY]=='analysis'
+            +     if Configuration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end

app/models/configuration.rb ¶ +41 -4

@@ -56,15 +56,14
56	((user.site.started!=true) or (user.site.finished?))	56	((user.site.started!=true) or (user.site.finished?))
57	end	57	end
58	return true	58	return true
59	end	59	end
60		60
61	def self.show_tasks_to?(user)	61	def self.show_tasks_to?(user)
62	- mode = get(SYSTEM_MODE_CONF_KEY)	62	+ if time_limit_mode?
63	- if (mode=='contest')	63	+ return false if not user.contest_started?
64	- return false if (user.site!=nil) and (user.site.started!=true)
65	end	64	end
66	return true	65	return true
67	end	66	end
68		67
69	def self.show_grading_result	68	def self.show_grading_result
70	return (get(SYSTEM_MODE_CONF_KEY)=='analysis')	69	return (get(SYSTEM_MODE_CONF_KEY)=='analysis')
@@ -86,16 +85,54
86	if @@task_grading_info==nil	85	if @@task_grading_info==nil
87	read_grading_info	86	read_grading_info
88	end	87	end
89	return @@task_grading_info	88	return @@task_grading_info
90	end	89	end
91		90
92	- def self.~~conte~~st_mode	91	+ def self.standard_mode?
		92	+ return get(SYSTEM_MODE_CONF_KEY) == 'standard'
		93	+ end
		94	+
		95	+ def self.contest_mode?
93	return get(SYSTEM_MODE_CONF_KEY) == 'contest'	96	return get(SYSTEM_MODE_CONF_KEY) == 'contest'
94	end	97	end
95		98
		99	+ def self.indv_contest_mode?
		100	+ return get(SYSTEM_MODE_CONF_KEY) == 'indv-contest'
		101	+ end
		102	+
		103	+ def self.time_limit_mode?
		104	+ mode = get(SYSTEM_MODE_CONF_KEY)
		105	+ return ((mode == 'contest') or (mode == 'indv-contest'))
		106	+ end
		107	+
		108	+ def self.analysis_mode?
		109	+ return get(SYSTEM_MODE_CONF_KEY) == 'analysis'
		110	+ end
		111	+
		112	+ def self.contest_time_limit
		113	+ contest_time_str = Configuration['contest.time_limit']
		114	+
		115	+ if not defined? @@contest_time_str
		116	+ @@contest_time_str = nil
		117	+ end
		118	+
		119	+ if @@contest_time_str != contest_time_str
		120	+ @@contest_time_str = contest_time_str
		121	+ if tmatch = /(\d+):(\d+)/.match(contest_time_str)
		122	+ h = tmatch[1].to_i
		123	+ m = tmatch[2].to_i
		124	+
		125	+ @@contest_time = h.hour + m.minute
		126	+ else
		127	+ @@contest_time = nil
		128	+ end
		129	+ end
		130	+ return @@contest_time
		131	+ end
		132	+
96	protected	133	protected
97		134
98	def self.convert_type(val,type)	135	def self.convert_type(val,type)
99	case type	136	case type
100	when 'string'	137	when 'string'
101	return val	138	return val

app/models/site.rb ¶ +16 -24

                   if !self.started
                     self.start_time = nil
                   end
                 end
                 def time_left
-            -     contest_time = Configuration['contest.time_limit']
+            +     contest_time = Configuration.contest_time_limit
-            -     if tmatch = /(\d+):(\d+)/.match(contest_time)
-            -       h = tmatch[1].to_i
-            -       m = tmatch[2].to_i
-            -       contest_time = h.hour + m.minute
-            -       return contest_time if !self.started
+            +     return nil if contest_time == nil
+            +
+            +     return contest_time if !self.started
-            -       current_time = Time.now.gmtime
+            +     current_time = Time.now.gmtime
-            -       if self.start_time!=nil
+            +     if self.start_time!=nil
-            -         finish_time = self.start_time + contest_time
+            +       finish_time = self.start_time + contest_time
-            -       else
+            +     else
-            -         finish_time = current_time + contest_time
+            +       finish_time = current_time + contest_time
-            -       end
+            +     end
-            -       if current_time > finish_time
+            +     if current_time > finish_time
-            -         return current_time - current_time
+            +       return current_time - current_time
-            -       else
-            -         finish_time - current_time
-            -       end
                   else
-            -       nil
+            +       return finish_time - current_time
                   end
                 end
                 def finished?
                   if !self.started
                     return false
                   end
-            -     contest_time = Configuration['contest.time_limit']
+            +     contest_time = Configuration.contest_time_limit
-            -     if tmatch = /(\d+):(\d+)/.match(contest_time)
+            +     if contest_time!=nil
-            -       h = tmatch[1].to_i
+            +       return Time.now.gmtime > (self.start_time + contest_time)
-            -       m = tmatch[2].to_i
-            -       return Time.now.gmtime > (self.start_time + h.hour + m.minute)
                   else
                     false
                   end
                 end
               end

app/models/user.rb ¶ +50

@@ -16,12 +16,14
16	:foreign_key => "receiver_id",	16	:foreign_key => "receiver_id",
17	:order => 'created_at DESC'	17	:order => 'created_at DESC'
18		18
19	has_many :test_pair_assignments, :dependent => :delete_all	19	has_many :test_pair_assignments, :dependent => :delete_all
20	has_many :submission_statuses	20	has_many :submission_statuses
21		21
		22	+ has_one :contest_stat, :class_name => "UserContestStat"
		23	+
22	belongs_to :site	24	belongs_to :site
23	belongs_to :country	25	belongs_to :country
24		26
25	named_scope :activated_users, :conditions => {:activated => true}	27	named_scope :activated_users, :conditions => {:activated => true}
26		28
27	validates_presence_of :login	29	validates_presence_of :login
@@ -168,12 +170,60
168		170
169	def self.find_non_admin_with_prefix(prefix='')	171	def self.find_non_admin_with_prefix(prefix='')
170	users = User.find(:all)	172	users = User.find(:all)
171	return users.find_all { \|u\| !(u.admin?) and u.login.index(prefix)==0 }	173	return users.find_all { \|u\| !(u.admin?) and u.login.index(prefix)==0 }
172	end	174	end
173		175
		176	+ # Contest information
		177	+
		178	+ def contest_time_left
		179	+ if Configuration.contest_mode?
		180	+ return nil if site==nil
		181	+ return site.time_left
		182	+ elsif Configuration.indv_contest_mode?
		183	+ time_limit = Configuration.contest_time_limit
		184	+ if contest_stat==nil
		185	+ return (Time.now.gmtime + time_limit) - Time.now.gmtime
		186	+ else
		187	+ finish_time = contest_stat.started_at + time_limit
		188	+ current_time = Time.now.gmtime
		189	+ if current_time > finish_time
		190	+ return 0
		191	+ else
		192	+ return finish_time - current_time
		193	+ end
		194	+ end
		195	+ else
		196	+ return nil
		197	+ end
		198	+ end
		199	+
		200	+ def contest_finished?
		201	+ if Configuration.contest_mode?
		202	+ return false if site==nil
		203	+ return site.finished?
		204	+ elsif Configuration.indv_contest_mode?
		205	+ time_limit = Configuration.contest_time_limit
		206	+
		207	+ return false if contest_stat==nil
		208	+
		209	+ return contest_time_left == 0
		210	+ else
		211	+ return false
		212	+ end
		213	+ end
		214	+
		215	+ def contest_started?
		216	+ if Configuration.contest_mode?
		217	+ return true if site==nil
		218	+ return site.started
		219	+ else
		220	+ return true
		221	+ end
		222	+ end
		223	+
174	protected	224	protected
175	def encrypt_new_password	225	def encrypt_new_password
176	return if password.blank?	226	return if password.blank?
177	self.salt = (10+rand(90)).to_s	227	self.salt = (10+rand(90)).to_s
178	self.hashed_password = User.encrypt(self.password,self.salt)	228	self.hashed_password = User.encrypt(self.password,self.salt)
179	end	229	end

app/views/main/list.html.haml ¶ +1 -2

                     Announcements
                   #announcementbox-body
                     = render :partial => 'announcement', :collection => @announcements
               %hr/
-            - - if (Configuration.contest_mode) and (@user.site!=nil)  |
+            + - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
-            -   and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 .problem-list
                   = render :partial => 'problem_title', :collection => @problems, :as => :problem
                 .problem-content

db/schema.rb ¶ +9 -1

               # 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 => 20100123154326) do
+            + ActiveRecord::Schema.define(:version => 20100124054458) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                 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"
                   t.datetime "updated_at"
                   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 "user_contest_stats", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.datetime "started_at"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   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"

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

r218:915a5c2d7529 - Sun, 24 Jan 2010 16:23:48 - 22 files changed: 274 inserted, 58 deleted

Sign in to your account

Commit r218:915a5c2d7529 public

Author

r218:915a5c2d7529 - Sun, 24 Jan 2010 16:23:48 - 22 files changed: 274 inserted, 58 deleted

Commit `r218:915a5c2d7529` public