cafe-grader-web

Commit r446:d9ae0ff1e3ea public

parent | child
Description:
add ip to submission
Commit status:
[Not Reviewed]
References:
algo
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

r446:d9ae0ff1e3ea - - 5 files changed: 45 inserted, 26 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddIpToSubmissions < ActiveRecord::Migration
2 + def change
3 + add_column :submissions, :ip_address, :string
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -67,6 +67,7
67 @submission.source_filename = params['file'].original_filename
67 @submission.source_filename = params['file'].original_filename
68 end
68 end
69 @submission.submitted_at = Time.new.gmtime
69 @submission.submitted_at = Time.new.gmtime
70 + @submission.ip_address = request.remote_ip
70
71
71 if GraderConfiguration.time_limit_mode? and user.contest_finished?
72 if GraderConfiguration.time_limit_mode? and user.contest_finished?
72 @submission.errors.add_to_base "The contest is over."
73 @submission.errors.add_to_base "The contest is over."
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -50,6 +50,10
50 %tr{class: cycle('info-even','info-odd')}
50 %tr{class: cycle('info-even','info-odd')}
51 %td.field Memory (kb):
51 %td.field Memory (kb):
52 %td.value #{@submission.peak_memory}
52 %td.value #{@submission.peak_memory}
53 + - if session[:admin]
54 + %tr{class: cycle('info-even','info-odd')}
55 + %td.field IP:
56 + %td.value #{@submission.ip_address}
53
57
54 %h2 Source code
58 %h2 Source code
55 //%div.highlight{:style => "border: 1px solid black;"}
59 //%div.highlight{:style => "border: 1px solid black;"}
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -31,6 +31,8
31 %th Language
31 %th Language
32 %th Result
32 %th Result
33 %th Score
33 %th Score
34 + - if session[:admin]
35 + %th IP
34 %tbody
36 %tbody
35 - @submission.each do |s|
37 - @submission.each do |s|
36 - next unless s.problem
38 - next unless s.problem
@@ -41,6 +43,8
41 %td= s.language.pretty_name
43 %td= s.language.pretty_name
42 %td.fix-width= s.grader_comment
44 %td.fix-width= s.grader_comment
43 %td= (s.points*100)/s.problem.full_score
45 %td= (s.points*100)/s.problem.full_score
46 + - if session[:admin]
47 + %td= s.ip_address
44
48
45
49
46
50
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,16 +11,16
11 #
11 #
12 # It's strongly recommended to check this file into your version control system.
12 # It's strongly recommended to check this file into your version control system.
13
13
14 - ActiveRecord::Schema.define(:version => 20140826095949) do
14 + ActiveRecord::Schema.define(:version => 20140917150629) do
15
15
16 create_table "announcements", :force => true do |t|
16 create_table "announcements", :force => true do |t|
17 t.string "author"
17 t.string "author"
18 - t.text "body", :limit => 16777215
18 + t.text "body"
19 t.boolean "published"
19 t.boolean "published"
20 - t.datetime "created_at", :null => false
20 + t.datetime "created_at", :null => false
21 - t.datetime "updated_at", :null => false
21 + t.datetime "updated_at", :null => false
22 - t.boolean "frontpage", :default => false
22 + t.boolean "frontpage", :default => false
23 - t.boolean "contest_only", :default => false
23 + t.boolean "contest_only", :default => false
24 t.string "title"
24 t.string "title"
25 t.string "notes"
25 t.string "notes"
26 end
26 end
@@ -50,19 +50,19
50 end
50 end
51
51
52 create_table "descriptions", :force => true do |t|
52 create_table "descriptions", :force => true do |t|
53 - t.text "body", :limit => 16777215
53 + t.text "body"
54 t.boolean "markdowned"
54 t.boolean "markdowned"
55 - t.datetime "created_at", :null => false
55 + t.datetime "created_at", :null => false
56 - t.datetime "updated_at", :null => false
56 + t.datetime "updated_at", :null => false
57 end
57 end
58
58
59 create_table "grader_configurations", :force => true do |t|
59 create_table "grader_configurations", :force => true do |t|
60 t.string "key"
60 t.string "key"
61 t.string "value_type"
61 t.string "value_type"
62 t.string "value"
62 t.string "value"
63 - t.datetime "created_at", :null => false
63 + t.datetime "created_at", :null => false
64 - t.datetime "updated_at", :null => false
64 + t.datetime "updated_at", :null => false
65 - t.text "description", :limit => 16777215
65 + t.text "description"
66 end
66 end
67
67
68 create_table "grader_processes", :force => true do |t|
68 create_table "grader_processes", :force => true do |t|
@@ -97,10 +97,10
97 t.integer "sender_id"
97 t.integer "sender_id"
98 t.integer "receiver_id"
98 t.integer "receiver_id"
99 t.integer "replying_message_id"
99 t.integer "replying_message_id"
100 - t.text "body", :limit => 16777215
100 + t.text "body"
101 t.boolean "replied"
101 t.boolean "replied"
102 - t.datetime "created_at", :null => false
102 + t.datetime "created_at", :null => false
103 - t.datetime "updated_at", :null => false
103 + t.datetime "updated_at", :null => false
104 end
104 end
105
105
106 create_table "problems", :force => true do |t|
106 create_table "problems", :force => true do |t|
@@ -142,7 +142,7
142
142
143 create_table "sessions", :force => true do |t|
143 create_table "sessions", :force => true do |t|
144 t.string "session_id"
144 t.string "session_id"
145 - t.text "data", :limit => 16777215
145 + t.text "data"
146 t.datetime "updated_at"
146 t.datetime "updated_at"
147 end
147 end
148
148
@@ -163,16 +163,20
163 t.integer "user_id"
163 t.integer "user_id"
164 t.integer "problem_id"
164 t.integer "problem_id"
165 t.integer "language_id"
165 t.integer "language_id"
166 - t.text "source", :limit => 16777215
166 + t.text "source"
167 t.binary "binary"
167 t.binary "binary"
168 t.datetime "submitted_at"
168 t.datetime "submitted_at"
169 t.datetime "compiled_at"
169 t.datetime "compiled_at"
170 - t.text "compiler_message", :limit => 16777215
170 + t.text "compiler_message"
171 t.datetime "graded_at"
171 t.datetime "graded_at"
172 t.integer "points"
172 t.integer "points"
173 - t.text "grader_comment", :limit => 16777215
173 + t.text "grader_comment"
174 t.integer "number"
174 t.integer "number"
175 t.string "source_filename"
175 t.string "source_filename"
176 + t.float "max_runtime"
177 + t.integer "peak_memory"
178 + t.integer "effective_code_length"
179 + t.string "ip_address"
176 end
180 end
177
181
178 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
182 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
@@ -187,10 +191,10
187
191
188 create_table "test_pairs", :force => true do |t|
192 create_table "test_pairs", :force => true do |t|
189 t.integer "problem_id"
193 t.integer "problem_id"
190 - t.text "input", :limit => 2147483647
194 + t.text "input", :limit => 16777215
191 - t.text "solution", :limit => 2147483647
195 + t.text "solution", :limit => 16777215
192 - t.datetime "created_at", :null => false
196 + t.datetime "created_at", :null => false
193 - t.datetime "updated_at", :null => false
197 + t.datetime "updated_at", :null => false
194 end
198 end
195
199
196 create_table "test_requests", :force => true do |t|
200 create_table "test_requests", :force => true do |t|
@@ -201,13 +205,13
201 t.string "output_file_name"
205 t.string "output_file_name"
202 t.string "running_stat"
206 t.string "running_stat"
203 t.integer "status"
207 t.integer "status"
204 - t.datetime "updated_at", :null => false
208 + t.datetime "updated_at", :null => false
205 t.datetime "submitted_at"
209 t.datetime "submitted_at"
206 t.datetime "compiled_at"
210 t.datetime "compiled_at"
207 - t.text "compiler_message", :limit => 16777215
211 + t.text "compiler_message"
208 t.datetime "graded_at"
212 t.datetime "graded_at"
209 t.string "grader_comment"
213 t.string "grader_comment"
210 - t.datetime "created_at", :null => false
214 + t.datetime "created_at", :null => false
211 t.float "running_time"
215 t.float "running_time"
212 t.string "exit_status"
216 t.string "exit_status"
213 t.integer "memory_usage"
217 t.integer "memory_usage"
@@ -235,6 +239,7
235 t.boolean "activated", :default => false
239 t.boolean "activated", :default => false
236 t.datetime "created_at"
240 t.datetime "created_at"
237 t.datetime "updated_at"
241 t.datetime "updated_at"
242 + t.string "section"
238 end
243 end
239
244
240 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
245 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
You need to be logged in to leave comments. Login now