cafe-grader-web Commit - r222:2b6293a64dbb

cafe-grader-web

parent | child

Description:

added test assignment time out

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

r222:2b6293a64dbb - Tue, 26 Jan 2010 00:49:26 - 8 files changed: 42 inserted, 2 deleted

app/controllers/main_controller.rb ¶ +5

                     redirect_to :action => 'list' and return
                   end
+            +     if recent_assignment.expired?
+            +       flash[:notice] = 'The current input is expired.  Please download a new input data.'
+            +       redirect_to :action => 'list' and return
+            +     end
+            +
                   if recent_assignment.submitted
                     flash[:notice] = 'You have already submitted an incorrect solution for this input.  Please download a new input data.'
                     redirect_to :action => 'list' and return

app/models/test_pair_assignment.rb ¶ +6

               class TestPairAssignment < ActiveRecord::Base
+            +
                 belongs_to :user
                 belongs_to :test_pair
                 belongs_to :problem
+            +
+            +   def expired?
+            +     return created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION < Time.new.gmtime
+            +   end
+            +
               end

app/models/user.rb ¶ +1 -1

                 def can_request_new_test_pair_for?(problem)
                   recent = get_recent_test_pair_assignment_for problem
-            -     return (recent == nil or recent.submitted)
+            +     return (recent == nil or recent.submitted or recent.expired?)
                 end
                 def get_new_test_pair_assignment_for(problem)

app/views/layouts/application.html.erb ¶ +1 -1

               <%= user_header %>
               </div>
-            - <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
+            + <% if flash[:notice]!=nil %><div class="notice-bar"><span class="notice"><%= flash[:notice] %></span></div><% end %>
               <%= yield  %>

app/views/main/_problem.html.haml ¶ +1

                   - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
                     %b Input:
                     %input{:type => "submit", :value => "Download input"}
+            +       = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
                   - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
                     %b Submit output:
                     %input{:type => "file", :name => "file"}

config/environment.rb.SAMPLE ¶ +1

               # OPTIONS FOR CODE JOM
               # --------------------
               CODEJOM_MAX_ALIVE_LEVEL = 10
+            + TEST_ASSIGNMENT_EXPIRATION_DURATION = 5.minute

public/stylesheets/application.css ¶ +13

public/stylesheets/sass/application.sass ¶ +14

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

	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