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:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r129:adeb816b0bb6 - - 4 files changed: 10 inserted, 11 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -31,30 +31,29
31 #
31 #
32 def self.show_submitbox_to?(user)
32 def self.show_submitbox_to?(user)
33 mode = get(SYSTEM_MODE_CONF_KEY)
33 mode = get(SYSTEM_MODE_CONF_KEY)
34 return false if mode=='analysis'
34 return false if mode=='analysis'
35 if (mode=='contest')
35 if (mode=='contest')
36 return false if (user.site!=nil) and
36 return false if (user.site!=nil) and
37 - ((user.site.started==false) or (user.site.finished?))
37 + ((user.site.started!=true) or (user.site.finished?))
38 end
38 end
39 return true
39 return true
40 end
40 end
41
41
42 def self.show_tasks_to?(user)
42 def self.show_tasks_to?(user)
43 mode = get(SYSTEM_MODE_CONF_KEY)
43 mode = get(SYSTEM_MODE_CONF_KEY)
44 if (mode=='contest')
44 if (mode=='contest')
45 - return false if (user.site!=nil) and (user.site.started==false)
45 + return false if (user.site!=nil) and (user.site.started!=true)
46 end
46 end
47 return true
47 return true
48 end
48 end
49
49
50 def self.allow_test_request(user)
50 def self.allow_test_request(user)
51 mode = get(SYSTEM_MODE_CONF_KEY)
51 mode = get(SYSTEM_MODE_CONF_KEY)
52 if (mode=='contest')
52 if (mode=='contest')
53 - return false if (user.site!=nil) and ((user.site.started==false) or
53 + return false if (user.site!=nil) and ((user.site.started!=true) or (user.site.time_left < 30.minutes))
54 - (user.site.time_left < 30.minutes))
55 end
54 end
56 return false if mode=='analysis'
55 return false if mode=='analysis'
57 return true
56 return true
58 end
57 end
59
58
60 protected
59 protected
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,14 +11,19
11
11
12 def time_left
12 def time_left
13 contest_time = Configuration['contest.time_limit']
13 contest_time = Configuration['contest.time_limit']
14 if tmatch = /(\d+):(\d+)/.match(contest_time)
14 if tmatch = /(\d+):(\d+)/.match(contest_time)
15 h = tmatch[1].to_i
15 h = tmatch[1].to_i
16 m = tmatch[2].to_i
16 m = tmatch[2].to_i
17 - finish_time = self.start_time + h.hour + m.minute
17 +
18 current_time = Time.now.gmtime
18 current_time = Time.now.gmtime
19 + if self.start_time!=nil
20 + finish_time = self.start_time + h.hour + m.minute
21 + else
22 + finish_time = current_time + h.hour + m.minute
23 + end
19
24
20 if current_time > finish_time
25 if current_time > finish_time
21 return current_time - current_time
26 return current_time - current_time
22 else
27 else
23 finish_time - current_time
28 finish_time - current_time
24 end
29 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -22,11 +22,6
22 %th # of sub(s)
22 %th # of sub(s)
23 %th Results
23 %th Results
24 = render :partial => 'problem', :collection => @problems
24 = render :partial => 'problem', :collection => @problems
25
25
26 %hr/
26 %hr/
27
27
28 - %p
29 - %b Note:
30 - We currently have problems synchronizing
31 - the time stamps between grading machines.
32 - You will see weird time stamps during the practice session.
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -74,13 +74,13
74 </td>
74 </td>
75 <td>
75 <td>
76 <%= f.file_field :additional_file %>
76 <%= f.file_field :additional_file %>
77 </td>
77 </td>
78 <td>
78 <td>
79 <small>
79 <small>
80 - * This option works <u>only</u> for task max.
80 + * This option works <u>only</u> for task beads.
81 You can use this to submit <tt>questions.txt</tt>.<br/>
81 You can use this to submit <tt>questions.txt</tt>.<br/>
82 The file shall be copied to the execution directory before your program runs.
82 The file shall be copied to the execution directory before your program runs.
83 </small>
83 </small>
84 </td>
84 </td>
85 </tr>
85 </tr>
86 <tr>
86 <tr>
You need to be logged in to leave comments. Login now