cafe-grader-web Commit - r302:77a5c6e76df3

cafe-grader-web

Commit `r302:77a5c6e76df3` public

parent | child

Description:

shows contest start confirmation for indv contest

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

r302:77a5c6e76df3 - Thu, 15 Apr 2010 16:19:06 - 4 files changed: 45 inserted, 4 deleted

app/views/main/confirm_contest_start.html.haml created 644 ¶ +12

			@@ -0,0 +1,12
		1	+ = user_title_bar(@user)
		2	+
		3	+ %center
		4	+ You will participate in contest:
		5	+ - @contests.each do \|contest\|
		6	+ = contest.title
		7	+ %br
		8	+
		9	+ The timer will start after you click the start button.
		10	+
		11	+ - form_tag :action => 'confirm_contest_start', :method => 'post' do
		12	+ = submit_tag 'Start!', :confirm => 'Are you sure?'

app/controllers/main_controller.rb ¶ +23 -3

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
-            -   append_before_filter :update_user_start_time, :except => [:index, :login]
+            +   append_before_filter :confirm_and_update_start_time,
+            +                        :except => [:index,
+            +                                    :login,
+            +                                    :confirm_contest_start]
                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
-            -   prepend_before_filter :reject_announcement_refresh_when_logged_out, :only => [:announcements]
+            +   prepend_before_filter :reject_announcement_refresh_when_logged_out,
+            +                         :only => [:announcements]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
+            +   def confirm_contest_start
+            +     user = User.find(session[:user_id])
+            +     if request.method == :post
+            +       user.update_start_time
+            +       redirect_to :action => 'list'
+            +     else
+            +       @contests = user.contests
+            +       @user = user
+            +     end
+            +   end
+            +
                 protected
                 def prepare_announcements(recent=nil)
                   if Configuration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     :running_time => seconds,
                     :exit_status => run_stat,
                     :memory_usage => memory_used
                   }
                 end
-            -   def update_user_start_time
+            +   def confirm_and_update_start_time
                   user = User.find(session[:user_id])
+            +     if (Configuration.indv_contest_mode? and
+            +         Configuration['contest.confirm_indv_contest_start'] and
+            +         !user.contest_started?)
+            +       redirect_to :action => 'confirm_contest_start' and return
+            +     end
                   user.update_start_time
                 end
                 def reject_announcement_refresh_when_logged_out
                   if not session[:user_id]
                     render :text => 'Access forbidden', :status => 403

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

                   else
                     return false
                   end
                 end
                 def contest_started?
-            -     if Configuration.contest_mode?
+            +     if Configuration.indv_contest_mode?
+            +       stat = self.contest_stat
+            +       return ((stat != nil) and (stat.started_at != nil))
+            +     elsif Configuration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end

db/seeds.rb ¶ +6

                  },
                  {
                    :key => 'system.multicontests',
                    :value_type => 'boolean',
                    :default_value => 'false'
+            +    },
+            +
+            +    {
+            +      :key => 'contest.confirm_indv_contest_start',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false'
                  }
                 ]
               def create_configuration_key(key,
                                            value_type,

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

r302:77a5c6e76df3 - Thu, 15 Apr 2010 16:19:06 - 4 files changed: 45 inserted, 4 deleted

Sign in to your account

Commit r302:77a5c6e76df3 public

Author

r302:77a5c6e76df3 - Thu, 15 Apr 2010 16:19:06 - 4 files changed: 45 inserted, 4 deleted

Commit `r302:77a5c6e76df3` public