cafe-grader-web

Commit r278:a0c2d497b31a public

parent | child
Description:
shows problems availabe in contests
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

r278:a0c2d497b31a - - 9 files changed: 224 inserted, 45 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -193,16 +193,62
193 end
193 end
194 end
194 end
195
195
196 + def problem_list_by_user_contests(user)
197 + contest_problems = []
198 + pin = {}
199 + user.contests.each do |contest|
200 + available_problems = contest.problems.available
201 + contest_problems << {
202 + :contest => contest,
203 + :problems => available_problems
204 + }
205 + available_problems.each {|p| pin[p.id] = true}
206 + end
207 + other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
208 + contest_problems << {
209 + :contest => nil,
210 + :problems => other_avaiable_problems
211 + }
212 + return contest_problems
213 + end
214 +
215 + def problem_list_for_user(user, contest_problems=nil)
216 + if not Configuration.multicontests?
217 + return Problem.find_available_problems
218 + else
219 + if contest_problems==nil
220 + contest_problems = problem_list_by_user_contests(user)
221 + end
222 +
223 + problems = []
224 + collected = {}
225 + contest_problems.each do |cp|
226 + cp[:problems].each do |problem|
227 + if not collected[problem.id]
228 + problems << problem
229 + collected[problem.id] = true
230 + end
231 + end
232 + end
233 + return problems
234 + end
235 + end
236 +
196 def prepare_list_information
237 def prepare_list_information
197 - @problems = Problem.find_available_problems
198 - @prob_submissions = Array.new
199 @user = User.find(session[:user_id])
238 @user = User.find(session[:user_id])
239 + if not Configuration.multicontests?
240 + @problems = problem_list_for_user(@user)
241 + else
242 + @contest_problems = problem_list_by_user_contests(@user)
243 + @problems = problem_list_for_user(@user, @contest_problems)
244 + end
245 + @prob_submissions = {}
200 @problems.each do |p|
246 @problems.each do |p|
201 sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
247 sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
202 if sub!=nil
248 if sub!=nil
203 - @prob_submissions << { :count => sub.number, :submission => sub }
249 + @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
204 else
250 else
205 - @prob_submissions << { :count => 0, :submission => nil }
251 + @prob_submissions[p.id] = { :count => 0, :submission => nil }
206 end
252 end
207 end
253 end
208 prepare_announcements
254 prepare_announcements
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -106,6 +106,10
106 return get(SYSTEM_MODE_CONF_KEY) == 'indv-contest'
106 return get(SYSTEM_MODE_CONF_KEY) == 'indv-contest'
107 end
107 end
108
108
109 + def self.multicontests?
110 + return get('system.multicontests') == true
111 + end
112 +
109 def self.time_limit_mode?
113 def self.time_limit_mode?
110 mode = get(SYSTEM_MODE_CONF_KEY)
114 mode = get(SYSTEM_MODE_CONF_KEY)
111 return ((mode == 'contest') or (mode == 'indv-contest'))
115 return ((mode == 'contest') or (mode == 'indv-contest'))
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,11 +8,13
8 validates_format_of :name, :with => /^\w+$/
8 validates_format_of :name, :with => /^\w+$/
9 validates_presence_of :full_name
9 validates_presence_of :full_name
10
10
11 + named_scope :available, :conditions => {:available => true}
12 +
11 DEFAULT_TIME_LIMIT = 1
13 DEFAULT_TIME_LIMIT = 1
12 DEFAULT_MEMORY_LIMIT = 32
14 DEFAULT_MEMORY_LIMIT = 32
13
15
14 def self.find_available_problems
16 def self.find_available_problems
15 - find(:all, :conditions => {:available => true}, :order => "date_added DESC")
17 + Problem.available.all(:order => "date_added DESC")
16 end
18 end
17
19
18 def self.create_from_import_form_params(params, old_problem=nil)
20 def self.create_from_import_form_params(params, old_problem=nil)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -7,12 +7,12
7 <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
7 <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
8 </td>
8 </td>
9 <td align="center">
9 <td align="center">
10 - <%= @prob_submissions[problem_counter][:count] %>
10 + <%= @prob_submissions[problem.id][:count] %>
11 </td>
11 </td>
12 <td>
12 <td>
13 <%= render :partial => 'submission_short',
13 <%= render :partial => 'submission_short',
14 :locals => {
14 :locals => {
15 - :submission => @prob_submissions[problem_counter][:submission],
15 + :submission => @prob_submissions[problem.id][:submission],
16 :problem_name => problem.name }%>
16 :problem_name => problem.name }%>
17 </td>
17 </td>
18 </tr>
18 </tr>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -22,13 +22,26
22 %p=t 'main.start_soon'
22 %p=t 'main.start_soon'
23
23
24 - if Configuration.show_tasks_to?(@user)
24 - if Configuration.show_tasks_to?(@user)
25 - %table.info
25 + - if not Configuration.multicontests?
26 - %tr.info-head
26 + %table.info
27 - %th
27 + %tr.info-head
28 - %th Tasks
28 + %th
29 - %th # of sub(s)
29 + %th Tasks
30 - %th Results
30 + %th # of sub(s)
31 - = render :partial => 'problem', :collection => @problems
31 + %th Results
32 + = render :partial => 'problem', :collection => @problems
33 + - else
34 + - @contest_problems.each do |cp|
35 + %h2{:class =>'contest-title'}
36 + = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
37 + %table.info
38 + %tr.info-head
39 + %th
40 + %th Tasks
41 + %th # of sub(s)
42 + %th Results
43 + = render :partial => 'problem', :collection => cp[:problems]
44 +
32
45
33 %hr/
46 %hr/
34
47
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,7 +1,107
1 -
2 require File.dirname(__FILE__) + '/../spec_helper'
1 require File.dirname(__FILE__) + '/../spec_helper'
3
2
4 - describe MainController do
3 + module ConfigHelperMethods
4 + def enable_multicontest
5 + c = Configuration.new(:key => 'system.multicontests',
6 + :value_type => 'boolean',
7 + :value => 'true')
8 + c.save
9 + end
10 +
11 + def disable_multicontest
12 + c = Configuration.new(:key => 'system.multicontests',
13 + :value_type => 'boolean',
14 + :value => 'false')
15 + c.save
16 + end
17 + end
18 +
19 + describe MainController, "when a user comes to list page" do
20 +
21 + it "should redirect user to login page when unlogged-in user try to access main/list" do
22 + get 'list'
23 + response.should redirect_to(:action => 'login')
24 + end
25 +
26 + end
27 +
28 + describe MainController, "when a logged in user comes to list page, with multicontests off" do
29 + integrate_views
30 +
31 + include ConfigHelperMethods
32 +
33 + fixtures :users
34 + fixtures :problems
35 + fixtures :contests
36 +
37 + before(:each) do
38 + disable_multicontest
39 + end
40 +
41 + it "should list available problems" do
42 + john = users(:john)
43 + get "list", {}, {:user_id => john.id}
44 +
45 + response.should render_template 'main/list'
46 + response.should have_text(/add/)
47 + response.should have_text(/easy_problem/)
48 + response.should have_text(/hard_problem/)
49 + end
50 +
51 + end
52 +
53 + describe MainController, "when a logged in user comes to list page, with multicontests on" do
54 + integrate_views
55 +
56 + include ConfigHelperMethods
57 +
58 + fixtures :users
59 + fixtures :problems
60 + fixtures :contests
61 +
62 + before(:each) do
63 + enable_multicontest
64 + end
65 +
66 + it "should list only available public problems to users with no contest assigned" do
67 + john = users(:john)
68 + get "list", {}, {:user_id => john.id}
69 +
70 + response.should render_template('main/list')
71 + response.should have_text(/add/)
72 + response.should_not have_text(/easy_problem/)
73 + response.should_not have_text(/hard_problem/)
74 + end
75 +
76 + it "should list available problems on a specific contest" do
77 + james = users(:james)
78 + get "list", {}, {:user_id => james.id}
79 +
80 + response.should render_template('main/list')
81 + response.should have_text(/add/)
82 + response.should have_text(/easy_problem/)
83 + response.should_not have_text(/hard_problem/)
84 + end
85 +
86 + it "should shows available problems by contests" do
87 + james = users(:james)
88 + get "list", {}, {:user_id => james.id}
89 +
90 + response.should render_template('main/list')
91 + response.should have_text(Regexp.new('Contest A.*easy_problem', Regexp::MULTILINE))
92 + end
93 +
94 + it "should shows available problems by contests; problems belonging to more the one contest should appear many times" do
95 + jack = users(:jack)
96 + get "list", {}, {:user_id => jack.id}
97 +
98 + response.should render_template('main/list')
99 + response.should have_text(Regexp.new('Contest A.*easy_problem.*Contest B.*easy_problem', Regexp::MULTILINE))
100 + response.should have_text(Regexp.new('Contest B.*hard_problem', Regexp::MULTILINE))
101 + end
102 + end
103 +
104 + describe MainController, "when a user loads sources and compiler messages" do
5
105
6 before(:each) do
106 before(:each) do
7 @problem = mock(Problem, :name => 'test', :output_only => false)
107 @problem = mock(Problem, :name => 'test', :output_only => false)
@@ -13,44 +113,47
13 :language => @language,
113 :language => @language,
14 :source => 'sample source',
114 :source => 'sample source',
15 :compiler_message => 'none')
115 :compiler_message => 'none')
116 +
16 @user = mock(User, :id => 1, :login => 'john')
117 @user = mock(User, :id => 1, :login => 'john')
118 + @user.should_receive(:update_start_time).at_most(:once)
119 +
17 @another_user = mock(User, :id => 2, :login => 'mary')
120 @another_user = mock(User, :id => 2, :login => 'mary')
18 - end
121 + @another_user.should_receive(:update_start_time).at_most(:once)
19
122
20 - it "should redirect user to login page when unlogged-in user try to access main/list" do
123 + User.should_receive(:find).
21 - get 'list'
124 + with(1).any_number_of_times.
22 - response.should redirect_to(:action => 'login')
125 + and_return(@user)
126 + User.should_receive(:find).
127 + with(2).any_number_of_times.
128 + and_return(@another_user)
129 + Submission.should_receive(:find).
130 + any_number_of_times.with(@submission.id.to_s).
131 + and_return(@submission)
23 end
132 end
24
133
25 it "should let user sees her own source" do
134 it "should let user sees her own source" do
26 - Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
135 + @submission.should_receive(:download_filename).and_return("foo.c")
27 - User.should_receive(:find).with(1).and_return(@user)
28 - @user.should_receive(:update_start_time)
29 get 'source', {:id => @submission.id}, {:user_id => 1}
136 get 'source', {:id => @submission.id}, {:user_id => 1}
30 response.should be_success
137 response.should be_success
31 end
138 end
32
139
33 it "should let user sees her own compiler message" do
140 it "should let user sees her own compiler message" do
34 - Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
35 - User.should_receive(:find).with(1).and_return(@user)
36 get 'compiler_msg', {:id => @submission.id}, {:user_id => 1}
141 get 'compiler_msg', {:id => @submission.id}, {:user_id => 1}
37 response.should be_success
142 response.should be_success
38 end
143 end
39
144
40 it "should not let user sees other user's source" do
145 it "should not let user sees other user's source" do
41 - Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
42 - User.should_receive(:find).with(2).and_return(@another_user)
43 get 'source', {:id => @submission.id}, {:user_id => 2}
146 get 'source', {:id => @submission.id}, {:user_id => 2}
44 flash[:notice].should =~ /[Ee]rror/
147 flash[:notice].should =~ /[Ee]rror/
45 response.should redirect_to(:action => 'list')
148 response.should redirect_to(:action => 'list')
46 end
149 end
47
150
48 it "should not let user sees other user's compiler message" do
151 it "should not let user sees other user's compiler message" do
49 - Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
50 - User.should_receive(:find).with(2).and_return(@another_user)
51 get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
152 get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
52 flash[:notice].should =~ /[Ee]rror/
153 flash[:notice].should =~ /[Ee]rror/
53 response.should redirect_to(:action => 'list')
154 response.should redirect_to(:action => 'list')
54 end
155 end
55
156
56 end
157 end
158 +
159 +
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -4,8 +4,21
4 name: add
4 name: add
5 full_name: add_full_name
5 full_name: add_full_name
6 available: true
6 available: true
7 +
7 two:
8 two:
8 id: 2
9 id: 2
9 name: subtract
10 name: subtract
10 full_name: subtract_full_name
11 full_name: subtract_full_name
11 available: false
12 available: false
13 +
14 + easy:
15 + name: easy_problem
16 + full_name: Easy Problem
17 + available: true
18 + contests: contest_a, contest_b
19 +
20 + hard:
21 + name: hard_problem
22 + full_name: Hard Problem
23 + available: true
24 + contests: contest_b
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,6 +11,7
11 full_name: john
11 full_name: john
12 hashed_password: <%= User.encrypt("hello",salt) %>
12 hashed_password: <%= User.encrypt("hello",salt) %>
13 salt: <%= salt %>
13 salt: <%= salt %>
14 +
14 mary:
15 mary:
15 login: mary
16 login: mary
16 full_name: mary
17 full_name: mary
@@ -18,3 +19,16
18 salt: <%= salt %>
19 salt: <%= salt %>
19 roles: admin
20 roles: admin
20
21
22 + james:
23 + login: james
24 + full_name: James
25 + hashed_password: <%= User.encrypt("morning",salt) %>
26 + salt: <%= salt %>
27 + contests: contest_a
28 +
29 + jack:
30 + login: jack
31 + full_name: Jack
32 + hashed_password: <%= User.encrypt("morning",salt) %>
33 + salt: <%= salt %>
34 + contests: contest_a, contest_b
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,20 +1,4
1 require File.dirname(__FILE__) + '/../test_helper'
1 require File.dirname(__FILE__) + '/../test_helper'
2
2
3 class MainControllerTest < ActionController::TestCase
3 class MainControllerTest < ActionController::TestCase
4 - fixtures :users
5 - fixtures :problems
6 -
7 - def test_should_redirect_new_user_to_login
8 - get :list
9 - assert_redirected_to :controller => 'main', :action => 'login'
10 - end
11 -
12 - def test_should_list_available_problems_if_logged_in
13 - john = users(:john)
14 - get :list, {}, {:user_id => john.id}
15 -
16 - assert_template 'main/list'
17 - assert_select "table tr:nth-child(2)", :text => /\(add\)/
18 - end
19 -
20 end
4 end
You need to be logged in to leave comments. Login now