Description:
Merge pull request #11 from wytesk133/master
Various fixes
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r372:0688baeb3e31 - - 5 files changed: 14 inserted, 11 deleted
| @@ -34,13 +34,13 | |||
|
|
34 | 34 | UserContestStat.delete_all() |
|
|
35 | 35 | flash[:notice] = 'All start time statistic cleared.' |
|
|
36 | 36 | redirect_to :action => 'index' |
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | def change_contest_mode |
|
|
40 | - if ['standard', 'contest', 'indv-contest'].include? params[:id] | |
|
|
40 | + if ['standard', 'contest', 'indv-contest', 'analysis'].include? params[:id] | |
|
|
41 | 41 | config = GraderConfiguration.find_by_key('system.mode') |
|
|
42 | 42 | config.value = params[:id] |
|
|
43 | 43 | config.save |
|
|
44 | 44 | else |
|
|
45 | 45 | flash[:notice] = 'Wrong contest mode value' |
|
|
46 | 46 | end |
| @@ -189,13 +189,13 | |||
|
|
189 | 189 | :collection => @announcements, |
|
|
190 | 190 | :locals => {:announcement_effect => true}) |
|
|
191 | 191 | end |
|
|
192 | 192 | |
|
|
193 | 193 | def confirm_contest_start |
|
|
194 | 194 | user = User.find(session[:user_id]) |
|
|
195 |
- if request.method == |
|
|
|
195 | + if request.method == 'POST' | |
|
|
196 | 196 | user.update_start_time |
|
|
197 | 197 | redirect_to :action => 'list' |
|
|
198 | 198 | else |
|
|
199 | 199 | @contests = user.contests |
|
|
200 | 200 | @user = user |
|
|
201 | 201 | end |
| @@ -8,24 +8,27 | |||
|
|
8 | 8 | - else |
|
|
9 | 9 | %b Single contest: |
|
|
10 | 10 | =raw "[#{link_to 'Add/remove contests', :controller => 'contests', :action => 'index'}]" |
|
|
11 | 11 | |
|
|
12 | 12 | .infobox |
|
|
13 | 13 | %b Web interface mode: |
|
|
14 | - - if (not GraderConfiguration.contest_mode?) and (not GraderConfiguration.indv_contest_mode?) | |
|
|
15 | - standard mode | |
|
|
14 | + - if GraderConfiguration.analysis_mode? | |
|
|
15 | + Analysis Mode | |
|
|
16 | + - elsif (not GraderConfiguration.contest_mode?) and (not GraderConfiguration.indv_contest_mode?) | |
|
|
17 | + Standard Mode | |
|
|
16 | 18 | - elsif GraderConfiguration.contest_mode? |
|
|
17 |
- |
|
|
|
19 | + Normal Contest Mode | |
|
|
18 | 20 | - else |
|
|
19 |
- |
|
|
|
21 | + Individual Contest Mode | |
|
|
20 | 22 | |
|
|
21 | 23 | %br/ |
|
|
22 | 24 | Change mode to: |
|
|
23 |
- =raw "[#{link_to ' |
|
|
|
24 |
- =raw "[#{link_to ' |
|
|
|
25 |
- =raw "[#{link_to ' |
|
|
|
25 | + =raw "[#{link_to 'Standard', :action => 'change_contest_mode', :id => 'standard'}]" | |
|
|
26 | + =raw "[#{link_to 'Contest', :action => 'change_contest_mode', :id => 'contest'}]" | |
|
|
27 | + =raw "[#{link_to 'Individual Contest', :action => 'change_contest_mode', :id => 'indv-contest'}]" | |
|
|
28 | + =raw "[#{link_to 'Analysis', :action => 'change_contest_mode', :id => 'analysis'}]" | |
|
|
26 | 29 | |
|
|
27 | 30 | - if GraderConfiguration.indv_contest_mode? |
|
|
28 | 31 | = render :partial => 'indv_contest_mode_index' |
|
|
29 | 32 | |
|
|
30 | 33 | %br/ |
|
|
31 | 34 | |
| @@ -22,13 +22,13 | |||
|
|
22 | 22 | %b= @test_request.exit_status |
|
|
23 | 23 | %br/ |
|
|
24 | 24 | |
|
|
25 | 25 | - if @test_request.compiler_message!=nil and @test_request.compiler_message!='' |
|
|
26 | 26 | %b Compiler Message |
|
|
27 | 27 | %div{:style => "border: 1px solid black; background: lightgrey"} |
|
|
28 | - = simple_format(truncate((@test_request.compiler_message or ''),200)) | |
|
|
28 | + = simple_format(truncate((@test_request.compiler_message or ''), :length => 200)) | |
|
|
29 | 29 | |
|
|
30 | 30 | %b Input (first 2kb) |
|
|
31 | 31 | %div{:style => "border: 1px solid black; background: lightgrey"} |
|
|
32 | 32 | - if @test_request.input_file_name!=nil |
|
|
33 | 33 | = simple_format(read_textfile(@test_request.input_file_name,2048)) |
|
|
34 | 34 | |
| @@ -9,8 +9,8 | |||
|
|
9 | 9 | - @contests.each do |contest| |
|
|
10 | 10 | = contest.title |
|
|
11 | 11 | %br |
|
|
12 | 12 | |
|
|
13 | 13 | =t 'main.confirm_contest_start.timer_starts_after_click' |
|
|
14 | 14 | |
|
|
15 |
- = form_tag :action => 'confirm_contest_start' |
|
|
|
15 | + = form_tag :action => 'confirm_contest_start' do | |
|
|
16 | 16 | = submit_tag t('main.confirm_contest_start.start_button'), :confirm => t('main.confirm_contest_start.start_button_confirm') |
You need to be logged in to leave comments.
Login now