Description:
fixed contest to be ready message bug (when not in contest mode)
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@368 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
r170:5374337e0f83 - - 2 files changed: 5 inserted, 1 deleted
@@ -80,24 +80,28 | |||||
|
80 | end |
|
80 | end |
|
81 | return false if mode=='analysis' |
|
81 | return false if mode=='analysis' |
|
82 | return true |
|
82 | return true |
|
83 | end |
|
83 | end |
|
84 |
|
84 | ||
|
85 | def self.task_grading_info |
|
85 | def self.task_grading_info |
|
86 | if @@task_grading_info==nil |
|
86 | if @@task_grading_info==nil |
|
87 | read_grading_info |
|
87 | read_grading_info |
|
88 | end |
|
88 | end |
|
89 | return @@task_grading_info |
|
89 | return @@task_grading_info |
|
90 | end |
|
90 | end |
|
91 |
|
91 | ||
|
|
92 | + def self.contest_mode | ||
|
|
93 | + return get(SYSTEM_MODE_CONF_KEY) == 'contest' | ||
|
|
94 | + end | ||
|
|
95 | + | ||
|
92 | protected |
|
96 | protected |
|
93 |
|
97 | ||
|
94 | def self.convert_type(val,type) |
|
98 | def self.convert_type(val,type) |
|
95 | case type |
|
99 | case type |
|
96 | when 'string' |
|
100 | when 'string' |
|
97 | return val |
|
101 | return val |
|
98 |
|
102 | ||
|
99 | when 'integer' |
|
103 | when 'integer' |
|
100 | return val.to_i |
|
104 | return val.to_i |
|
101 |
|
105 | ||
|
102 | when 'boolean' |
|
106 | when 'boolean' |
|
103 | return (val=='true') |
|
107 | return (val=='true') |
@@ -5,25 +5,25 | |||||
|
5 | %span{:class => 'title'} |
|
5 | %span{:class => 'title'} |
|
6 | Announcements |
|
6 | Announcements |
|
7 | = render :partial => 'announcement', :collection => @announcements |
|
7 | = render :partial => 'announcement', :collection => @announcements |
|
8 |
|
8 | ||
|
9 | - if Configuration.show_submitbox_to?(@user) |
|
9 | - if Configuration.show_submitbox_to?(@user) |
|
10 | .submitbox |
|
10 | .submitbox |
|
11 | = error_messages_for 'submission' |
|
11 | = error_messages_for 'submission' |
|
12 | = render :partial => 'submission_box' |
|
12 | = render :partial => 'submission_box' |
|
13 |
|
13 | ||
|
14 |
|
14 | ||
|
15 | %hr/ |
|
15 | %hr/ |
|
16 |
|
16 | ||
|
17 | - - if (@user.site!=nil) and (@user.site.started!=true) |
|
17 | + - if (Configuration.contest_mode) and (@user.site!=nil) and (@user.site.started!=true) |
|
18 | %p=t 'main.start_soon' |
|
18 | %p=t 'main.start_soon' |
|
19 |
|
19 | ||
|
20 | - if Configuration.show_tasks_to?(@user) |
|
20 | - if Configuration.show_tasks_to?(@user) |
|
21 | %table.info |
|
21 | %table.info |
|
22 | %tr.info-head |
|
22 | %tr.info-head |
|
23 | %th |
|
23 | %th |
|
24 | %th Tasks |
|
24 | %th Tasks |
|
25 | %th # of sub(s) |
|
25 | %th # of sub(s) |
|
26 | %th Results |
|
26 | %th Results |
|
27 | = render :partial => 'problem', :collection => @problems |
|
27 | = render :partial => 'problem', :collection => @problems |
|
28 |
|
28 | ||
|
29 | %hr/ |
|
29 | %hr/ |
You need to be logged in to leave comments.
Login now