cafe-grader-web Commit - r129:adeb816b0bb6

cafe-grader-web

Commit `r129:adeb816b0bb6` public

parent | child

Description:

[web] fix nil problem in various place, some styling git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@259 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

r129:adeb816b0bb6 - Fri, 09 May 2008 13:33:00 - 4 files changed: 10 inserted, 11 deleted

app/models/configuration.rb ¶ +3 -4

                   end
                   return @@configurations[key]
                 end
                 def self.[](key)
                   self.get(key)
                 end
                 def self.reload
                   self.read_config
                 end
                 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?))
+            +         ((user.site.started!=true) 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)
+            +       return false if (user.site!=nil) and (user.site.started!=true)
                   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
+            +       return false if (user.site!=nil) and ((user.site.started!=true) or (user.site.time_left < 30.minutes))
-            -                                             (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

app/models/site.rb ¶ +6 -1

               class Site < ActiveRecord::Base
                 belongs_to :country
                 has_many :users
                 def clear_start_time_if_not_started
                   if !self.started
                     self.start_time = nil
                   end
                 end
                 def time_left
                   contest_time = Configuration['contest.time_limit']
                   if tmatch = /(\d+):(\d+)/.match(contest_time)
                     h = tmatch[1].to_i
                     m = tmatch[2].to_i
+            +
+            +       current_time = Time.now.gmtime
+            +       if self.start_time!=nil
                       finish_time = self.start_time + h.hour + m.minute
-            -       current_time = Time.now.gmtime
+            +       else
+            +         finish_time = current_time + h.hour + m.minute
+            +       end
                     if current_time > finish_time
                       return current_time - current_time
                     else
                       finish_time - current_time
                     end
                   else
                     nil
                   end
                 end
                 def finished?
                   if !self.started
                     return false
                   end
                   contest_time = Configuration['contest.time_limit']
                   if tmatch = /(\d+):(\d+)/.match(contest_time)
                     h = tmatch[1].to_i
                     m = tmatch[2].to_i
                     return Time.now.gmtime > (self.start_time + h.hour + m.minute)
                   else
                     false
                   end

app/views/main/list.html.haml ¶ -5

                 .announcementbox
                   %span{:class => 'title'}
                     Announcements
                   = render :partial => 'announcement', :collection => @announcements
               - if Configuration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
               - if Configuration.show_tasks_to?(@user)
                 %table.info
                   %tr.info-head
                     %th
                     %th Tasks
                     %th # of sub(s)
                     %th Results
                   = render :partial => 'problem', :collection => @problems
               %hr/
-            - %p
-            -   %b Note:
-            -   We currently have problems synchronizing
-            -   the time stamps between grading machines.
-            -   You will see weird time stamps during the practice session.

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

                       <td>
               	  <%= select(:test_request,
               	             :submission_number,
               	             ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
                       </td>
                     </tr>
                     <tr>
                       <td>Input data:</td>
                       <td>
                         <%= f.file_field :input_file %>
                       </td>
                       <td>
                         (combined size should not exceed 2MB)
                       </td>
                     </tr>
                     <tr>
                       <td>
                         Additional file<sup><span style="color:red">*</span></sup>:
                       </td>
                       <td>
                         <%= f.file_field :additional_file %>
                       </td>
                       <td>
                         <small>
-            -             * This option works <u>only</u> for task max.
+            +             * This option works <u>only</u> for task beads.
                           You can use this to submit <tt>questions.txt</tt>.<br/>
                           The file shall be copied to the execution directory before your program runs.
                         </small>
                       </td>
                     </tr>
                     <tr>
                       <td colspan="2">
                         <%= submit_tag 'submit' %>
                       </td>
                     </tr>
                   </table>
                 <% end %>
                 </div>
               <% end %>
               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
                   <th>at</th>
                   <th>problem</th>
                   <th>sub #</th>
                   <th>status</th>
                   <th>output (first 2kb)</th>

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

r129:adeb816b0bb6 - Fri, 09 May 2008 13:33:00 - 4 files changed: 10 inserted, 11 deleted

Sign in to your account

Commit r129:adeb816b0bb6 public

Author

r129:adeb816b0bb6 - Fri, 09 May 2008 13:33:00 - 4 files changed: 10 inserted, 11 deleted

Commit `r129:adeb816b0bb6` public