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:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r129:adeb816b0bb6 - - 4 files changed: 10 inserted, 11 deleted
| @@ -31,30 +31,29 | |||
|
|
31 | 31 | # |
|
|
32 | 32 | def self.show_submitbox_to?(user) |
|
|
33 | 33 | mode = get(SYSTEM_MODE_CONF_KEY) |
|
|
34 | 34 | return false if mode=='analysis' |
|
|
35 | 35 | if (mode=='contest') |
|
|
36 | 36 | return false if (user.site!=nil) and |
|
|
37 |
- ((user.site.started |
|
|
|
37 | + ((user.site.started!=true) or (user.site.finished?)) | |
|
|
38 | 38 | end |
|
|
39 | 39 | return true |
|
|
40 | 40 | end |
|
|
41 | 41 | |
|
|
42 | 42 | def self.show_tasks_to?(user) |
|
|
43 | 43 | mode = get(SYSTEM_MODE_CONF_KEY) |
|
|
44 | 44 | if (mode=='contest') |
|
|
45 |
- return false if (user.site!=nil) and (user.site.started |
|
|
|
45 | + return false if (user.site!=nil) and (user.site.started!=true) | |
|
|
46 | 46 | end |
|
|
47 | 47 | return true |
|
|
48 | 48 | end |
|
|
49 | 49 | |
|
|
50 | 50 | def self.allow_test_request(user) |
|
|
51 | 51 | mode = get(SYSTEM_MODE_CONF_KEY) |
|
|
52 | 52 | if (mode=='contest') |
|
|
53 |
- return false if (user.site!=nil) and ((user.site.started |
|
|
|
54 | - (user.site.time_left < 30.minutes)) | |
|
|
53 | + return false if (user.site!=nil) and ((user.site.started!=true) or (user.site.time_left < 30.minutes)) | |
|
|
55 | 54 | end |
|
|
56 | 55 | return false if mode=='analysis' |
|
|
57 | 56 | return true |
|
|
58 | 57 | end |
|
|
59 | 58 | |
|
|
60 | 59 | protected |
| @@ -11,14 +11,19 | |||
|
|
11 | 11 | |
|
|
12 | 12 | def time_left |
|
|
13 | 13 | contest_time = Configuration['contest.time_limit'] |
|
|
14 | 14 | if tmatch = /(\d+):(\d+)/.match(contest_time) |
|
|
15 | 15 | h = tmatch[1].to_i |
|
|
16 | 16 | m = tmatch[2].to_i |
|
|
17 | - finish_time = self.start_time + h.hour + m.minute | |
|
|
17 | + | |
|
|
18 | 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 | 25 | if current_time > finish_time |
|
|
21 | 26 | return current_time - current_time |
|
|
22 | 27 | else |
|
|
23 | 28 | finish_time - current_time |
|
|
24 | 29 | end |
| @@ -22,11 +22,6 | |||
|
|
22 | 22 | %th # of sub(s) |
|
|
23 | 23 | %th Results |
|
|
24 | 24 | = render :partial => 'problem', :collection => @problems |
|
|
25 | 25 | |
|
|
26 | 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. | |
| @@ -74,13 +74,13 | |||
|
|
74 | 74 | </td> |
|
|
75 | 75 | <td> |
|
|
76 | 76 | <%= f.file_field :additional_file %> |
|
|
77 | 77 | </td> |
|
|
78 | 78 | <td> |
|
|
79 | 79 | <small> |
|
|
80 |
- * This option works <u>only</u> for task |
|
|
|
80 | + * This option works <u>only</u> for task beads. | |
|
|
81 | 81 | You can use this to submit <tt>questions.txt</tt>.<br/> |
|
|
82 | 82 | The file shall be copied to the execution directory before your program runs. |
|
|
83 | 83 | </small> |
|
|
84 | 84 | </td> |
|
|
85 | 85 | </tr> |
|
|
86 | 86 | <tr> |
You need to be logged in to leave comments.
Login now