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 | Show 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: 31 inserted, 12 deleted

Show file before | Show file after | Raw diff | Download diff | Show 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 | Show whitespace Increase context Show commentsHide comments
@@ -1,261 +1,262
1 1 class MainController < ApplicationController
2 2
3 3 before_filter :authenticate, :except => [:index, :login]
4 4 before_filter :check_viewability, :except => [:index, :login]
5 5
6 6 append_before_filter :confirm_and_update_start_time,
7 7 :except => [:index,
8 8 :login,
9 9 :confirm_contest_start]
10 10
11 11 # to prevent log in box to be shown when user logged out of the
12 12 # system only in some tab
13 13 prepend_before_filter :reject_announcement_refresh_when_logged_out,
14 14 :only => [:announcements]
15 15
16 16 # COMMENTED OUT: filter in each action instead
17 17 # before_filter :verify_time_limit, :only => [:submit]
18 18
19 19 verify :method => :post, :only => [:submit],
20 20 :redirect_to => { :action => :index }
21 21
22 22 # COMMENT OUT: only need when having high load
23 23 # caches_action :index, :login
24 24
25 25 # NOTE: This method is not actually needed, 'config/routes.rb' has
26 26 # assigned action login as a default action.
27 27 def index
28 28 redirect_to :action => 'login'
29 29 end
30 30
31 31 def login
32 32 saved_notice = flash[:notice]
33 33 reset_session
34 34 flash.now[:notice] = saved_notice
35 35
36 36 # EXPERIMENT:
37 37 # Hide login if in single user mode and the url does not
38 38 # explicitly specify /login
39 39 #
40 40 # logger.info "PATH: #{request.path}"
41 41 # if GraderConfiguration['system.single_user_mode'] and
42 42 # request.path!='/main/login'
43 43 # @hidelogin = true
44 44 # end
45 45
46 46 @announcements = Announcement.find_for_frontpage
47 47 render :action => 'login', :layout => 'empty'
48 48 end
49 49
50 50 def list
51 51 prepare_list_information
52 52 end
53 53
54 54 def help
55 55 @user = User.find(session[:user_id])
56 56 end
57 57
58 58 def submit
59 59 user = User.find(session[:user_id])
60 60
61 61 @submission = Submission.new
62 62 @submission.problem_id = params[:submission][:problem_id]
63 63 @submission.user = user
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
76 77
77 78 if @submission.valid?
78 79 if @submission.save == false
79 80 flash[:notice] = 'Error saving your submission'
80 81 elsif Task.create(:submission_id => @submission.id,
81 82 :status => Task::STATUS_INQUEUE) == false
82 83 flash[:notice] = 'Error adding your submission to task queue'
83 84 end
84 85 else
85 86 prepare_list_information
86 87 render :action => 'list' and return
87 88 end
88 89 redirect_to :action => 'list'
89 90 end
90 91
91 92 def source
92 93 submission = Submission.find(params[:id])
93 94 if ((submission.user_id == session[:user_id]) and
94 95 (submission.problem != nil) and
95 96 (submission.problem.available))
96 97 send_data(submission.source,
97 98 {:filename => submission.download_filename,
98 99 :type => 'text/plain'})
99 100 else
100 101 flash[:notice] = 'Error viewing source'
101 102 redirect_to :action => 'list'
102 103 end
103 104 end
104 105
105 106 def compiler_msg
106 107 @submission = Submission.find(params[:id])
107 108 if @submission.user_id == session[:user_id]
108 109 render :action => 'compiler_msg', :layout => 'empty'
109 110 else
110 111 flash[:notice] = 'Error viewing source'
111 112 redirect_to :action => 'list'
112 113 end
113 114 end
114 115
115 116 def submission
116 117 @user = User.find(session[:user_id])
117 118 @problems = @user.available_problems
118 119 if params[:id]==nil
119 120 @problem = nil
120 121 @submissions = nil
121 122 else
122 123 @problem = Problem.find_by_name(params[:id])
123 124 if not @problem.available
124 125 redirect_to :action => 'list'
125 126 flash[:notice] = 'Error: submissions for that problem are not viewable.'
126 127 return
127 128 end
128 129 @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
129 130 end
130 131 end
131 132
132 133 def result
133 134 if !GraderConfiguration.show_grading_result
134 135 redirect_to :action => 'list' and return
135 136 end
136 137 @user = User.find(session[:user_id])
137 138 @submission = Submission.find(params[:id])
138 139 if @submission.user!=@user
139 140 flash[:notice] = 'You are not allowed to view result of other users.'
140 141 redirect_to :action => 'list' and return
141 142 end
142 143 prepare_grading_result(@submission)
143 144 end
144 145
145 146 def load_output
146 147 if !GraderConfiguration.show_grading_result or params[:num]==nil
147 148 redirect_to :action => 'list' and return
148 149 end
149 150 @user = User.find(session[:user_id])
150 151 @submission = Submission.find(params[:id])
151 152 if @submission.user!=@user
152 153 flash[:notice] = 'You are not allowed to view result of other users.'
153 154 redirect_to :action => 'list' and return
154 155 end
155 156 case_num = params[:num].to_i
156 157 out_filename = output_filename(@user.login,
157 158 @submission.problem.name,
158 159 @submission.id,
159 160 case_num)
160 161 if !FileTest.exists?(out_filename)
161 162 flash[:notice] = 'Output not found.'
162 163 redirect_to :action => 'list' and return
163 164 end
164 165
165 166 if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
166 167 response.headers['Content-Type'] = "application/force-download"
167 168 response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
168 169 response.headers["X-Sendfile"] = out_filename
169 170 response.headers['Content-length'] = File.size(out_filename)
170 171 render :nothing => true
171 172 else
172 173 send_file out_filename, :stream => false, :filename => "output-#{case_num}.txt", :type => "text/plain"
173 174 end
174 175 end
175 176
176 177 def error
177 178 @user = User.find(session[:user_id])
178 179 end
179 180
180 181 # announcement refreshing and hiding methods
181 182
182 183 def announcements
183 184 if params.has_key? 'recent'
184 185 prepare_announcements(params[:recent])
185 186 else
186 187 prepare_announcements
187 188 end
188 189 render(:partial => 'announcement',
189 190 :collection => @announcements,
190 191 :locals => {:announcement_effect => true})
191 192 end
192 193
193 194 def confirm_contest_start
194 195 user = User.find(session[:user_id])
195 196 if request.method == :post
196 197 user.update_start_time
197 198 redirect_to :action => 'list'
198 199 else
199 200 @contests = user.contests
200 201 @user = user
201 202 end
202 203 end
203 204
204 205 protected
205 206
206 207 def prepare_announcements(recent=nil)
207 208 if GraderConfiguration.show_tasks_to?(@user)
208 209 @announcements = Announcement.find_published(true)
209 210 else
210 211 @announcements = Announcement.find_published
211 212 end
212 213 if recent!=nil
213 214 recent_id = recent.to_i
214 215 @announcements = @announcements.find_all { |a| a.id > recent_id }
215 216 end
216 217 end
217 218
218 219 def prepare_list_information
219 220 @user = User.find(session[:user_id])
220 221 if not GraderConfiguration.multicontests?
221 222 @problems = @user.available_problems
222 223 else
223 224 @contest_problems = @user.available_problems_group_by_contests
224 225 @problems = @user.available_problems
225 226 end
226 227 @prob_submissions = {}
227 228 @problems.each do |p|
228 229 sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
229 230 if sub!=nil
230 231 @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
231 232 else
232 233 @prob_submissions[p.id] = { :count => 0, :submission => nil }
233 234 end
234 235 end
235 236 prepare_announcements
236 237 end
237 238
238 239 def check_viewability
239 240 @user = User.find(session[:user_id])
240 241 if (!GraderConfiguration.show_tasks_to?(@user)) and
241 242 ((action_name=='submission') or (action_name=='submit'))
242 243 redirect_to :action => 'list' and return
243 244 end
244 245 end
245 246
246 247 def prepare_grading_result(submission)
247 248 if GraderConfiguration.task_grading_info.has_key? submission.problem.name
248 249 grading_info = GraderConfiguration.task_grading_info[submission.problem.name]
249 250 else
250 251 # guess task info from problem.full_score
251 252 cases = submission.problem.full_score / 10
252 253 grading_info = {
253 254 'testruns' => cases,
254 255 'testcases' => cases
255 256 }
256 257 end
257 258 @test_runs = []
258 259 if grading_info['testruns'].is_a? Integer
259 260 trun_count = grading_info['testruns']
260 261 trun_count.times do |i|
261 262 @test_runs << [ read_grading_result(@user.login,
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,57 +1,61
1 1 %style{type: "text/css"}
2 2 = @css_style
3 3 :css
4 4 .field {
5 5 font-weight: bold;
6 6 text-align: right;
7 7 padding: 3px;
8 8 }
9 9
10 10
11 11 %h1= "Submission: #{@submission.id}"
12 12
13 13
14 14 %h2 Stat
15 15
16 16 %table.info
17 17 %thead
18 18 %tr.info-head
19 19 %th Field
20 20 %th Value
21 21 %tbody
22 22 %tr{class: cycle('info-even','info-odd')}
23 23 %td.field User:
24 24 %td.value= "(#{@submission.user.login}) #{@submission.user.full_name}"
25 25 %tr{class: cycle('info-even','info-odd')}
26 26 %td.field Problem:
27 27 %td.value
28 28 - if @submission.problem!=nil
29 29 = "(#{@submission.problem.name}) #{@submission.problem.full_name}"
30 30 - else
31 31 = "(n/a)"
32 32 %tr{class: cycle('info-even','info-odd')}
33 33 %td.field Tries:
34 34 %td.value= @submission.number
35 35 %tr{class: cycle('info-even','info-odd')}
36 36 %td.field Submitted:
37 37 %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
38 38 %tr{class: cycle('info-even','info-odd')}
39 39 %td.field Graded:
40 40 %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
41 41 %tr{class: cycle('info-even','info-odd')}
42 42 %td.field Points:
43 43 %td.value #{@submission.points}/#{@submission.problem.full_score}
44 44 %tr{class: cycle('info-even','info-odd')}
45 45 %td.field Comment:
46 46 %td.value #{@submission.grader_comment}
47 47 %tr{class: cycle('info-even','info-odd')}
48 48 %td.field Runtime (s):
49 49 %td.value #{@submission.max_runtime}
50 50 %tr{class: cycle('info-even','info-odd')}
51 51 %td.field Memory (kb):
52 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 58 %h2 Source code
55 59 //%div.highlight{:style => "border: 1px solid black;"}
56 60 =@formatted_code.html_safe
57 61
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,46 +1,50
1 1 - content_for :header do
2 2 = javascript_include_tag 'new'
3 3
4 4 %script{:type=>"text/javascript"}
5 5 $(function () {
6 6 $('#submission_table').tablesorter({widgets: ['zebra','filter']});
7 7 });
8 8
9 9 :css
10 10 .fix-width {
11 11 font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
12 12 }
13 13
14 14 %h1= @user.full_name + ' Profile'
15 15
16 16 %h2 Basic info
17 17 <b>Login:</b> #{@user.login} <br/>
18 18 <b>Full name:</b> #{@user.full_name} <br />
19 19
20 20
21 21 %h2 Problem Stat
22 22
23 23 %h2 Submissions
24 24
25 25 %table.tablesorter-cafe#submission_table
26 26 %thead
27 27 %tr
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 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 | Show whitespace Increase context Show commentsHide comments
@@ -1,242 +1,247
1 1 # encoding: UTF-8
2 2 # This file is auto-generated from the current state of the database. Instead
3 3 # of editing this file, please use the migrations feature of Active Record to
4 4 # incrementally modify your database, and then regenerate this schema definition.
5 5 #
6 6 # Note that this schema.rb definition is the authoritative source for your
7 7 # database schema. If you need to create the application database on another
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 => 20140826095949) do
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", :limit => 16777215
18 + t.text "body"
19 19 t.boolean "published"
20 20 t.datetime "created_at", :null => false
21 21 t.datetime "updated_at", :null => false
22 22 t.boolean "frontpage", :default => false
23 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"
30 30 t.boolean "enabled"
31 31 t.datetime "created_at", :null => false
32 32 t.datetime "updated_at", :null => false
33 33 t.string "name"
34 34 end
35 35
36 36 create_table "contests_problems", :id => false, :force => true do |t|
37 37 t.integer "contest_id"
38 38 t.integer "problem_id"
39 39 end
40 40
41 41 create_table "contests_users", :id => false, :force => true do |t|
42 42 t.integer "contest_id"
43 43 t.integer "user_id"
44 44 end
45 45
46 46 create_table "countries", :force => true do |t|
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", :limit => 16777215
53 + t.text "body"
54 54 t.boolean "markdowned"
55 55 t.datetime "created_at", :null => false
56 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 63 t.datetime "created_at", :null => false
64 64 t.datetime "updated_at", :null => false
65 - t.text "description", :limit => 16777215
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"
72 72 t.boolean "active"
73 73 t.datetime "created_at", :null => false
74 74 t.datetime "updated_at", :null => false
75 75 t.integer "task_id"
76 76 t.string "task_type"
77 77 t.boolean "terminated"
78 78 end
79 79
80 80 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
81 81
82 82 create_table "languages", :force => true do |t|
83 83 t.string "name", :limit => 10
84 84 t.string "pretty_name"
85 85 t.string "ext", :limit => 10
86 86 t.string "common_ext"
87 87 end
88 88
89 89 create_table "logins", :force => true do |t|
90 90 t.string "user_id"
91 91 t.string "ip_address"
92 92 t.datetime "created_at", :null => false
93 93 t.datetime "updated_at", :null => false
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 102 t.datetime "created_at", :null => false
103 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"
110 110 t.date "date_added"
111 111 t.boolean "available"
112 112 t.string "url"
113 113 t.integer "description_id"
114 114 t.boolean "test_allowed"
115 115 t.boolean "output_only"
116 116 t.string "description_filename"
117 117 end
118 118
119 119 create_table "rights", :force => true do |t|
120 120 t.string "name"
121 121 t.string "controller"
122 122 t.string "action"
123 123 end
124 124
125 125 create_table "rights_roles", :id => false, :force => true do |t|
126 126 t.integer "right_id"
127 127 t.integer "role_id"
128 128 end
129 129
130 130 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
131 131
132 132 create_table "roles", :force => true do |t|
133 133 t.string "name"
134 134 end
135 135
136 136 create_table "roles_users", :id => false, :force => true do |t|
137 137 t.integer "role_id"
138 138 t.integer "user_id"
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", :limit => 16777215
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
152 152 create_table "sites", :force => true do |t|
153 153 t.string "name"
154 154 t.boolean "started"
155 155 t.datetime "start_time"
156 156 t.datetime "created_at", :null => false
157 157 t.datetime "updated_at", :null => false
158 158 t.integer "country_id"
159 159 t.string "password"
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", :limit => 16777215
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", :limit => 16777215
170 + t.text "compiler_message"
171 171 t.datetime "graded_at"
172 172 t.integer "points"
173 - t.text "grader_comment", :limit => 16777215
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|
182 186 t.integer "submission_id"
183 187 t.datetime "created_at"
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 => 2147483647
191 - t.text "solution", :limit => 2147483647
194 + t.text "input", :limit => 16777215
195 + t.text "solution", :limit => 16777215
192 196 t.datetime "created_at", :null => false
193 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 208 t.datetime "updated_at", :null => false
205 209 t.datetime "submitted_at"
206 210 t.datetime "compiled_at"
207 - t.text "compiler_message", :limit => 16777215
211 + t.text "compiler_message"
208 212 t.datetime "graded_at"
209 213 t.string "grader_comment"
210 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"
217 221
218 222 create_table "user_contest_stats", :force => true do |t|
219 223 t.integer "user_id"
220 224 t.datetime "started_at"
221 225 t.datetime "created_at", :null => false
222 226 t.datetime "updated_at", :null => false
223 227 t.boolean "forced_logout"
224 228 end
225 229
226 230 create_table "users", :force => true do |t|
227 231 t.string "login", :limit => 50
228 232 t.string "full_name"
229 233 t.string "hashed_password"
230 234 t.string "salt", :limit => 5
231 235 t.string "alias"
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