cafe-grader-web Commit - r242:803c8843ad9b

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r242:803c8843ad9b - Fri, 29 Jan 2010 13:52:23 - 3 files changed: 29 inserted, 15 deleted

app/controllers/main_controller.rb ¶ +10 -1

                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 #
                 # actions for Code Jom
                 #
                 def download_input
+            +     user = User.find(session[:user_id])
+            +
+            +     if Configuration.time_limit_mode? and user.contest_finished?
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
                   problem = Problem.find(params[:id])
-            -     user = User.find(session[:user_id])
                   if user.can_request_new_test_pair_for? problem
                     assignment = user.get_new_test_pair_assignment_for problem
                     assignment.save
                     send_data(assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{assignment.request_number}.in",
                                 :type => 'text/plain' })
                   else
                     recent_assignment = user.get_recent_test_pair_assignment_for problem
                     send_data(recent_assignment.test_pair.input,
                               { :filename => "#{problem.name}-#{recent_assignment.request_number}.in",
                                 :type => 'text/plain' })
                   end
                 end
                 def submit_solution
                   problem = Problem.find(params[:id])
                   user = User.find(session[:user_id])
                   recent_assignment = user.get_recent_test_pair_assignment_for problem
+            +     if Configuration.time_limit_mode? and user.contest_finished?
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
                   if recent_assignment == nil
                     flash[:notice] = 'You have not requested for any input data for this problem.  Please download an input first.'
                     session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end
                   if recent_assignment.expired?
                     flash[:notice] = 'The current input is expired.  Please download a new input data.'
                     session[:current_problem_id] = problem.id
                     redirect_to :action => 'list' and return
                   end

app/views/main/_problem.html.haml ¶ +16 -11

@@ -1,21 +1,26
1	.problem-panel{:id => "problem-panel-#{problem.id}", :style => "#{(problem.id != @current_problem_id) ? "display:none" : ""}"}	1	.problem-panel{:id => "problem-panel-#{problem.id}", :style => "#{(problem.id != @current_problem_id) ? "display:none" : ""}"}
2	- .problem-form{:id => "problem-form-#{problem.id}"}	2	+ - if (not Configuration.time_limit_mode?) or (not @user.contest_finished?)
3	- - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do	3	+ .problem-form{:id => "problem-form-#{problem.id}"}
4	- %b Input:	4	+ - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
5	- %input{:type => "submit", :value => "Download input", :onclick => "CodejomTimeout.updateTimeoutAfterDownloadClick(#{problem.id}); return true;"}	5	+ %b Input:
6	- %span{:id => "problem-timing-message-#{problem.id}"}	6	+ %input{:type => "submit", :value => "Download input", :onclick => "CodejomTimeout.updateTimeoutAfterDownloadClick(#{problem.id}); return true;"}
7	- = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."	7	+ %span{:id => "problem-timing-message-#{problem.id}"}
8	- %div{:id => "problem-submission-form-#{problem.id}"}	8	+ = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
9	- - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do	9	+ %div{:id => "problem-submission-form-#{problem.id}"}
10	- %b Submit output:	10	+ - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
11	- %input{:type => "file", :name => "file"}	11	+ %b Submit output:
12	- %input{:type => "~~submit~~", :~~valu~~e => "~~Submit solution~~"}	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	.problem-description	19	.problem-description
15	- if problem.description!=nil	20	- if problem.description!=nil
16	- if problem.description.markdowned	21	- if problem.description.markdowned
17	~ markdown(problem.description.body)	22	~ markdown(problem.description.body)
18	- else	23	- else
19	= problem.description.body	24	= problem.description.body
20	- else	25	- else
21	(not available)	26	(not available)

db/schema.rb ¶ +3 -3

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20100126170609) do
+            + ActiveRecord::Schema.define(:version => 20100129041917) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                 end
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "test_pair_id"
                   t.integer  "test_pair_number"
                   t.integer  "request_number"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "submitted"
                 end
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input"
+            +     t.text     "input",      :limit => 16777215
-            -     t.text     "solution"
+            +     t.text     "solution",   :limit => 16777215
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "number"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r242:803c8843ad9b - Fri, 29 Jan 2010 13:52:23 - 3 files changed: 29 inserted, 15 deleted

Sign in to your account

Commit r242:803c8843ad9b public

Author

r242:803c8843ad9b - Fri, 29 Jan 2010 13:52:23 - 3 files changed: 29 inserted, 15 deleted

Commit `r242:803c8843ad9b` public