cafe-grader-web

Commit r242:803c8843ad9b public

parent | child
Description:
added time out check for code jom submissions
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

r242:803c8843ad9b - - 3 files changed: 29 inserted, 15 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -177,14 +177,19
177 177 end
178 178
179 179 #
180 180 # actions for Code Jom
181 181 #
182 182 def download_input
183 + user = User.find(session[:user_id])
184 +
185 + if Configuration.time_limit_mode? and user.contest_finished?
186 + redirect_to :action => 'list' and return
187 + end
188 +
183 189 problem = Problem.find(params[:id])
184 - user = User.find(session[:user_id])
185 190 if user.can_request_new_test_pair_for? problem
186 191 assignment = user.get_new_test_pair_assignment_for problem
187 192 assignment.save
188 193
189 194 send_data(assignment.test_pair.input,
190 195 { :filename => "#{problem.name}-#{assignment.request_number}.in",
@@ -199,12 +204,16
199 204
200 205 def submit_solution
201 206 problem = Problem.find(params[:id])
202 207 user = User.find(session[:user_id])
203 208 recent_assignment = user.get_recent_test_pair_assignment_for problem
204 209
210 + if Configuration.time_limit_mode? and user.contest_finished?
211 + redirect_to :action => 'list' and return
212 + end
213 +
205 214 if recent_assignment == nil
206 215 flash[:notice] = 'You have not requested for any input data for this problem. Please download an input first.'
207 216 session[:current_problem_id] = problem.id
208 217 redirect_to :action => 'list' and return
209 218 end
210 219
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,18 +1,23
1 1 .problem-panel{:id => "problem-panel-#{problem.id}", :style => "#{(problem.id != @current_problem_id) ? "display:none" : ""}"}
2 - .problem-form{:id => "problem-form-#{problem.id}"}
3 - - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
4 - %b Input:
5 - %input{:type => "submit", :value => "Download input", :onclick => "CodejomTimeout.updateTimeoutAfterDownloadClick(#{problem.id}); return true;"}
6 - %span{:id => "problem-timing-message-#{problem.id}"}
7 - = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
8 - %div{:id => "problem-submission-form-#{problem.id}"}
9 - - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
10 - %b Submit output:
11 - %input{:type => "file", :name => "file"}
12 - %input{:type => "submit", :value => "Submit solution"}
2 + - if (not Configuration.time_limit_mode?) or (not @user.contest_finished?)
3 + .problem-form{:id => "problem-form-#{problem.id}"}
4 + - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
5 + %b Input:
6 + %input{:type => "submit", :value => "Download input", :onclick => "CodejomTimeout.updateTimeoutAfterDownloadClick(#{problem.id}); return true;"}
7 + %span{:id => "problem-timing-message-#{problem.id}"}
8 + = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
9 + %div{:id => "problem-submission-form-#{problem.id}"}
10 + - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
11 + %b Submit output:
12 + %input{:type => "file", :name => "file"}
13 + %input{:type => "submit", :value => "Submit solution"}
14 + - else
15 + .problem-form
16 + %p
17 + The contest is over, you can view the tasks, but you can no longer submit.
13 18
14 19 .problem-description
15 20 - if problem.description!=nil
16 21 - if problem.description.markdowned
17 22 ~ markdown(problem.description.body)
18 23 - else
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -6,13 +6,13
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 => 20100126170609) do
12 + ActiveRecord::Schema.define(:version => 20100129041917) 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"
@@ -183,14 +183,14
183 183 t.datetime "updated_at"
184 184 t.boolean "submitted"
185 185 end
186 186
187 187 create_table "test_pairs", :force => true do |t|
188 188 t.integer "problem_id"
189 - t.text "input"
190 - t.text "solution"
189 + t.text "input", :limit => 16777215
190 + t.text "solution", :limit => 16777215
191 191 t.datetime "created_at"
192 192 t.datetime "updated_at"
193 193 t.integer "number"
194 194 end
195 195
196 196 create_table "test_requests", :force => true do |t|
You need to be logged in to leave comments. Login now