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

                   recent_assignment = user.get_recent_test_pair_assignment_for problem
                   if recent_assignment == nil
                     flash[:notice] = 'You have not requested for any input data for this problem.  Please download an input first.'
                     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
                   end
                   if params[:file] == nil

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

                     return recent
                   end
                 end
                 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)
                   previous_assignment_numbers =
                     get_test_pair_assignments_for(problem).collect {|a| a.test_pair_number }
                   test_pair = problem.random_test_pair(previous_assignment_numbers)

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

               <body>
               <div class="userbar">
               <%= 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  %>
               </body>
               </html>

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

               .problem-panel{:id => "problem-panel-#{problem.id}", :style => "display:none"}
                 .problem-form{:id => "problem-form-#{problem.id}"}
                   - 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"}
                     %input{:type => "submit", :value => "Submit solution"}
                 .problem-description

config/environment.rb.SAMPLE ¶ +1

               # Uncomment so that configuration is read only once when the server is loaded
               # Configuration.enable_caching
               # OPTIONS FOR CODE JOM
               # --------------------
               CODEJOM_MAX_ALIVE_LEVEL = 10
+            + TEST_ASSIGNMENT_EXPIRATION_DURATION = 5.minute

public/stylesheets/application.css ¶ +13

               .problem-panel {
                 border: 1px black solid;
                 padding: 5px; }
                 .problem-panel .problem-form {
                   border: 1px dotted #99aaee;
                   background: #eeeeff; }
+            +
+            + .notice-bar {
+            +   margin-top: 3px;
+            +   margin-bottom: 3px;
+            +   text-align: center; }
+            +   .notice-bar span.notice {
+            +     color: white;
+            +     font-weight: bold;
+            +     background: #000070;
+            +     padding: 3px 20px 3px 20px;
+            +     -moz-border-radius: 2px;
+            +     -webkit-border-radius: 5px;
+            +     border-radius: 5px; }

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

                 border: 1px black solid
                 padding: 5px
                 .problem-form
                   border: 1px dotted #99aaee
                   background: #eeeeff
+            +
+            + .notice-bar
+            +   margin-top: 3px
+            +   margin-bottom: 3px
+            +   text-align: center
+            +
+            +   span.notice
+            +     color: white
+            +     font-weight: bold
+            +     background: #000070
+            +     padding: 3px 20px 3px 20px
+            +     -moz-border-radius: 2px
+            +     -webkit-border-radius: 5px
+            +     border-radius: 5px

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