cafe-grader-web

Commit r268:5fffb74cc182 public

parent | child
Description:
created join tables for contests and users and problems
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r268:5fffb74cc182 - - 6 files changed: 42 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,12
1 + class CreateContestsUsersJoinTable < ActiveRecord::Migration
2 + def self.up
3 + create_table :contests_users, :id => false do |t|
4 + t.integer :contest_id
5 + t.integer :user_id
6 + end
7 + end
8 +
9 + def self.down
10 + drop_table :contests_users
11 + end
12 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,12
1 + class CreateContestsProblemsJoinTable < ActiveRecord::Migration
2 + def self.up
3 + create_table :contests_problems, :id => false do |t|
4 + t.integer :contest_id
5 + t.integer :problem_id
6 + end
7 + end
8 +
9 + def self.down
10 + drop_table :contests_problems
11 + end
12 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,2 +1,6
1 1 class Contest < ActiveRecord::Base
2 +
3 + has_and_belongs_to_many :users
4 + has_and_belongs_to_many :problems
5 +
2 6 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,99 +1,100
1 1 class Problem < ActiveRecord::Base
2 2
3 3 belongs_to :description
4 + has_and_belongs_to_many :contests
4 5 has_many :test_pairs, :dependent => :delete_all
5 6
6 7 validates_presence_of :name
7 8 validates_format_of :name, :with => /^\w+$/
8 9 validates_presence_of :full_name
9 10
10 11 DEFAULT_TIME_LIMIT = 1
11 12 DEFAULT_MEMORY_LIMIT = 32
12 13
13 14 def self.find_available_problems
14 15 find(:all, :conditions => {:available => true}, :order => "date_added DESC")
15 16 end
16 17
17 18 def self.create_from_import_form_params(params, old_problem=nil)
18 19 problem = old_problem || Problem.new
19 20 import_params = Problem.extract_params_and_check(params, problem)
20 21
21 22 if not problem.valid?
22 23 return problem, 'Error importing'
23 24 end
24 25
25 26 problem.full_score = 100
26 27 problem.date_added = Time.new
27 28 problem.test_allowed = true
28 29 problem.output_only = false
29 30 problem.available = false
30 31
31 32 if not problem.save
32 33 return problem, 'Error importing'
33 34 end
34 35
35 36 import_to_db = params.has_key? :import_to_db
36 37
37 38 importer = TestdataImporter.new(problem)
38 39
39 40 if not importer.import_from_file(import_params[:file],
40 41 import_params[:time_limit],
41 42 import_params[:memory_limit],
42 43 import_to_db)
43 44 problem.errors.add_to_base('Import error.')
44 45 end
45 46
46 47 return problem, importer.log_msg
47 48 end
48 49
49 50 protected
50 51
51 52 def self.to_i_or_default(st, default)
52 53 if st!=''
53 54 st.to_i
54 55 else
55 56 default
56 57 end
57 58 end
58 59
59 60 def self.extract_params_and_check(params, problem)
60 61 time_limit = Problem.to_i_or_default(params[:time_limit],
61 62 DEFAULT_TIME_LIMIT)
62 63 memory_limit = Problem.to_i_or_default(params[:memory_limit],
63 64 DEFAULT_MEMORY_LIMIT)
64 65
65 66 if time_limit==0 and time_limit_s!='0'
66 67 problem.errors.add_to_base('Time limit format errors.')
67 68 elsif time_limit<=0 or time_limit >60
68 69 problem.errors.add_to_base('Time limit out of range.')
69 70 end
70 71
71 72 if memory_limit==0 and memory_limit_s!='0'
72 73 problem.errors.add_to_base('Memory limit format errors.')
73 74 elsif memory_limit<=0 or memory_limit >512
74 75 problem.errors.add_to_base('Memory limit out of range.')
75 76 end
76 77
77 78 if params[:file]==nil or params[:file]==''
78 79 problem.errors.add_to_base('No testdata file.')
79 80 end
80 81
81 82 file = params[:file]
82 83
83 84 if problem.errors.length!=0
84 85 return problem
85 86 end
86 87
87 88 problem.name = params[:name]
88 89 if params[:full_name]!=''
89 90 problem.full_name = params[:full_name]
90 91 else
91 92 problem.full_name = params[:name]
92 93 end
93 94
94 95 return {
95 96 :time_limit => time_limit,
96 97 :memory_limit => memory_limit,
97 98 :file => file
98 99 }
99 100 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,119 +1,121
1 1 require 'digest/sha1'
2 2
3 3 class User < ActiveRecord::Base
4 4
5 5 has_and_belongs_to_many :roles
6 6
7 7 has_many :test_requests, :order => "submitted_at DESC"
8 8
9 9 has_many :messages,
10 10 :class_name => "Message",
11 11 :foreign_key => "sender_id",
12 12 :order => 'created_at DESC'
13 13
14 14 has_many :replied_messages,
15 15 :class_name => "Message",
16 16 :foreign_key => "receiver_id",
17 17 :order => 'created_at DESC'
18 18
19 19 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
20 20
21 21 belongs_to :site
22 22 belongs_to :country
23 23
24 + has_and_belongs_to_many :contests
25 +
24 26 named_scope :activated_users, :conditions => {:activated => true}
25 27
26 28 validates_presence_of :login
27 29 validates_uniqueness_of :login
28 30 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
29 31 validates_length_of :login, :within => 3..30
30 32
31 33 validates_presence_of :full_name
32 34 validates_length_of :full_name, :minimum => 1
33 35
34 36 validates_presence_of :password, :if => :password_required?
35 37 validates_length_of :password, :within => 4..20, :if => :password_required?
36 38 validates_confirmation_of :password, :if => :password_required?
37 39
38 40 validates_format_of :email,
39 41 :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
40 42 :if => :email_validation?
41 43 validate :uniqueness_of_email_from_activated_users,
42 44 :if => :email_validation?
43 45 validate :enough_time_interval_between_same_email_registrations,
44 46 :if => :email_validation?
45 47
46 48 # these are for ytopc
47 49 # disable for now
48 50 #validates_presence_of :province
49 51
50 52 attr_accessor :password
51 53
52 54 before_save :encrypt_new_password
53 55 before_save :assign_default_site
54 56
55 57 def self.authenticate(login, password)
56 58 user = find_by_login(login)
57 59 return user if user && user.authenticated?(password)
58 60 end
59 61
60 62 def authenticated?(password)
61 63 if self.activated
62 64 hashed_password == User.encrypt(password,self.salt)
63 65 else
64 66 false
65 67 end
66 68 end
67 69
68 70 def admin?
69 71 self.roles.detect {|r| r.name == 'admin' }
70 72 end
71 73
72 74 def email_for_editing
73 75 if self.email==nil
74 76 "(unknown)"
75 77 elsif self.email==''
76 78 "(blank)"
77 79 else
78 80 self.email
79 81 end
80 82 end
81 83
82 84 def email_for_editing=(e)
83 85 self.email=e
84 86 end
85 87
86 88 def alias_for_editing
87 89 if self.alias==nil
88 90 "(unknown)"
89 91 elsif self.alias==''
90 92 "(blank)"
91 93 else
92 94 self.alias
93 95 end
94 96 end
95 97
96 98 def alias_for_editing=(e)
97 99 self.alias=e
98 100 end
99 101
100 102 def activation_key
101 103 if self.hashed_password==nil
102 104 encrypt_new_password
103 105 end
104 106 Digest::SHA1.hexdigest(self.hashed_password)[0..7]
105 107 end
106 108
107 109 def verify_activation_key(key)
108 110 key == activation_key
109 111 end
110 112
111 113 def self.random_password(length=5)
112 114 chars = 'abcdefghjkmnopqrstuvwxyz'
113 115 password = ''
114 116 length.times { password << chars[rand(chars.length - 1)] }
115 117 password
116 118 end
117 119
118 120 def self.find_non_admin_with_prefix(prefix='')
119 121 users = User.find(:all)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,144 +1,154
1 1 # This file is auto-generated from the current state of the database. Instead of editing this file,
2 2 # please use the migrations feature of Active Record to incrementally modify your database, and
3 3 # then regenerate this schema definition.
4 4 #
5 5 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
6 6 # to create the application database on another system, you should be using db:schema:load, not running
7 7 # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
8 8 # you'll amass, the slower it'll run and the greater likelihood for issues).
9 9 #
10 10 # It's strongly recommended to check this file into your version control system.
11 11
12 - ActiveRecord::Schema.define(:version => 20100216105730) do
12 + ActiveRecord::Schema.define(:version => 20100216162940) do
13 13
14 14 create_table "announcements", :force => true do |t|
15 15 t.string "author"
16 16 t.text "body"
17 17 t.boolean "published"
18 18 t.datetime "created_at"
19 19 t.datetime "updated_at"
20 20 t.boolean "frontpage", :default => false
21 21 t.boolean "contest_only", :default => false
22 22 t.string "title"
23 23 end
24 24
25 25 create_table "codejom_statuses", :force => true do |t|
26 26 t.integer "user_id"
27 27 t.boolean "alive"
28 28 t.integer "num_problems_passed"
29 29 t.datetime "created_at"
30 30 t.datetime "updated_at"
31 31 end
32 32
33 33 create_table "configurations", :force => true do |t|
34 34 t.string "key"
35 35 t.string "value_type"
36 36 t.string "value"
37 37 t.datetime "created_at"
38 38 t.datetime "updated_at"
39 39 t.text "description"
40 40 end
41 41
42 42 create_table "contests", :force => true do |t|
43 43 t.string "title"
44 44 t.boolean "enabled"
45 45 t.datetime "created_at"
46 46 t.datetime "updated_at"
47 47 end
48 48
49 + create_table "contests_problems", :id => false, :force => true do |t|
50 + t.integer "contest_id"
51 + t.integer "problem_id"
52 + end
53 +
54 + create_table "contests_users", :id => false, :force => true do |t|
55 + t.integer "contest_id"
56 + t.integer "user_id"
57 + end
58 +
49 59 create_table "countries", :force => true do |t|
50 60 t.string "name"
51 61 t.datetime "created_at"
52 62 t.datetime "updated_at"
53 63 end
54 64
55 65 create_table "descriptions", :force => true do |t|
56 66 t.text "body"
57 67 t.boolean "markdowned"
58 68 t.datetime "created_at"
59 69 t.datetime "updated_at"
60 70 end
61 71
62 72 create_table "grader_processes", :force => true do |t|
63 73 t.string "host", :limit => 20
64 74 t.integer "pid"
65 75 t.string "mode"
66 76 t.boolean "active"
67 77 t.datetime "created_at"
68 78 t.datetime "updated_at"
69 79 t.integer "task_id"
70 80 t.string "task_type"
71 81 t.boolean "terminated"
72 82 end
73 83
74 84 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
75 85
76 86 create_table "languages", :force => true do |t|
77 87 t.string "name", :limit => 10
78 88 t.string "pretty_name"
79 89 t.string "ext", :limit => 10
80 90 t.string "common_ext"
81 91 end
82 92
83 93 create_table "messages", :force => true do |t|
84 94 t.integer "sender_id"
85 95 t.integer "receiver_id"
86 96 t.integer "replying_message_id"
87 97 t.text "body"
88 98 t.boolean "replied"
89 99 t.datetime "created_at"
90 100 t.datetime "updated_at"
91 101 end
92 102
93 103 create_table "problems", :force => true do |t|
94 104 t.string "name", :limit => 30
95 105 t.string "full_name"
96 106 t.integer "full_score"
97 107 t.date "date_added"
98 108 t.boolean "available"
99 109 t.string "url"
100 110 t.integer "description_id"
101 111 t.boolean "test_allowed"
102 112 t.boolean "output_only"
103 113 t.integer "level", :default => 0
104 114 t.datetime "updated_at"
105 115 end
106 116
107 117 create_table "rights", :force => true do |t|
108 118 t.string "name"
109 119 t.string "controller"
110 120 t.string "action"
111 121 end
112 122
113 123 create_table "rights_roles", :id => false, :force => true do |t|
114 124 t.integer "right_id"
115 125 t.integer "role_id"
116 126 end
117 127
118 128 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
119 129
120 130 create_table "roles", :force => true do |t|
121 131 t.string "name"
122 132 end
123 133
124 134 create_table "roles_users", :id => false, :force => true do |t|
125 135 t.integer "role_id"
126 136 t.integer "user_id"
127 137 end
128 138
129 139 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
130 140
131 141 create_table "sessions", :force => true do |t|
132 142 t.string "session_id"
133 143 t.text "data"
134 144 t.datetime "updated_at"
135 145 end
136 146
137 147 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
138 148 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
139 149
140 150 create_table "sites", :force => true do |t|
141 151 t.string "name"
142 152 t.boolean "started"
143 153 t.datetime "start_time"
144 154 t.datetime "created_at"
You need to be logged in to leave comments. Login now