cafe-grader-web Commit - r128:f40baf68cc55

cafe-grader-web

Commit `r128:f40baf68cc55` public

parent | child

Description:

[web] test request stops at 30 min before end, auto refresh grader process status git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@258 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r128:f40baf68cc55 - Fri, 09 May 2008 08:29:26 - 4 files changed: 24 inserted, 7 deleted

app/controllers/test_controller.rb ¶ +12 -5

                 before_filter :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
               #
               #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   prepare_index_information
                 end
                 def submit
                   @user = User.find(session[:user_id])
                   @submitted_test_request = TestRequest.new_from_form_params(@user,params[:test_request])
                   if @submitted_test_request.errors.length != 0
                     prepare_index_information
                     render :action => 'index' and return
                   end
-            -     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
+            +     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
-            -         @user.site!=nil and @user.site.finished?
+            +       if @user.site!=nil and @user.site.finished?
-            -       @submitted_test_request.errors.add_to_base('Contest is over.')
+            +         @submitted_test_request.errors.add_to_base('Contest is over.')
-            -       prepare_index_information
+            +         prepare_index_information
-            -       render :action => 'index' and return
+            +         render :action => 'index' and return
+            +       end
+            +
+            +       if !Configuration.allow_test_request(@user)
+            +         prepare_index_information
+            +         flash[:notice] = 'Test request is not allowed during the last 30 minutes'
+            +         redirect_to :action => 'index' and return
+            +       end
                   end
                   if @submitted_test_request.save
                     redirect_to :action => 'index'
                   else
                     prepare_index_information
                     render :action => 'index'
                   end
                 end
                 def read
                   user = User.find(session[:user_id])
                   begin
                     test_request = TestRequest.find(params[:id])
                   rescue
                     test_request = nil
                   end
                   if test_request==nil or test_request.user_id != user.id
                     flash[:notice] = 'Invalid output'
                     redirect_to :action => 'index'
                     return
                   end
                   if test_request.output_file_name!=nil
                     data = File.open(test_request.output_file_name).read(2048)

app/models/configuration.rb ¶ +10 -1

                 def self.clear
                   @@configurations = nil
                 end
                 #
                 # View decision
                 #
                 def self.show_submitbox_to?(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return false if mode=='analysis'
                   if (mode=='contest')
                     return false if (user.site!=nil) and
                       ((user.site.started==false) or (user.site.finished?))
                   end
                   return true
                 end
                 def self.show_tasks_to?(user)
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   if (mode=='contest')
                     return false if (user.site!=nil) and (user.site.started==false)
                   end
                   return true
                 end
+            +
+            +   def self.allow_test_request(user)
+            +     mode = get(SYSTEM_MODE_CONF_KEY)
+            +     if (mode=='contest')
+            +       return false if (user.site!=nil) and ((user.site.started==false) or
+            +                                             (user.site.time_left < 30.minutes))
+            +     end
+            +     return false if mode=='analysis'
+            +     return true
+            +   end
                 protected
                 def self.read_config
                   @@configurations = {}
                   Configuration.find(:all).each do |conf|
                     key = conf.key
                     val = conf.value
                     case conf.value_type
                     when 'string'
                       @@configurations[key] = val
                     when 'integer'
                       @@configurations[key] = val.to_i
                     when 'boolean'
                       @@configurations[key] = (val=='true')
                     end
                   end
                 end
               end

app/views/graders/list.html.haml ¶ +1

               - content_for :head do
                 = stylesheet_link_tag 'graders'
+            +   <meta http-equiv ="refresh" content="10"/>
               %h2 (Under Experiments)
               - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
                 = submit_tag 'Clear all data'
               Last task:
               = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
               %br/
               Last test_request:
               = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
               %h3 Current graders
               = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
               %h3 Stalled graders
               = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}

app/views/test/index.html.erb ¶ +1 -1

               <script type="text/javascript">
               var submissionCount = new Array();
               <% @submissions.each do |submission| %>
               submissionCount[<%= submission.problem_id %>]=<%= submission.number %>;
               <% end %>
               function updateSubmissionList() {
                 currentProb = document.getElementById("test_request_problem_id").value;
                 count = submissionCount[currentProb];
                 submissionSelect = document.getElementById("test_request_submission_number");
                 old_len = submissionSelect.length;
                 // clear the box
                 for(i=0; i<old_len; i++)
                   submissionSelect.remove(0);
                 for(i=count; i>=1; i--) {
                   try {
                     submissionSelect.add(new Option(""+i,""+i,false,false),null);
                   } catch(ex) {
                     submissionSelect.add(new Option(""+i,""+i,false,false));
                   }
                 }
               }
               </script>
-            - <% if Configuration.show_submitbox_to?(@user) %>
+            + <% if Configuration.show_submitbox_to?(@user) and Configuration.allow_test_request(@user) %>
                 <div class="submitbox">
                 <%= error_messages_for 'submitted_test_request' %>
                 <% form_for :test_request, nil,
                             :url => { :action => 'submit'},
                             :html => { :multipart => true } do |f| %>
                   <table>
                     <tr>
                       <td>Task:</td>
                       <td>
               	  <%= select(:test_request,
               	             :problem_id,
               	             @problems.collect {|p| [p.name, p.id]}, {},
               	             { :onclick => "updateSubmissionList();" }) %>
                       </td>
                     </tr>
                     <tr>
                       <td>Submission:</td>
                       <td>
               	  <%= select(:test_request,
               	             :submission_number,
               	             ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
                       </td>
                     </tr>
                     <tr>

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

r128:f40baf68cc55 - Fri, 09 May 2008 08:29:26 - 4 files changed: 24 inserted, 7 deleted

Sign in to your account

Commit r128:f40baf68cc55 public

Author

r128:f40baf68cc55 - Fri, 09 May 2008 08:29:26 - 4 files changed: 24 inserted, 7 deleted

Commit `r128:f40baf68cc55` public