Description:
merge algo feature
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r509:bb124a034509 - - 8 files changed: 112 inserted, 53 deleted
@@ -0,0 +1,5 | |||
|
1 | + class AddIpToSubmissions < ActiveRecord::Migration | |
|
2 | + def change | |
|
3 | + add_column :submissions, :ip_address, :string | |
|
4 | + end | |
|
5 | + end |
@@ -64,12 +64,13 | |||
|
64 | 64 | @submission.language_id = 0 |
|
65 | 65 | if (params['file']) and (params['file']!='') |
|
66 | 66 | @submission.source = params['file'].read |
|
67 | 67 | @submission.source_filename = params['file'].original_filename |
|
68 | 68 | end |
|
69 | 69 | @submission.submitted_at = Time.new.gmtime |
|
70 | + @submission.ip_address = request.remote_ip | |
|
70 | 71 | |
|
71 | 72 | if GraderConfiguration.time_limit_mode? and user.contest_finished? |
|
72 | 73 | @submission.errors.add_to_base "The contest is over." |
|
73 | 74 | prepare_list_information |
|
74 | 75 | render :action => 'list' and return |
|
75 | 76 | end |
@@ -13,18 +13,20 | |||
|
13 | 13 | |
|
14 | 14 | def login_stat |
|
15 | 15 | @logins = Array.new |
|
16 | 16 | |
|
17 | 17 | date_and_time = '%Y-%m-%d %H:%M' |
|
18 | 18 | begin |
|
19 | - @since_time = DateTime.strptime(params[:since_datetime],date_and_time) | |
|
19 | + md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) | |
|
20 | + @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) | |
|
20 | 21 | rescue |
|
21 | 22 | @since_time = DateTime.new(1000,1,1) |
|
22 | 23 | end |
|
23 | 24 | begin |
|
24 | - @until_time = DateTime.strptime(params[:until_datetime],date_and_time) | |
|
25 | + md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/) | |
|
26 | + @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i) | |
|
25 | 27 | rescue |
|
26 | 28 | @until_time = DateTime.new(3000,1,1) |
|
27 | 29 | end |
|
28 | 30 | |
|
29 | 31 | User.all.each do |user| |
|
30 | 32 | @logins << { id: user.id, |
@@ -35,13 +37,17 | |||
|
35 | 37 | .count(:id), |
|
36 | 38 | min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
37 | 39 | user.id,@since_time,@until_time) |
|
38 | 40 | .minimum(:created_at), |
|
39 | 41 | max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", |
|
40 | 42 | user.id,@since_time,@until_time) |
|
41 | - .maximum(:created_at) | |
|
43 | + .maximum(:created_at), | |
|
44 | + ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?", | |
|
45 | + user.id,@since_time,@until_time) | |
|
46 | + .select(:ip_address).uniq | |
|
47 | + | |
|
42 | 48 | } |
|
43 | 49 | end |
|
44 | 50 | end |
|
45 | 51 | |
|
46 | 52 | def submission_stat |
|
47 | 53 | |
@@ -161,13 +167,13 | |||
|
161 | 167 | v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)" |
|
162 | 168 | end |
|
163 | 169 | end |
|
164 | 170 | |
|
165 | 171 | #sum into best |
|
166 | 172 | if @by_lang and @by_lang.first |
|
167 | - @best = @by_lang.first[1] | |
|
173 | + @best = @by_lang.first[1].clone | |
|
168 | 174 | @by_lang.each do |lang,prop| |
|
169 | 175 | if @best[:runtime][:value] >= prop[:runtime][:value] |
|
170 | 176 | @best[:runtime] = prop[:runtime] |
|
171 | 177 | @best[:runtime][:lang] = lang |
|
172 | 178 | end |
|
173 | 179 | if @best[:memory][:value] >= prop[:memory][:value] |
@@ -1,27 +1,61 | |||
|
1 | 1 | %style{type: "text/css"} |
|
2 | 2 | = @css_style |
|
3 | + :css | |
|
4 | + .field { | |
|
5 | + font-weight: bold; | |
|
6 | + text-align: right; | |
|
7 | + padding: 3px; | |
|
8 | + } | |
|
9 | + | |
|
3 | 10 | |
|
4 | 11 | %h1= "Submission: #{@submission.id}" |
|
5 | 12 | |
|
6 | - %p | |
|
7 | - User: | |
|
8 | - = "(#{@submission.user.login}) #{@submission.user.full_name}" | |
|
9 | - %br/ | |
|
10 | - Problem: | |
|
11 | - - if @submission.problem!=nil | |
|
12 | - = "#{@submission.problem.full_name}" | |
|
13 | - - else | |
|
14 | - = "(n/a)" | |
|
15 | - %br/ | |
|
16 | - = "Number: #{@submission.number}" | |
|
17 | - %br/ | |
|
18 | - = "Submitted at: #{format_short_time(@submission.submitted_at)}" | |
|
19 | - %br/ | |
|
20 | - = "Points : #{@submission.points}/#{@submission.problem.full_score}" | |
|
21 | - %br/ | |
|
22 | - = "Comment : #{@submission.grader_comment}" | |
|
13 | + | |
|
14 | + %h2 Stat | |
|
23 | 15 | |
|
24 | - %b Source code (first 10kb) | |
|
16 | + %table.info | |
|
17 | + %thead | |
|
18 | + %tr.info-head | |
|
19 | + %th Field | |
|
20 | + %th Value | |
|
21 | + %tbody | |
|
22 | + %tr{class: cycle('info-even','info-odd')} | |
|
23 | + %td.field User: | |
|
24 | + %td.value= "(#{@submission.user.login}) #{@submission.user.full_name}" | |
|
25 | + %tr{class: cycle('info-even','info-odd')} | |
|
26 | + %td.field Problem: | |
|
27 | + %td.value | |
|
28 | + - if @submission.problem!=nil | |
|
29 | + = "(#{@submission.problem.name}) #{@submission.problem.full_name}" | |
|
30 | + - else | |
|
31 | + = "(n/a)" | |
|
32 | + %tr{class: cycle('info-even','info-odd')} | |
|
33 | + %td.field Tries: | |
|
34 | + %td.value= @submission.number | |
|
35 | + %tr{class: cycle('info-even','info-odd')} | |
|
36 | + %td.field Submitted: | |
|
37 | + %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)}) | |
|
38 | + %tr{class: cycle('info-even','info-odd')} | |
|
39 | + %td.field Graded: | |
|
40 | + %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)}) | |
|
41 | + %tr{class: cycle('info-even','info-odd')} | |
|
42 | + %td.field Points: | |
|
43 | + %td.value #{@submission.points}/#{@submission.problem.full_score} | |
|
44 | + %tr{class: cycle('info-even','info-odd')} | |
|
45 | + %td.field Comment: | |
|
46 | + %td.value #{@submission.grader_comment} | |
|
47 | + %tr{class: cycle('info-even','info-odd')} | |
|
48 | + %td.field Runtime (s): | |
|
49 | + %td.value #{@submission.max_runtime} | |
|
50 | + %tr{class: cycle('info-even','info-odd')} | |
|
51 | + %td.field Memory (kb): | |
|
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} | |
|
57 | + | |
|
58 | + %h2 Source code | |
|
25 | 59 | //%div.highlight{:style => "border: 1px solid black;"} |
|
26 | 60 | =@formatted_code.html_safe |
|
27 | 61 |
@@ -1,12 +1,12 | |||
|
1 | 1 | :css |
|
2 | 2 | .hof_user { color: orangered; font-style: italic; } |
|
3 | 3 | .hof_language { color: green; font-style: italic; } |
|
4 | 4 | .hof_value { color: deeppink;font-style: italic; } |
|
5 | 5 | |
|
6 | - %h2 Overall | |
|
6 | + %h2 Overall of #{Problem.find(params[:id]).full_name} | |
|
7 | 7 | |
|
8 | 8 | - if @best |
|
9 | 9 | %b Best Runtime: |
|
10 | 10 | by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]} |
|
11 | 11 | using <span class="hof_language">#{@best[:runtime][:lang]}</span> |
|
12 | 12 | with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span> |
@@ -14,13 +14,13 | |||
|
14 | 14 | = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id]) |
|
15 | 15 | %br/ |
|
16 | 16 | |
|
17 | 17 | %b Best Memory Usage: |
|
18 | 18 | by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]} |
|
19 | 19 | using <span class="hof_language">#{@best[:memory][:lang]}</span> |
|
20 | - with <span class="hof_value">#{@best[:memory][:value]} kbytes </span> | |
|
20 | + with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span> | |
|
21 | 21 | at submission |
|
22 | 22 | = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id]) |
|
23 | 23 | %br/ |
|
24 | 24 | |
|
25 | 25 | %b Shortest Code: |
|
26 | 26 | by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]} |
@@ -60,13 +60,13 | |||
|
60 | 60 | %td |
|
61 | 61 | = link_to value[:runtime][:user], controller: 'users', action: 'profile', id: value[:runtime][:user_id] |
|
62 | 62 | = "(#{(value[:runtime][:value] * 1000).to_i} @" |
|
63 | 63 | = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe |
|
64 | 64 | %td |
|
65 | 65 | = link_to value[:memory][:user], controller: 'users', action: 'profile', id: value[:memory][:user_id] |
|
66 | - = "(#{value[:memory][:value]} @" | |
|
66 | + = "(#{number_with_delimiter(value[:memory][:value])} @" | |
|
67 | 67 | = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe |
|
68 | 68 | %td |
|
69 | 69 | = link_to value[:length][:user], controller: 'users', action: 'profile', id: value[:length][:user_id] |
|
70 | 70 | = "(#{value[:length][:value]} @" |
|
71 | 71 | = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe |
|
72 | 72 | %td |
@@ -19,14 +19,18 | |||
|
19 | 19 | %tr |
|
20 | 20 | %th login |
|
21 | 21 | %th full name |
|
22 | 22 | %th login count |
|
23 | 23 | %th earliest |
|
24 | 24 | %th latest |
|
25 | + %th IP | |
|
25 | 26 | %tbody |
|
26 | 27 | - @logins.each do |l| |
|
27 | 28 | %tr{class: cycle('info-even','info-odd')} |
|
28 | 29 | %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id] |
|
29 | 30 | %td= l[:full_name] |
|
30 | 31 | %td= l[:count] |
|
31 | 32 | %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : '' |
|
32 |
- %td= l[:max] ? time_ago_in_words(l[:max].in_time_zone) |
|
|
33 | + %td= l[:max] ? "#{l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M.%S')} (#{time_ago_in_words(l[:max].in_time_zone)} ago)" : '' | |
|
34 | + %td | |
|
35 | + - l[:ip].each do |ip| | |
|
36 | + #{ip.ip_address} <br/> |
@@ -28,19 +28,23 | |||
|
28 | 28 | %th ID |
|
29 | 29 | %th Problem code |
|
30 | 30 | %th Problem name |
|
31 | 31 | %th Language |
|
32 | 32 | %th Result |
|
33 | 33 | %th Score |
|
34 | + - if session[:admin] | |
|
35 | + %th IP | |
|
34 | 36 | %tbody |
|
35 | 37 | - @submission.each do |s| |
|
36 | 38 | - next unless s.problem |
|
37 | 39 | %tr |
|
38 | 40 | %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id |
|
39 | 41 | %td= s.problem.name |
|
40 | 42 | %td= s.problem.full_name |
|
41 | 43 | %td= s.language.pretty_name |
|
42 | 44 | %td.fix-width= s.grader_comment |
|
43 |
- %td= s.points/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 |
@@ -8,22 +8,22 | |||
|
8 | 8 | # system, you should be using db:schema:load, not running all the migrations |
|
9 | 9 | # from scratch. The latter is a flawed and unsustainable approach (the more migrations |
|
10 | 10 | # you'll amass, the slower it'll run and the greater likelihood for issues). |
|
11 | 11 | # |
|
12 | 12 | # It's strongly recommended to check this file into your version control system. |
|
13 | 13 | |
|
14 |
- ActiveRecord::Schema.define(:version => 20140 |
|
|
14 | + ActiveRecord::Schema.define(:version => 20140917150629) do | |
|
15 | 15 | |
|
16 | 16 | create_table "announcements", :force => true do |t| |
|
17 | 17 | t.string "author" |
|
18 |
- t.text "body" |
|
|
18 | + t.text "body" | |
|
19 | 19 | t.boolean "published" |
|
20 |
- t.datetime "created_at", |
|
|
21 |
- t.datetime "updated_at", |
|
|
22 |
- t.boolean "frontpage", |
|
|
23 |
- t.boolean "contest_only", |
|
|
20 | + t.datetime "created_at", :null => false | |
|
21 | + t.datetime "updated_at", :null => false | |
|
22 | + t.boolean "frontpage", :default => false | |
|
23 | + t.boolean "contest_only", :default => false | |
|
24 | 24 | t.string "title" |
|
25 | 25 | t.string "notes" |
|
26 | 26 | end |
|
27 | 27 | |
|
28 | 28 | create_table "contests", :force => true do |t| |
|
29 | 29 | t.string "title" |
@@ -47,25 +47,25 | |||
|
47 | 47 | t.string "name" |
|
48 | 48 | t.datetime "created_at", :null => false |
|
49 | 49 | t.datetime "updated_at", :null => false |
|
50 | 50 | end |
|
51 | 51 | |
|
52 | 52 | create_table "descriptions", :force => true do |t| |
|
53 |
- t.text "body" |
|
|
53 | + t.text "body" | |
|
54 | 54 | t.boolean "markdowned" |
|
55 |
- t.datetime "created_at", |
|
|
56 |
- t.datetime "updated_at", |
|
|
55 | + t.datetime "created_at", :null => false | |
|
56 | + t.datetime "updated_at", :null => false | |
|
57 | 57 | end |
|
58 | 58 | |
|
59 | 59 | create_table "grader_configurations", :force => true do |t| |
|
60 | 60 | t.string "key" |
|
61 | 61 | t.string "value_type" |
|
62 | 62 | t.string "value" |
|
63 |
- t.datetime "created_at", |
|
|
64 |
- t.datetime "updated_at", |
|
|
65 |
- t.text "description" |
|
|
63 | + t.datetime "created_at", :null => false | |
|
64 | + t.datetime "updated_at", :null => false | |
|
65 | + t.text "description" | |
|
66 | 66 | end |
|
67 | 67 | |
|
68 | 68 | create_table "grader_processes", :force => true do |t| |
|
69 | 69 | t.string "host", :limit => 20 |
|
70 | 70 | t.integer "pid" |
|
71 | 71 | t.string "mode" |
@@ -94,16 +94,16 | |||
|
94 | 94 | end |
|
95 | 95 | |
|
96 | 96 | create_table "messages", :force => true do |t| |
|
97 | 97 | t.integer "sender_id" |
|
98 | 98 | t.integer "receiver_id" |
|
99 | 99 | t.integer "replying_message_id" |
|
100 | - t.text "body", :limit => 16777215 | |
|
100 | + t.text "body" | |
|
101 | 101 | t.boolean "replied" |
|
102 |
- t.datetime "created_at", |
|
|
103 |
- t.datetime "updated_at", |
|
|
102 | + t.datetime "created_at", :null => false | |
|
103 | + t.datetime "updated_at", :null => false | |
|
104 | 104 | end |
|
105 | 105 | |
|
106 | 106 | create_table "problems", :force => true do |t| |
|
107 | 107 | t.string "name", :limit => 30 |
|
108 | 108 | t.string "full_name" |
|
109 | 109 | t.integer "full_score" |
@@ -139,13 +139,13 | |||
|
139 | 139 | end |
|
140 | 140 | |
|
141 | 141 | add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id" |
|
142 | 142 | |
|
143 | 143 | create_table "sessions", :force => true do |t| |
|
144 | 144 | t.string "session_id" |
|
145 |
- t.text "data" |
|
|
145 | + t.text "data" | |
|
146 | 146 | t.datetime "updated_at" |
|
147 | 147 | end |
|
148 | 148 | |
|
149 | 149 | add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" |
|
150 | 150 | add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at" |
|
151 | 151 | |
@@ -160,22 +160,26 | |||
|
160 | 160 | end |
|
161 | 161 | |
|
162 | 162 | create_table "submissions", :force => true do |t| |
|
163 | 163 | t.integer "user_id" |
|
164 | 164 | t.integer "problem_id" |
|
165 | 165 | t.integer "language_id" |
|
166 |
- t.text "source" |
|
|
166 | + t.text "source" | |
|
167 | 167 | t.binary "binary" |
|
168 | 168 | t.datetime "submitted_at" |
|
169 | 169 | t.datetime "compiled_at" |
|
170 |
- t.text "compiler_message" |
|
|
170 | + t.text "compiler_message" | |
|
171 | 171 | t.datetime "graded_at" |
|
172 | 172 | t.integer "points" |
|
173 |
- t.text "grader_comment" |
|
|
173 | + t.text "grader_comment" | |
|
174 | 174 | t.integer "number" |
|
175 | 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 | 180 | end |
|
177 | 181 | |
|
178 | 182 | add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true |
|
179 | 183 | add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id" |
|
180 | 184 | |
|
181 | 185 | create_table "tasks", :force => true do |t| |
@@ -184,33 +188,33 | |||
|
184 | 188 | t.integer "status" |
|
185 | 189 | t.datetime "updated_at" |
|
186 | 190 | end |
|
187 | 191 | |
|
188 | 192 | create_table "test_pairs", :force => true do |t| |
|
189 | 193 | t.integer "problem_id" |
|
190 |
- t.text "input", :limit => |
|
|
191 |
- t.text "solution", :limit => |
|
|
192 |
- t.datetime "created_at", |
|
|
193 |
- t.datetime "updated_at", |
|
|
194 | + t.text "input", :limit => 16777215 | |
|
195 | + t.text "solution", :limit => 16777215 | |
|
196 | + t.datetime "created_at", :null => false | |
|
197 | + t.datetime "updated_at", :null => false | |
|
194 | 198 | end |
|
195 | 199 | |
|
196 | 200 | create_table "test_requests", :force => true do |t| |
|
197 | 201 | t.integer "user_id" |
|
198 | 202 | t.integer "problem_id" |
|
199 | 203 | t.integer "submission_id" |
|
200 | 204 | t.string "input_file_name" |
|
201 | 205 | t.string "output_file_name" |
|
202 | 206 | t.string "running_stat" |
|
203 | 207 | t.integer "status" |
|
204 |
- t.datetime "updated_at", |
|
|
208 | + t.datetime "updated_at", :null => false | |
|
205 | 209 | t.datetime "submitted_at" |
|
206 | 210 | t.datetime "compiled_at" |
|
207 |
- t.text "compiler_message" |
|
|
211 | + t.text "compiler_message" | |
|
208 | 212 | t.datetime "graded_at" |
|
209 | 213 | t.string "grader_comment" |
|
210 |
- t.datetime "created_at", |
|
|
214 | + t.datetime "created_at", :null => false | |
|
211 | 215 | t.float "running_time" |
|
212 | 216 | t.string "exit_status" |
|
213 | 217 | t.integer "memory_usage" |
|
214 | 218 | end |
|
215 | 219 | |
|
216 | 220 | add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id" |
@@ -232,11 +236,12 | |||
|
232 | 236 | t.string "email" |
|
233 | 237 | t.integer "site_id" |
|
234 | 238 | t.integer "country_id" |
|
235 | 239 | t.boolean "activated", :default => false |
|
236 | 240 | t.datetime "created_at" |
|
237 | 241 | t.datetime "updated_at" |
|
242 | + t.string "section" | |
|
238 | 243 | end |
|
239 | 244 | |
|
240 | 245 | add_index "users", ["login"], :name => "index_users_on_login", :unique => true |
|
241 | 246 | |
|
242 | 247 | end |
You need to be logged in to leave comments.
Login now